Make RESTEasy Reactive the default codestart

Also only add the default codestart if no extensions have been selected. Quarkus is more than a REST framework and this behavior is annoying for anything that is not REST and does not have a codestart.
quarkusio · Mar 19, 2022 · 0998cac · 0998cac
1 parent 8fa5628
commit 0998cac
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/devtools/cli/src/test/java/io/quarkus/cli/CliProjectMavenTest.java b/devtools/cli/src/test/java/io/quarkus/cli/CliProjectMavenTest.java
@@ -51,8 +51,8 @@ public void testCreateAppDefaults() throws Exception {
         String pomContent = validateBasicIdentifiers(CreateProjectHelper.DEFAULT_GROUP_ID,
                 CreateProjectHelper.DEFAULT_ARTIFACT_ID,
                 CreateProjectHelper.DEFAULT_VERSION);
-        Assertions.assertTrue(pomContent.contains("<artifactId>quarkus-resteasy</artifactId>"),
-                "pom.xml should contain quarkus-resteasy:\n" + pomContent);
+        Assertions.assertTrue(pomContent.contains("<artifactId>quarkus-resteasy-reactive</artifactId>"),
+                "pom.xml should contain quarkus-resteasy-reactive:\n" + pomContent);
 
         CliDriver.valdiateGeneratedSourcePackage(project, "org/acme");
 

diff --git a/...-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java b/...-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java
@@ -66,7 +66,7 @@ public enum Tooling implements DataKey {
 
     public enum ExtensionCodestart implements DataKey {
         RESTEASY,
-        RESTEAST_REACTIVE,
+        RESTEASY_REACTIVE,
         SPRING_WEB
     }
 
@@ -127,14 +127,15 @@ protected Collection<Codestart> select(QuarkusCodestartProjectInput projectInput
                 .filter(c -> !isExample(c) || projectInput.getExample() == null || c.matches(projectInput.getExample()))
                 .collect(Collectors.toCollection(ArrayList::new));
 
-        // include default codestarts if no code selected
+        // include default codestarts if no code selected and no extensions have been selected
         if (projectInput.getAppContent().contains(CODE)
+                && projectInput.getExtensions().isEmpty()
                 && projectCodestarts.stream()
                         .noneMatch(c -> c.getType() == CodestartType.CODE && !c.getSpec().isPreselected())) {
             final Codestart defaultCodestart = codestarts.stream()
-                    .filter(c -> c.matches(ExtensionCodestart.RESTEASY.key()))
+                    .filter(c -> c.matches(ExtensionCodestart.RESTEASY_REACTIVE.key()))
                     .findFirst().orElseThrow(() -> new CodestartStructureException(
-                            ExtensionCodestart.RESTEASY.key() + " codestart not found"));
+                            ExtensionCodestart.RESTEASY_REACTIVE.key() + " codestart not found"));
             final String languageName = findLanguageName(projectCodestarts);
             if (defaultCodestart.implementsLanguage(languageName)) {
                 projectCodestarts.add(defaultCodestart);

diff --git a/...startGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java b/...startGenerationTest/generateMavenDefaultJava/src_main_java_org_acme_GreetingResource.java
@@ -11,6 +11,6 @@ public class GreetingResource {
     @GET
     @Produces(MediaType.TEXT_PLAIN)
     public String hello() {
-        return "Hello RESTEasy";
+        return "Hello from RESTEasy Reactive";
     }
 }
diff --git a/...tGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_GreetingResourceTest.java b/...tGenerationTest/generateMavenDefaultJava/src_test_java_org_acme_GreetingResourceTest.java
@@ -15,7 +15,7 @@ public void testHelloEndpoint() {
           .when().get("/hello")
           .then()
              .statusCode(200)
-             .body(is("Hello RESTEasy"));
+             .body(is("Hello from RESTEasy Reactive"));
     }
 
 }
diff --git a/...pshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot b/...pshots__/QuarkusExtensionCodestartGenerationTest/generateDefaultProject/dir-tree.snapshot
@@ -40,4 +40,4 @@ runtime/src/
 runtime/src/main/
 runtime/src/main/resources/
 runtime/src/main/resources/META-INF/
-runtime/src/main/resources/META-INF/quarkus-extension.yaml
+runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/CreateProjectMojoIT.java
@@ -93,7 +93,7 @@ public void testProjectGenerationFromScratch() throws MavenInvocationException,
                         && d.getType().equals("pom"))).isTrue();
 
         assertThat(
-                model.getDependencies().stream().anyMatch(d -> d.getArtifactId().equalsIgnoreCase("quarkus-resteasy")
+                model.getDependencies().stream().anyMatch(d -> d.getArtifactId().equalsIgnoreCase("quarkus-resteasy-reactive")
                         && d.getVersion() == null)).isTrue();
 
         assertThat(model.getProfiles()).hasSize(1);