Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mutiny support #189

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
54901cc
Merge pull request #1 from vert-x3/master
wowselim May 3, 2021
0c93937
Merge branch 'vert-x3:master' into master
wowselim May 27, 2021
6fafcbe
Merge branch 'vert-x3:master' into master
wowselim Jun 10, 2021
9d90949
add support for mutiny projects
wowselim Jun 17, 2021
647c80f
add separate stack for mutiny
wowselim Jun 20, 2021
309f536
fix wrong flavor name in templates
wowselim Jun 20, 2021
071c09f
remove obsolete artifact id prefix
wowselim Jun 20, 2021
75b2527
add flavor option to README.md
wowselim Jun 20, 2021
4e123d5
fix bug where mutiny dependencies were not checked
wowselim Jun 20, 2021
2cd1c19
remove "default" text from flavor in README.md
wowselim Jun 20, 2021
34c507d
fix bug with mixed mutiny & vertx deps
wowselim Jun 20, 2021
9730547
fix version bug with mixed mutiny & vertx deps
wowselim Jun 20, 2021
c86dfec
ignore isVertxDependency in jackson
wowselim Jun 20, 2021
b0b31e6
fix bug where groupId ends up wrong
wowselim Jun 26, 2021
3ca065d
make sure flavor deps are handled correctly
wowselim Jun 26, 2021
3575d46
Merge branch 'master' into add-mutiny-support
wowselim Jul 3, 2021
b886b1d
use Vert.x API instead of Flavor for website
wowselim Jul 5, 2021
e098a10
remove flavor ids from project constants
wowselim Jul 5, 2021
bdd8041
remove flavor from http request examples
wowselim Jul 5, 2021
24a9001
bump mutiny version to 2.8.0
wowselim Jul 5, 2021
03b4d28
switch from two stacks to boolean flag for mutiny bindings
wowselim Jul 5, 2021
fa9cb0a
add generator test for flavors
wowselim Jul 5, 2021
90a3fb9
add info about default flavor to readme
wowselim Jul 5, 2021
dc01e0c
add error msg for unsatisfiable dependencies
wowselim Jul 8, 2021
b231d26
bump mutiny version to 2.9.0
wowselim Jul 8, 2021
aceac49
add verticle & test code for mutiny flavor
wowselim Jul 8, 2021
f9907d0
set junit5 flag for mutiny projects
wowselim Jul 8, 2021
7a11188
fix bug that failed mutiny projects
wowselim Jul 8, 2021
9b85004
include flavor in VertxProject#toString
wowselim Jul 9, 2021
37612ce
don't include vertx depchain for mutiny
wowselim Jul 9, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
switch from two stacks to boolean flag for mutiny bindings
Signed-off-by: Selim Dincer <wowselim@live.de>
  • Loading branch information
wowselim committed Jul 5, 2021
commit 03b4d28d041b27e04e2e8e668a87bd0831bf81ae
11 changes: 6 additions & 5 deletions src/main/java/io/vertx/starter/ValidationHandler.java
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ public class ValidationHandler implements Handler<RoutingContext> {
private final Map<String, Dependency> vertxStackDependencies;
private final Map<String, Dependency> mutinyStackDependencies;

public ValidationHandler(JsonObject defaults, JsonArray versions, JsonArray vertxStack, JsonArray mutinyStack) {
public ValidationHandler(JsonObject defaults, JsonArray versions, JsonArray stack) {
this.defaults = defaults;
this.versions = versions.stream()
.map(JsonObject.class::cast)
@@ -58,7 +58,7 @@ public ValidationHandler(JsonObject defaults, JsonArray versions, JsonArray vert
obj -> obj.getString("number"),
obj -> obj.getJsonArray("exclusions", new JsonArray()).stream().map(String.class::cast).collect(toList()))
);
vertxStackDependencies = vertxStack.stream()
vertxStackDependencies = stack.stream()
.map(JsonObject.class::cast)
.flatMap(category -> category.getJsonArray("items").stream())
.map(JsonObject.class::cast)
@@ -68,15 +68,16 @@ public ValidationHandler(JsonObject defaults, JsonArray versions, JsonArray vert
.setGroupId(item.getString("groupId"))
.setArtifactId(item.getString("artifactId")))
);
mutinyStackDependencies = mutinyStack.stream()
mutinyStackDependencies = stack.stream()
.map(JsonObject.class::cast)
.flatMap(category -> category.getJsonArray("items").stream())
.map(JsonObject.class::cast)
.filter(item -> item.getBoolean("mutinyBindings"))
.collect(toMap(
item -> item.getString("artifactId"),
item -> new Dependency()
.setGroupId(item.getString("groupId"))
.setArtifactId(item.getString("artifactId")))
.setGroupId("io.smallrye.reactive")
.setArtifactId("smallrye-mutiny-" + item.getString("artifactId")))
);
}

7 changes: 3 additions & 4 deletions src/main/java/io/vertx/starter/WebVerticle.java
Original file line number Diff line number Diff line change
@@ -56,12 +56,11 @@ public WebVerticle() {

JsonObject defaults = starterData.getJsonObject("defaults");
JsonArray versions = starterData.getJsonArray("versions");
JsonArray vertxStack = starterData.getJsonArray("vertxStack");
JsonArray mutinyStack = starterData.getJsonArray("mutinyStack");
JsonArray stack = starterData.getJsonArray("stack");

validationHandler = new ValidationHandler(defaults, versions, vertxStack, mutinyStack);
validationHandler = new ValidationHandler(defaults, versions, stack);
generationHandler = new GenerationHandler();
metadataHandler = new MetadataHandler(defaults, versions, vertxStack, mutinyStack);
metadataHandler = new MetadataHandler(defaults, versions, stack);

} catch (IOException e) {
throw new RuntimeException(e);
7 changes: 3 additions & 4 deletions src/main/java/io/vertx/starter/service/MetadataHandler.java
Original file line number Diff line number Diff line change
@@ -37,17 +37,16 @@ public class MetadataHandler implements Handler<RoutingContext> {

private final Buffer metadata;

public MetadataHandler(JsonObject defaults, JsonArray versions, JsonArray vertxStack, JsonArray mutinyStack) {
public MetadataHandler(JsonObject defaults, JsonArray versions, JsonArray stack) {
metadata = new JsonObject()
.put("defaults", defaults)
.put("versions", versions)
.put("stack", vertxStack)
.put("stack", stack)
.put("buildTools", values(BuildTool.values(), BuildTool::getValue))
.put("languages", values(Language.values(), Language::getName))
.put("jdkVersions", values(JdkVersion.values(), JdkVersion::getValue))
.put("flavors", values(ProjectFlavor.values(), ProjectFlavor::getId))
.put("vertxDependencies", vertxStack) // deprecated
.put("mutinyDependencies", mutinyStack) // deprecated
.put("vertxDependencies", stack) // deprecated
.put("vertxVersions", versions.stream() // deprecated
.map(JsonObject.class::cast)
.map(obj -> obj.getString("number"))
Loading