From 5bc19c0392be8718d33285dead59ee256fe33b29 Mon Sep 17 00:00:00 2001 From: Andy Damevin Date: Fri, 15 Mar 2024 10:33:03 +0100 Subject: [PATCH 1/2] Fix codestarts compatibility with older CLI --- .../base/README.tpl.qute.md | 1 + .../META-INF/resources/index.entry.qute.html | 1 + .../resteasy-reactive-codestart/codestart.yml | 20 +++++++++++++++++++ .../acme/{resource.class-name}.tpl.qute.java | 16 +++++++++++++++ .../{resource.class-name}IT.tpl.qute.java | 8 ++++++++ .../{resource.class-name}Test.tpl.qute.java | 20 +++++++++++++++++++ .../acme/{resource.class-name}.tpl.qute.kt | 14 +++++++++++++ .../acme/{resource.class-name}IT.tpl.qute.kt | 6 ++++++ .../{resource.class-name}Test.tpl.qute.kt | 20 +++++++++++++++++++ .../acme/{resource.class-name}.tpl.qute.scala | 12 +++++++++++ .../{resource.class-name}IT.tpl.qute.scala | 6 ++++++ .../{resource.class-name}Test.tpl.qute.scala | 20 +++++++++++++++++++ 12 files changed, 144 insertions(+) create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/README.tpl.qute.md create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/codestart.yml create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala create mode 100644 devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/README.tpl.qute.md b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/README.tpl.qute.md new file mode 100644 index 0000000000000..405280158877d --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/README.tpl.qute.md @@ -0,0 +1 @@ +{#include readme-header /} \ No newline at end of file diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html new file mode 100644 index 0000000000000..c06aeeb1b4634 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html @@ -0,0 +1 @@ +{#include index-entry path=resource.path/} \ No newline at end of file diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/codestart.yml b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/codestart.yml new file mode 100644 index 0000000000000..540779508703a --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/codestart.yml @@ -0,0 +1,20 @@ +# We need this for compat with older CLI versions +name: resteasy-reactive-codestart +ref: resteasy-reactive +type: code +tags: extension-codestart +metadata: + title: REST + description: Easily start your REST Web Services + related-guide-section: https://quarkus.io/guides/getting-started-reactive#reactive-jax-rs-resources +language: + base: + data: + resource: + class-name: GreetingResource + path: "/hello" + response: "Hello from Quarkus REST" + dependencies: + - io.quarkus:quarkus-rest + test-dependencies: + - io.rest-assured:rest-assured diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java new file mode 100644 index 0000000000000..720033d91c9f2 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java @@ -0,0 +1,16 @@ +package org.acme; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + +@Path("{resource.path}") +public class {resource.class-name} { + + @GET + @Produces(MediaType.TEXT_PLAIN) + public String hello() { + return "{resource.response}"; + } +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java new file mode 100644 index 0000000000000..e1dc4213b0e54 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/native-test/java/org/acme/{resource.class-name}IT.tpl.qute.java @@ -0,0 +1,8 @@ +package org.acme; + +import io.quarkus.test.junit.QuarkusIntegrationTest; + +@QuarkusIntegrationTest +class {resource.class-name}IT extends {resource.class-name}Test { + // Execute the same tests but in packaged mode. +} diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java new file mode 100644 index 0000000000000..b02cd1aac42e2 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/java/src/test/java/org/acme/{resource.class-name}Test.tpl.qute.java @@ -0,0 +1,20 @@ +package org.acme; + +import io.quarkus.test.junit.QuarkusTest; +import org.junit.jupiter.api.Test; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.is; + +@QuarkusTest +class {resource.class-name}Test { + @Test + void testHelloEndpoint() { + given() + .when().get("{resource.path}") + .then() + .statusCode(200) + .body(is("{resource.response}")); + } + +} \ No newline at end of file diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt new file mode 100644 index 0000000000000..c406ce55ca1f1 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/main/kotlin/org/acme/{resource.class-name}.tpl.qute.kt @@ -0,0 +1,14 @@ +package org.acme + +import jakarta.ws.rs.GET +import jakarta.ws.rs.Path +import jakarta.ws.rs.Produces +import jakarta.ws.rs.core.MediaType + +@Path("{resource.path}") +class {resource.class-name} { + + @GET + @Produces(MediaType.TEXT_PLAIN) + fun hello() = "{resource.response}" +} \ No newline at end of file diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt new file mode 100644 index 0000000000000..341f1016131c8 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/native-test/kotlin/org/acme/{resource.class-name}IT.tpl.qute.kt @@ -0,0 +1,6 @@ +package org.acme + +import io.quarkus.test.junit.QuarkusIntegrationTest + +@QuarkusIntegrationTest +class {resource.class-name}IT : {resource.class-name}Test() diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt new file mode 100644 index 0000000000000..1e11d2c0caa30 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/kotlin/src/test/kotlin/org/acme/{resource.class-name}Test.tpl.qute.kt @@ -0,0 +1,20 @@ +package org.acme + +import io.quarkus.test.junit.QuarkusTest +import io.restassured.RestAssured.given +import org.hamcrest.CoreMatchers.`is` +import org.junit.jupiter.api.Test + +@QuarkusTest +class {resource.class-name}Test { + + @Test + fun testHelloEndpoint() { + given() + .`when`().get("{resource.path}") + .then() + .statusCode(200) + .body(`is`("{resource.response}")) + } + +} \ No newline at end of file diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala new file mode 100644 index 0000000000000..dc1b6cda15acb --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/main/scala/org/acme/{resource.class-name}.tpl.qute.scala @@ -0,0 +1,12 @@ +package org.acme + +import jakarta.ws.rs.\{GET, Path, Produces} +import jakarta.ws.rs.core.MediaType + +@Path("{resource.path}") +class {resource.class-name} { + + @GET + @Produces(Array[String](MediaType.TEXT_PLAIN)) + def hello() = "{resource.response}" +} \ No newline at end of file diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala new file mode 100644 index 0000000000000..3fcd71bffb0f2 --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/native-test/scala/org/acme/{resource.class-name}IT.tpl.qute.scala @@ -0,0 +1,6 @@ +package org.acme + +import io.quarkus.test.junit.QuarkusIntegrationTest + +@QuarkusIntegrationTest +class {resource.class-name}IT extends {resource.class-name}Test diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala new file mode 100644 index 0000000000000..07681f8df9c8b --- /dev/null +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-reactive-codestart/scala/src/test/scala/org/acme/{resource.class-name}Test.tpl.qute.scala @@ -0,0 +1,20 @@ +package org.acme + +import io.quarkus.test.junit.QuarkusTest +import io.restassured.RestAssured.given +import org.hamcrest.CoreMatchers.`is` +import org.junit.jupiter.api.Test + +@QuarkusTest +class {resource.class-name}Test { + + @Test + def testHelloEndpoint() = { + given() + .`when`().get("{resource.path}") + .then() + .statusCode(200) + .body(`is`("{resource.response}")) + } + +} \ No newline at end of file From 6484be5238f5ff35be3e8a152a5df4243c8f4826 Mon Sep 17 00:00:00 2001 From: Andy Damevin Date: Fri, 15 Mar 2024 11:05:28 +0100 Subject: [PATCH 2/2] Simplify and fix default codestart selection code --- .../quarkus/QuarkusCodestartCatalog.java | 43 ++++--------------- .../handlers/CreateProjectCommandHandler.java | 4 +- 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java index 485dcd0e4b282..7dc99d904ac26 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/codestarts/quarkus/QuarkusCodestartCatalog.java @@ -34,7 +34,6 @@ import io.quarkus.platform.descriptor.loader.json.ResourceLoader; import io.quarkus.registry.catalog.Extension; import io.quarkus.registry.catalog.ExtensionCatalog; -import io.smallrye.common.version.VersionScheme; public final class QuarkusCodestartCatalog extends GenericCodestartCatalog { @@ -138,13 +137,17 @@ protected Collection select(QuarkusCodestartProjectInput projectInput .filter(c -> !isExample(c) || projectInput.getExample() == null || c.matches(projectInput.getExample())) .collect(Collectors.toCollection(ArrayList::new)); - // include default codestarts depending on the versions and the extensions being chosen or not - Optional selectedDefaultCodeStart = getSelectedDefaultCodeStart(projectInput); + // include default codestart depending on the versions and the extensions being chosen or not + Optional selectedDefaultCodeStart = Optional.ofNullable(projectInput.getDefaultCodestart()); + // if there is no extension selected or only language extensions, we should add the default code start + // this has been settled in https://github.com/quarkusio/quarkus/pull/39467 + final boolean shouldAddDefaultCodeStart = projectInput.getExtensions().isEmpty() || + (projectInput.getExtensions().size() == 1 + && isLanguageExtension(projectInput.getExtensions().iterator().next())); if (projectInput.getAppContent().contains(CODE) && selectedDefaultCodeStart.isPresent() - && projectCodestarts.stream() - .noneMatch(c -> c.getType() == CodestartType.CODE && !c.getSpec().isPreselected())) { + && shouldAddDefaultCodeStart) { final Codestart defaultCodestart = codestarts.stream() .filter(c -> c.matches(selectedDefaultCodeStart.get())) .findFirst().orElseThrow(() -> new CodestartStructureException( @@ -178,36 +181,6 @@ protected Collection select(QuarkusCodestartProjectInput projectInput return projectCodestarts; } - private Optional getSelectedDefaultCodeStart(QuarkusCodestartProjectInput projectInput) { - // This is very hackyish, we need a better data structure to do better - Optional quarkusBom = projectInput.getBoms().stream() - .map(ArtifactCoords::fromString) - .filter(b -> isCoreBom(b) || isPlatformBom(b) || isUniverseBom(b)) - .findFirst(); - - String bomVersion = null; - - if (quarkusBom.isPresent()) { - bomVersion = quarkusBom.get().getVersion(); - } - - if (bomVersion == null || VersionScheme.MAVEN.compare(bomVersion, "2.8") >= 0) { - if (projectInput.getExtensions().isEmpty() || - (projectInput.getExtensions().size() == 1 - && isLanguageExtension(projectInput.getExtensions().iterator().next()))) { - var defaultCodestart = projectInput.getDefaultCodestart(); - if (defaultCodestart == null) { - defaultCodestart = QuarkusCodestartCatalog.ExtensionCodestart.REST.key(); - } - return Optional.of(defaultCodestart); - } - - return Optional.empty(); - } - - return Optional.of(ExtensionCodestart.RESTEASY.key()); - } - private boolean isCoreBom(ArtifactCoords artifactCoords) { return IO_QUARKUS_GROUP_ID.equals(artifactCoords.getGroupId()) && QUARKUS_BOM.equals(artifactCoords.getArtifactId()); } diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java index a696b9d5a5654..85d8390526eff 100644 --- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java +++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java @@ -252,6 +252,7 @@ private void checkMinimumJavaVersion(String javaVersionString, List e } private static String getDefaultCodestart(ExtensionCatalog catalog) { + // Recent versions of the catalog have a default-codestart in the project metadata (2.10+) var map = catalog.getMetadata(); if (map != null && !map.isEmpty()) { var projectMetadata = map.get("project"); @@ -264,6 +265,7 @@ private static String getDefaultCodestart(ExtensionCatalog catalog) { } } } - return null; + // Let's use resteasy-reactive for older versions + return "resteasy-reactive"; } }