From b081665c0289c1555447de6c56fc6b1c3db10d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Mon, 18 Mar 2024 13:59:35 +0100 Subject: [PATCH] Rename reactive extensions to new names --- examples/amq-amqp/pom.xml | 2 +- .../io/quarkus/qe/GreetingResourceIT.java | 25 +++++++++---------- .../project/classic/pom.xml | 2 +- examples/funqy-knative-events/pom.xml | 2 +- examples/greetings/pom.xml | 2 +- examples/kafka-registry/pom.xml | 2 +- examples/kafka-streams/pom.xml | 2 +- examples/kafka/pom.xml | 2 +- .../io/quarkus/qe/QuarkusCliClientIT.java | 10 +++++--- examples/restclient/pom.xml | 2 +- pom.xml | 2 +- .../io/quarkus/test/QuarkusCliClientIT.java | 20 ++++++++------- .../src/main/resources/build-time-list | 8 +++--- 13 files changed, 42 insertions(+), 39 deletions(-) diff --git a/examples/amq-amqp/pom.xml b/examples/amq-amqp/pom.xml index 752b7e8f3..40e84b498 100644 --- a/examples/amq-amqp/pom.xml +++ b/examples/amq-amqp/pom.xml @@ -12,7 +12,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-amqp + quarkus-messaging-amqp io.quarkus diff --git a/examples/blocking-reactive-model/src/test/java/io/quarkus/qe/GreetingResourceIT.java b/examples/blocking-reactive-model/src/test/java/io/quarkus/qe/GreetingResourceIT.java index a7188606c..3965fa9a4 100644 --- a/examples/blocking-reactive-model/src/test/java/io/quarkus/qe/GreetingResourceIT.java +++ b/examples/blocking-reactive-model/src/test/java/io/quarkus/qe/GreetingResourceIT.java @@ -17,24 +17,23 @@ public class GreetingResourceIT { private static final String HELLO = "Hello"; private static final String HELLO_PATH = "/hello"; private static final String RESTEASY_CLASSIC = "resteasy"; - private static final String RESTEASY_REACTIVE = "resteasy-reactive"; + private static final String REST = "rest"; @QuarkusApplication(dependencies = @Dependency(artifactId = "quarkus-" + RESTEASY_CLASSIC)) - static final RestService blocking = new RestService(); + static final RestService resteasyClassic = new RestService(); - @QuarkusApplication(dependencies = @Dependency(artifactId = "quarkus-" + RESTEASY_REACTIVE)) - static final RestService reactive = new RestService(); + @QuarkusApplication(dependencies = @Dependency(artifactId = "quarkus-" + REST)) + static final RestService rest = new RestService(); @Test public void shouldPickTheForcedDependencies() { - // classic - blocking.given().get(HELLO_PATH).then().body(is(HELLO)); - assertTrue(blocking.logs().forQuarkus().installedFeatures().contains(RESTEASY_CLASSIC)); - // necessary 'resteasy' is also prefix of the 'resteasy-reactive' - assertFalse(blocking.logs().forQuarkus().installedFeatures().contains(RESTEASY_REACTIVE)); - - // reactive - reactive.given().get(HELLO_PATH).then().body(is(HELLO)); - assertTrue(reactive.logs().forQuarkus().installedFeatures().contains(RESTEASY_REACTIVE)); + // resteasy classic + resteasyClassic.given().get(HELLO_PATH).then().body(is(HELLO)); + assertTrue(resteasyClassic.logs().forQuarkus().installedFeatures().contains(RESTEASY_CLASSIC)); + + // rest + rest.given().get(HELLO_PATH).then().body(is(HELLO)); + assertTrue(rest.logs().forQuarkus().installedFeatures().contains(REST)); + assertFalse(rest.logs().forQuarkus().installedFeatures().contains(RESTEASY_CLASSIC)); } } diff --git a/examples/debug/src/test/resources-filtered/project/classic/pom.xml b/examples/debug/src/test/resources-filtered/project/classic/pom.xml index ce5efe778..6906d58f2 100644 --- a/examples/debug/src/test/resources-filtered/project/classic/pom.xml +++ b/examples/debug/src/test/resources-filtered/project/classic/pom.xml @@ -24,7 +24,7 @@ io.quarkus - quarkus-resteasy-reactive + quarkus-rest io.quarkus.qe diff --git a/examples/funqy-knative-events/pom.xml b/examples/funqy-knative-events/pom.xml index 4906910c4..9c05ca406 100644 --- a/examples/funqy-knative-events/pom.xml +++ b/examples/funqy-knative-events/pom.xml @@ -21,7 +21,7 @@ io.quarkus - quarkus-rest-client-reactive-jackson + quarkus-rest-client-jackson io.quarkus.qe diff --git a/examples/greetings/pom.xml b/examples/greetings/pom.xml index 0e0b4684c..104fc9b3b 100644 --- a/examples/greetings/pom.xml +++ b/examples/greetings/pom.xml @@ -12,7 +12,7 @@ io.quarkus - quarkus-resteasy-reactive + quarkus-rest io.quarkus.qe diff --git a/examples/kafka-registry/pom.xml b/examples/kafka-registry/pom.xml index 1055fcd92..d0d7543f7 100644 --- a/examples/kafka-registry/pom.xml +++ b/examples/kafka-registry/pom.xml @@ -16,7 +16,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/examples/kafka-streams/pom.xml b/examples/kafka-streams/pom.xml index 0d58bfe57..465115600 100644 --- a/examples/kafka-streams/pom.xml +++ b/examples/kafka-streams/pom.xml @@ -12,7 +12,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml index fd65c3bf5..c3cbd737c 100644 --- a/examples/kafka/pom.xml +++ b/examples/kafka/pom.xml @@ -12,7 +12,7 @@ io.quarkus - quarkus-smallrye-reactive-messaging-kafka + quarkus-messaging-kafka io.quarkus diff --git a/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java b/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java index f76043e27..dc3df42d9 100644 --- a/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java +++ b/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliClientIT.java @@ -12,6 +12,7 @@ import jakarta.inject.Inject; import org.apache.http.HttpStatus; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -20,11 +21,12 @@ import io.quarkus.test.bootstrap.QuarkusCliRestService; import io.quarkus.test.scenarios.QuarkusScenario; +@Disabled // TODO: enable when Quarkus 3.9 is released @Tag("quarkus-cli") @QuarkusScenario public class QuarkusCliClientIT { - static final String RESTEASY_REACTIVE_EXTENSION = "quarkus-resteasy-reactive"; + static final String REST_EXTENSION = "quarkus-rest"; static final String SMALLRYE_HEALTH_EXTENSION = "quarkus-smallrye-health"; static final int CMD_DELAY_SEC = 3; @@ -73,15 +75,15 @@ public void shouldAddAndRemoveExtensions() throws InterruptedException { QuarkusCliRestService app = cliClient.createApplication("app", QuarkusCliClient.CreateApplicationRequest.defaults()); - // By default, it installs only "quarkus-resteasy-reactive" - assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION); + // By default, it installs only "quarkus-rest" + assertInstalledExtensions(app, REST_EXTENSION); // Let's install Quarkus SmallRye Health QuarkusCliClient.Result result = app.installExtension(SMALLRYE_HEALTH_EXTENSION); assertTrue(result.isSuccessful(), SMALLRYE_HEALTH_EXTENSION + " was not installed. Output: " + result.getOutput()); // Verify both extensions now - assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION, SMALLRYE_HEALTH_EXTENSION); + assertInstalledExtensions(app, REST_EXTENSION, SMALLRYE_HEALTH_EXTENSION); // The health endpoint should be now available app.start(); diff --git a/examples/restclient/pom.xml b/examples/restclient/pom.xml index a8c624c16..e43220642 100644 --- a/examples/restclient/pom.xml +++ b/examples/restclient/pom.xml @@ -16,7 +16,7 @@ io.quarkus - quarkus-rest-client-mutiny + quarkus-resteasy-client-mutiny io.quarkus.qe diff --git a/pom.xml b/pom.xml index 17a48ae19..c5f553552 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 1.9.0 quarkus-bom io.quarkus - 3.8.1 + 3.9.0.CR2 quarkus-cli **/*IT.java **/OpenShift*IT.java diff --git a/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java b/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java index b9e23c4f9..f3c873246 100644 --- a/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java +++ b/quarkus-test-cli/src/test/java/io/quarkus/test/QuarkusCliClientIT.java @@ -14,6 +14,7 @@ import jakarta.inject.Inject; import org.apache.http.HttpStatus; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -23,13 +24,14 @@ import io.quarkus.test.scenarios.annotations.EnabledOnNative; import io.quarkus.test.services.quarkus.model.QuarkusProperties; +@Disabled // TODO: enable when Quarkus 3.9 is released @Tag("quarkus-cli") @QuarkusScenario public class QuarkusCliClientIT { - static final String RESTEASY_SPRING_WEB_EXTENSION = "quarkus-spring-web"; - static final String RESTEASY_REACTIVE_EXTENSION = "quarkus-resteasy-reactive"; - static final String RESTEASY_REACTIVE_JACKSON_EXTENSION = "quarkus-resteasy-reactive-jackson"; + static final String REST_SPRING_WEB_EXTENSION = "quarkus-spring-web-rest"; + static final String REST_EXTENSION = "quarkus-rest"; + static final String REST_JACKSON_EXTENSION = "quarkus-rest-jackson"; static final String SMALLRYE_HEALTH_EXTENSION = "quarkus-smallrye-health"; static final int CMD_DELAY_SEC = 3; @@ -74,11 +76,11 @@ public void shouldBuildApplicationOnNativeUsingDocker() { public void shouldCreateApplicationWithCodeStarter() { // Create application with Resteasy Jackson QuarkusCliRestService app = cliClient.createApplication("app", - defaults().withExtensions(RESTEASY_SPRING_WEB_EXTENSION, - RESTEASY_REACTIVE_JACKSON_EXTENSION)); + defaults().withExtensions(REST_SPRING_WEB_EXTENSION, + REST_JACKSON_EXTENSION)); // Verify By default, it installs only "quarkus-resteasy" - assertInstalledExtensions(app, RESTEASY_SPRING_WEB_EXTENSION, RESTEASY_REACTIVE_JACKSON_EXTENSION); + assertInstalledExtensions(app, REST_SPRING_WEB_EXTENSION, REST_JACKSON_EXTENSION); // Start using DEV mode app.start(); @@ -99,15 +101,15 @@ public void shouldAddAndRemoveExtensions() throws InterruptedException { // Create application QuarkusCliRestService app = cliClient.createApplication("app", defaults()); - // By default, it installs only "quarkus-resteasy-reactive" - assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION); + // By default, it installs only "quarkus-rest" + assertInstalledExtensions(app, REST_EXTENSION); // Let's install Quarkus SmallRye Health QuarkusCliClient.Result result = app.installExtension(SMALLRYE_HEALTH_EXTENSION); assertTrue(result.isSuccessful(), SMALLRYE_HEALTH_EXTENSION + " was not installed. Output: " + result.getOutput()); // Verify both extensions now - assertInstalledExtensions(app, RESTEASY_REACTIVE_EXTENSION, SMALLRYE_HEALTH_EXTENSION); + assertInstalledExtensions(app, REST_EXTENSION, SMALLRYE_HEALTH_EXTENSION); // The health endpoint should be now available app.start(); diff --git a/quarkus-test-core/src/main/resources/build-time-list b/quarkus-test-core/src/main/resources/build-time-list index d2f7b69cc..dc30e5f4a 100644 --- a/quarkus-test-core/src/main/resources/build-time-list +++ b/quarkus-test-core/src/main/resources/build-time-list @@ -65,14 +65,14 @@ quarkus.native.debug.enabled quarkus.neo4j.health.enabled quarkus.oauth2.enabled quarkus.oidc-client.enabled -quarkus.oidc-token-propagation.enabled +quarkus.resteasy-client-oidc-token-propagation.enabled quarkus.oidc.enabled quarkus.openshift. quarkus.otel.enabled quarkus.package.type -quarkus.reactive-messaging.health.enabled -quarkus.reactive-messaging.kafka.serializer-autodetection.enabled -quarkus.reactive-messaging.metrics.enabled +quarkus.messaging.health.enabled +quarkus.messaging.kafka.serializer-autodetection.enabled +quarkus.messaging.metrics.enabled quarkus.redis.devservices.enabled quarkus.redis.health.enabled quarkus.resteasy.gzip.enabled