diff --git a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/TelemetryIT.java b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java similarity index 98% rename from http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/TelemetryIT.java rename to http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java index 4404218d5..61efce3e9 100644 --- a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/TelemetryIT.java +++ b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java @@ -20,7 +20,7 @@ import io.restassured.response.Response; @QuarkusScenario -public class TelemetryIT { +public class GraphQLTelemetryIT { private static final int GRPC_COLLECTOR_PORT = 14250; @JaegerContainer(restPort = GRPC_COLLECTOR_PORT) diff --git a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftTelemetryIT.java b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftGraphQLTelemetryIT.java similarity index 63% rename from http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftTelemetryIT.java rename to http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftGraphQLTelemetryIT.java index 20a2bb515..8257a3db0 100644 --- a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftTelemetryIT.java +++ b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftGraphQLTelemetryIT.java @@ -3,6 +3,6 @@ import io.quarkus.test.scenarios.OpenShiftScenario; @OpenShiftScenario -public class OpenShiftTelemetryIT extends TelemetryIT { +public class OpenShiftGraphQLTelemetryIT extends GraphQLTelemetryIT { } diff --git a/http/graphql/src/test/java/io/quarkus/ts/http/graphql/TracingIT.java b/http/graphql/src/test/java/io/quarkus/ts/http/graphql/GraphQLTracingIT.java similarity index 98% rename from http/graphql/src/test/java/io/quarkus/ts/http/graphql/TracingIT.java rename to http/graphql/src/test/java/io/quarkus/ts/http/graphql/GraphQLTracingIT.java index ff1aef908..7e3e20907 100644 --- a/http/graphql/src/test/java/io/quarkus/ts/http/graphql/TracingIT.java +++ b/http/graphql/src/test/java/io/quarkus/ts/http/graphql/GraphQLTracingIT.java @@ -20,7 +20,7 @@ import io.restassured.response.Response; @QuarkusScenario -public class TracingIT { +public class GraphQLTracingIT { private static final String SERVICE_NAME = "graphql-service"; @JaegerContainer diff --git a/http/graphql/src/test/java/io/quarkus/ts/http/graphql/OpenShiftTracingIT.java b/http/graphql/src/test/java/io/quarkus/ts/http/graphql/OpenShiftGraphQLTracingIT.java similarity index 62% rename from http/graphql/src/test/java/io/quarkus/ts/http/graphql/OpenShiftTracingIT.java rename to http/graphql/src/test/java/io/quarkus/ts/http/graphql/OpenShiftGraphQLTracingIT.java index b4ed4f780..16c272fba 100644 --- a/http/graphql/src/test/java/io/quarkus/ts/http/graphql/OpenShiftTracingIT.java +++ b/http/graphql/src/test/java/io/quarkus/ts/http/graphql/OpenShiftGraphQLTracingIT.java @@ -3,6 +3,6 @@ import io.quarkus.test.scenarios.OpenShiftScenario; @OpenShiftScenario -public class OpenShiftTracingIT extends TracingIT { +public class OpenShiftGraphQLTracingIT extends GraphQLTracingIT { } diff --git a/http/jaxrs/pom.xml b/http/jaxrs/pom.xml index 410fcf001..5cd4b3a3b 100644 --- a/http/jaxrs/pom.xml +++ b/http/jaxrs/pom.xml @@ -9,7 +9,7 @@ jaxrs jar - Quarkus QE TS: HTTP: jaxrs + Quarkus QE TS: HTTP: JAX-RS io.quarkus diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java index 7f7bc0005..46ff58c9c 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java @@ -34,7 +34,7 @@ public String hello() { @GET @Produces(MediaType.TEXT_PLAIN) @Path("/serialize-string") - public String serstring() throws IOException, ClassNotFoundException { + public String getSerializedString() throws IOException, ClassNotFoundException { byte[] bytes; @@ -56,7 +56,7 @@ public String serstring() throws IOException, ClassNotFoundException { @GET @Produces(MediaType.TEXT_PLAIN) @Path("/serialize-list") - public String serlist() throws IOException, ClassNotFoundException { + public String getSerializedList() throws IOException, ClassNotFoundException { byte[] bytes; @@ -82,7 +82,8 @@ public String serlist() throws IOException, ClassNotFoundException { @GET @Produces(MediaType.APPLICATION_JSON) @Path("/big-serialize-list") - public Map bigSerlist(@QueryParam("expSize") int expSize) throws IOException, ClassNotFoundException { + public Map getBigSerializedList(@QueryParam("expSize") int expSize) + throws IOException, ClassNotFoundException { ByteArrayOutputStream out = new ByteArrayOutputStream(); int ix = 0; try (JsonGenerator g = MAPPER.createGenerator(out)) { diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BaseQuarkusBundleIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BasicRESTEasyJacksonIT.java similarity index 92% rename from http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BaseQuarkusBundleIT.java rename to http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BasicRESTEasyJacksonIT.java index d9cd18cfd..30beb68c8 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BaseQuarkusBundleIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BasicRESTEasyJacksonIT.java @@ -8,7 +8,7 @@ import io.quarkus.test.scenarios.QuarkusScenario; @QuarkusScenario -public class BaseQuarkusBundleIT { +public class BasicRESTEasyJacksonIT { @Test public void testQuarkusEndpoint() { diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/SerializationIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/RESTEasyJacksonSerializationIT.java similarity index 98% rename from http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/SerializationIT.java rename to http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/RESTEasyJacksonSerializationIT.java index 08eba34a3..360c15346 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/SerializationIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/RESTEasyJacksonSerializationIT.java @@ -12,7 +12,7 @@ @Tag("QUARKUS-1554") @QuarkusScenario -public class SerializationIT { +public class RESTEasyJacksonSerializationIT { protected final static int LONGEST_EAGER_ALLOC = 100_000; protected final static int FIRST_RANDOM_VARIATION = 1; diff --git a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ProxyIT.java b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientProxyIT.java similarity index 97% rename from http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ProxyIT.java rename to http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientProxyIT.java index b88157e48..7ea64297c 100644 --- a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ProxyIT.java +++ b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ReactiveRestClientProxyIT.java @@ -13,7 +13,7 @@ import io.restassured.response.Response; @QuarkusScenario -public class ProxyIT { +public class ReactiveRestClientProxyIT { private static final String USER = "proxyuser"; private static final String PASSWORD = "proxypassword"; @@ -30,7 +30,7 @@ public class ProxyIT { () -> proxy.getHost().replace("http://", "") + ":" + proxy.getPort()); @Test - void getThrough() { + void sendRequestThroughProxy() { Response proxied = proxyApp.given().with().get("/proxied/"); Assertions.assertEquals(HttpStatus.SC_OK, proxied.statusCode()); Assertions.assertTrue(proxied.body().asString().contains("Example Domain")); diff --git a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ClassicPropertiesIT.java b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/StandardMicroProfilePropertiesNotationIT.java similarity index 93% rename from http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ClassicPropertiesIT.java rename to http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/StandardMicroProfilePropertiesNotationIT.java index 4110f0e21..f8ba56293 100644 --- a/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/ClassicPropertiesIT.java +++ b/http/rest-client-reactive/src/test/java/io/quarkus/ts/http/restclient/reactive/StandardMicroProfilePropertiesNotationIT.java @@ -11,7 +11,7 @@ import io.restassured.response.Response; @QuarkusScenario -public class ClassicPropertiesIT { +public class StandardMicroProfilePropertiesNotationIT { @QuarkusApplication static RestService app = new RestService().withProperties("classic.properties"); diff --git a/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/ChuckNorrisResourceIT.java b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/VertxWebClientIT.java similarity index 99% rename from http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/ChuckNorrisResourceIT.java rename to http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/VertxWebClientIT.java index 2b2d5ff02..02900f5f4 100644 --- a/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/ChuckNorrisResourceIT.java +++ b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/VertxWebClientIT.java @@ -39,7 +39,7 @@ import io.restassured.response.Response; @QuarkusScenario -public class ChuckNorrisResourceIT { +public class VertxWebClientIT { static final String EXPECTED_ID = "aBanNLDwR-SAz7iMHuCiyw"; static final String EXPECTED_VALUE = "Chuck Norris has already been to mars; that why there's no signs of life"; static final int DELAY = 3500; // must be greater than vertx.webclient.timeout-sec diff --git a/javaee-like-getting-started/pom.xml b/javaee-like-getting-started/pom.xml index 4930a88e0..7e4575dbc 100644 --- a/javaee-like-getting-started/pom.xml +++ b/javaee-like-getting-started/pom.xml @@ -9,7 +9,7 @@ javaee-like-getting-started jar - Quarkus QE TS: javaee like getting started + Quarkus QE TS: Java EE like Getting Started io.quarkus diff --git a/logging/jboss/src/test/java/io/quarkus/ts/logging/jboss/LogResourceIT.java b/logging/jboss/src/test/java/io/quarkus/ts/logging/jboss/LoggingInJsonIT.java similarity index 99% rename from logging/jboss/src/test/java/io/quarkus/ts/logging/jboss/LogResourceIT.java rename to logging/jboss/src/test/java/io/quarkus/ts/logging/jboss/LoggingInJsonIT.java index b879ba1c7..3f129a572 100644 --- a/logging/jboss/src/test/java/io/quarkus/ts/logging/jboss/LogResourceIT.java +++ b/logging/jboss/src/test/java/io/quarkus/ts/logging/jboss/LoggingInJsonIT.java @@ -11,7 +11,7 @@ import io.quarkus.test.services.QuarkusApplication; @QuarkusScenario -public class LogResourceIT { +public class LoggingInJsonIT { private static final String EXPECTED_JSON_MESSAGE = "\"level\":\"INFO\",\"message\":\"Profile prod activated. \""; private static final String MESSAGE = "messageLog"; diff --git a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpReactiveIT.java similarity index 96% rename from messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java rename to messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpReactiveIT.java index 303d7188a..ced8a7173 100644 --- a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java +++ b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpReactiveIT.java @@ -11,7 +11,7 @@ import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; -public abstract class BaseAmqpIT { +public abstract class BaseAmqpReactiveIT { static final int ASSERT_TIMEOUT_SECONDS = 30; static final List EXPECTED_PRICES = Arrays.asList("10", "20", "30", "40", "50", "60", "70", "80", "90", "100"); diff --git a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/DevModeAmqpIT.java b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/DevModeAmqpReactiveIT.java similarity index 91% rename from messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/DevModeAmqpIT.java rename to messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/DevModeAmqpReactiveIT.java index 0166e82ea..4dc26b06f 100644 --- a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/DevModeAmqpIT.java +++ b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/DevModeAmqpReactiveIT.java @@ -9,7 +9,7 @@ @Tag("QUARKUS-959") @QuarkusScenario -public class DevModeAmqpIT extends BaseAmqpIT { +public class DevModeAmqpReactiveIT extends BaseAmqpReactiveIT { /** * AMQP must be started using DEV services when running in DEV mode diff --git a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java deleted file mode 100644 index 469d92c10..000000000 --- a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.quarkus.ts.messaging.amqpreactive; - -import io.quarkus.test.scenarios.OpenShiftScenario; - -@OpenShiftScenario -public class OpenShiftProdAmqpIT extends ProdAmqpIT { -} diff --git a/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpReactiveIT.java similarity index 63% rename from messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java rename to messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpReactiveIT.java index 469d92c10..1a10b50c2 100644 --- a/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java +++ b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpReactiveIT.java @@ -3,5 +3,5 @@ import io.quarkus.test.scenarios.OpenShiftScenario; @OpenShiftScenario -public class OpenShiftProdAmqpIT extends ProdAmqpIT { +public class OpenShiftProdAmqpReactiveIT extends ProdAmqpReactiveIT { } diff --git a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpReactiveIT.java similarity index 92% rename from messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java rename to messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpReactiveIT.java index e77677e4b..e6f7406d3 100644 --- a/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java +++ b/messaging/amqp-reactive/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpReactiveIT.java @@ -8,7 +8,7 @@ import io.quarkus.test.services.containers.model.AmqProtocol; @QuarkusScenario -public class ProdAmqpIT extends BaseAmqpIT { +public class ProdAmqpReactiveIT extends BaseAmqpReactiveIT { @AmqContainer(image = "registry.access.redhat.com/amq-broker-7/amq-broker-72-openshift", protocol = AmqProtocol.AMQP) static AmqService amq = new AmqService(); diff --git a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Consumer.java b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Consumer.java similarity index 97% rename from messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Consumer.java rename to messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Consumer.java index da42514a9..c6b7324f0 100644 --- a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Consumer.java +++ b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Consumer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpbinary; import java.util.HashMap; import java.util.Objects; diff --git a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Producer.java b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Producer.java similarity index 95% rename from messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Producer.java rename to messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Producer.java index 8d6bdc98d..d90fc05cc 100644 --- a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Producer.java +++ b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Producer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpbinary; import java.net.URI; import java.time.Duration; diff --git a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Resource.java b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Resource.java similarity index 90% rename from messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Resource.java rename to messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Resource.java index 869b893b7..098f041ad 100644 --- a/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/amqpreactive/Resource.java +++ b/messaging/cloud-events/amqp-binary/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/Resource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpbinary; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java b/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java deleted file mode 100644 index 469d92c10..000000000 --- a/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/OpenShiftProdAmqpIT.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.quarkus.ts.messaging.amqpreactive; - -import io.quarkus.test.scenarios.OpenShiftScenario; - -@OpenShiftScenario -public class OpenShiftProdAmqpIT extends ProdAmqpIT { -} diff --git a/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java b/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/BaseBinaryCloudEventsOverAmqpIT.java similarity index 92% rename from messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java rename to messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/BaseBinaryCloudEventsOverAmqpIT.java index 2f7503d79..80d0acf56 100644 --- a/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java +++ b/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/BaseBinaryCloudEventsOverAmqpIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpbinary; import static io.restassured.RestAssured.given; import static org.awaitility.Awaitility.await; @@ -13,7 +13,7 @@ import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; -public abstract class BaseAmqpIT { +public abstract class BaseBinaryCloudEventsOverAmqpIT { static final int ASSERT_TIMEOUT_SECONDS = 30; static final List EXPECTED_PRICES = Arrays.asList("10", "20", "30", "40", "50", "60", "70", "80", "90", "100"); diff --git a/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java b/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/BinaryCloudEventsOverProdAmqpIT.java similarity index 82% rename from messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java rename to messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/BinaryCloudEventsOverProdAmqpIT.java index 13461cc6a..0990c4969 100644 --- a/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java +++ b/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/BinaryCloudEventsOverProdAmqpIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpbinary; import io.quarkus.test.bootstrap.AmqService; import io.quarkus.test.bootstrap.RestService; @@ -8,7 +8,7 @@ import io.quarkus.test.services.containers.model.AmqProtocol; @QuarkusScenario -public class ProdAmqpIT extends BaseAmqpIT { +public class BinaryCloudEventsOverProdAmqpIT extends BaseBinaryCloudEventsOverAmqpIT { @AmqContainer(image = "registry.access.redhat.com/amq-broker-7/amq-broker-72-openshift", protocol = AmqProtocol.AMQP) static AmqService amq = new AmqService(); diff --git a/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/OpenShiftBinaryCloudEventsOverProdAmqpIT.java b/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/OpenShiftBinaryCloudEventsOverProdAmqpIT.java new file mode 100644 index 000000000..0193a5347 --- /dev/null +++ b/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpbinary/OpenShiftBinaryCloudEventsOverProdAmqpIT.java @@ -0,0 +1,7 @@ +package io.quarkus.ts.messaging.cloudevents.amqpbinary; + +import io.quarkus.test.scenarios.OpenShiftScenario; + +@OpenShiftScenario +public class OpenShiftBinaryCloudEventsOverProdAmqpIT extends BinaryCloudEventsOverProdAmqpIT { +} diff --git a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Consumer.java b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Consumer.java similarity index 97% rename from messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Consumer.java rename to messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Consumer.java index da42514a9..04b6ebfeb 100644 --- a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Consumer.java +++ b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Consumer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpjson; import java.util.HashMap; import java.util.Objects; diff --git a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Producer.java b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Producer.java similarity index 97% rename from messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Producer.java rename to messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Producer.java index cfd6989c2..d9aa6b16c 100644 --- a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Producer.java +++ b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Producer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpjson; import java.net.URI; import java.time.Duration; diff --git a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Resource.java b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Resource.java similarity index 90% rename from messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Resource.java rename to messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Resource.java index 869b893b7..affe7a331 100644 --- a/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/amqpreactive/Resource.java +++ b/messaging/cloud-events/amqp-json/src/main/java/io/quarkus/ts/messaging/cloudevents/amqpjson/Resource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpjson; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java b/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/BaseJSONCloudEventsOverAmqpIT.java similarity index 92% rename from messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java rename to messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/BaseJSONCloudEventsOverAmqpIT.java index 2f7503d79..4cb15fa4b 100644 --- a/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/amqpreactive/BaseAmqpIT.java +++ b/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/BaseJSONCloudEventsOverAmqpIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpjson; import static io.restassured.RestAssured.given; import static org.awaitility.Awaitility.await; @@ -13,7 +13,7 @@ import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; -public abstract class BaseAmqpIT { +public abstract class BaseJSONCloudEventsOverAmqpIT { static final int ASSERT_TIMEOUT_SECONDS = 30; static final List EXPECTED_PRICES = Arrays.asList("10", "20", "30", "40", "50", "60", "70", "80", "90", "100"); diff --git a/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java b/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/JSONCloudEventsOverProdAmqpIT.java similarity index 83% rename from messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java rename to messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/JSONCloudEventsOverProdAmqpIT.java index 13461cc6a..1f8a45e36 100644 --- a/messaging/cloud-events/amqp-binary/src/test/java/io/quarkus/ts/messaging/amqpreactive/ProdAmqpIT.java +++ b/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/JSONCloudEventsOverProdAmqpIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.amqpreactive; +package io.quarkus.ts.messaging.cloudevents.amqpjson; import io.quarkus.test.bootstrap.AmqService; import io.quarkus.test.bootstrap.RestService; @@ -8,7 +8,7 @@ import io.quarkus.test.services.containers.model.AmqProtocol; @QuarkusScenario -public class ProdAmqpIT extends BaseAmqpIT { +public class JSONCloudEventsOverProdAmqpIT extends BaseJSONCloudEventsOverAmqpIT { @AmqContainer(image = "registry.access.redhat.com/amq-broker-7/amq-broker-72-openshift", protocol = AmqProtocol.AMQP) static AmqService amq = new AmqService(); diff --git a/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/OpenShiftJSONCloudEventsOverProdAmqpIT.java b/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/OpenShiftJSONCloudEventsOverProdAmqpIT.java new file mode 100644 index 000000000..a8035e0a0 --- /dev/null +++ b/messaging/cloud-events/amqp-json/src/test/java/io/quarkus/ts/messaging/cloudevents/amqpjson/OpenShiftJSONCloudEventsOverProdAmqpIT.java @@ -0,0 +1,7 @@ +package io.quarkus.ts.messaging.cloudevents.amqpjson; + +import io.quarkus.test.scenarios.OpenShiftScenario; + +@OpenShiftScenario +public class OpenShiftJSONCloudEventsOverProdAmqpIT extends JSONCloudEventsOverProdAmqpIT { +} diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/AdminResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/AdminResource.java similarity index 93% rename from security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/AdminResource.java rename to security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/AdminResource.java index 01e99f8e8..aa40498d7 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/AdminResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/AdminResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.keycloak.authz; +package io.quarkus.ts.security.keycloak.authz.reactive; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserAdvancedResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserAdvancedResource.java similarity index 86% rename from security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserAdvancedResource.java rename to security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserAdvancedResource.java index 8a11bea57..b3af8ee26 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserAdvancedResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserAdvancedResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.keycloak.authz; +package io.quarkus.ts.security.keycloak.authz.reactive; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserDetailsResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserDetailsResource.java similarity index 93% rename from security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserDetailsResource.java rename to security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserDetailsResource.java index 106ead273..8a048d0b9 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserDetailsResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserDetailsResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.keycloak.authz; +package io.quarkus.ts.security.keycloak.authz.reactive; import javax.inject.Inject; import javax.ws.rs.Consumes; diff --git a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserResource.java b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserResource.java similarity index 93% rename from security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserResource.java rename to security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserResource.java index 4270e15c3..682e2a894 100644 --- a/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/UserResource.java +++ b/security/keycloak-authz-reactive/src/main/java/io/quarkus/ts/security/keycloak/authz/reactive/UserResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.keycloak.authz; +package io.quarkus.ts.security.keycloak.authz.reactive; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/BaseAuthzSecurityIT.java b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/BaseAuthzSecurityIT.java similarity index 98% rename from security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/BaseAuthzSecurityIT.java rename to security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/BaseAuthzSecurityIT.java index 9f8f9756f..c58012071 100644 --- a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/BaseAuthzSecurityIT.java +++ b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/BaseAuthzSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.keycloak.authz; +package io.quarkus.ts.security.keycloak.authz.reactive; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/KeycloakAuthzSecurityIT.java b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/KeycloakAuthzSecurityIT.java similarity index 95% rename from security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/KeycloakAuthzSecurityIT.java rename to security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/KeycloakAuthzSecurityIT.java index 570f71b6b..733af3908 100644 --- a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/KeycloakAuthzSecurityIT.java +++ b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/KeycloakAuthzSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.keycloak.authz; +package io.quarkus.ts.security.keycloak.authz.reactive; import io.quarkus.test.bootstrap.KeycloakService; import io.quarkus.test.bootstrap.RestService; diff --git a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/OpenShiftRhSsoAuthzSecurityIT.java b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/OpenShiftRhSsoAuthzSecurityIT.java similarity index 95% rename from security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/OpenShiftRhSsoAuthzSecurityIT.java rename to security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/OpenShiftRhSsoAuthzSecurityIT.java index 45de67e30..3e30fd831 100644 --- a/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/OpenShiftRhSsoAuthzSecurityIT.java +++ b/security/keycloak-authz-reactive/src/test/java/io/quarkus/ts/security/keycloak/authz/reactive/OpenShiftRhSsoAuthzSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.keycloak.authz; +package io.quarkus.ts.security.keycloak.authz.reactive; import org.junit.jupiter.api.condition.EnabledIfSystemProperty;