diff --git a/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/Person.java b/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/telemetry/Person.java similarity index 88% rename from http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/Person.java rename to http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/telemetry/Person.java index cbf104a94..cc4e7b16e 100644 --- a/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/Person.java +++ b/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/telemetry/Person.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.http.graphql; +package io.quarkus.ts.http.graphql.telemetry; public class Person { private final String name; diff --git a/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/PersonsEndpoint.java b/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/telemetry/PersonsEndpoint.java similarity index 96% rename from http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/PersonsEndpoint.java rename to http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/telemetry/PersonsEndpoint.java index 6b25e9cc7..ad7143153 100644 --- a/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/PersonsEndpoint.java +++ b/http/graphql-telemetry/src/main/java/io/quarkus/ts/http/graphql/telemetry/PersonsEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.http.graphql; +package io.quarkus.ts.http.graphql.telemetry; import java.util.NoSuchElementException; diff --git a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/OpenShiftTelemetryIT.java b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftTelemetryIT.java similarity index 74% rename from http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/OpenShiftTelemetryIT.java rename to http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftTelemetryIT.java index 0e751c907..20a2bb515 100644 --- a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/OpenShiftTelemetryIT.java +++ b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/OpenShiftTelemetryIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.http.graphql; +package io.quarkus.ts.http.graphql.telemetry; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/TelemetryIT.java b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/TelemetryIT.java similarity index 90% rename from http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/TelemetryIT.java rename to http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/TelemetryIT.java index 4dd718f5f..4404218d5 100644 --- a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/TelemetryIT.java +++ b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/TelemetryIT.java @@ -1,7 +1,7 @@ -package io.quarkus.ts.http.graphql; +package io.quarkus.ts.http.graphql.telemetry; -import static io.quarkus.ts.http.graphql.Utils.createQuery; -import static io.quarkus.ts.http.graphql.Utils.sendQuery; +import static io.quarkus.ts.http.graphql.telemetry.Utils.createQuery; +import static io.quarkus.ts.http.graphql.telemetry.Utils.sendQuery; import static io.restassured.RestAssured.given; import static org.awaitility.Awaitility.await; @@ -39,7 +39,7 @@ void verifyTelemetry() { Assertions.assertEquals("Plato", reactive.jsonPath().getString("data.friend_r.name")); await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(10)).untilAsserted(() -> { - String operation = "graphql"; + String operation = "/graphql"; Response traces = given().when() .queryParam("operation", operation) .queryParam("lookback", "1h") diff --git a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/Utils.java b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/Utils.java similarity index 92% rename from http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/Utils.java rename to http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/Utils.java index 6f2ea473d..4201089d1 100644 --- a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/Utils.java +++ b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/Utils.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.http.graphql; +package io.quarkus.ts.http.graphql.telemetry; import static io.restassured.RestAssured.given; diff --git a/http/http-static/src/test/java/io/quarkus/ts/http/GenerateLargeFile.java b/http/http-static/src/test/java/io/quarkus/ts/httpstatic/GenerateLargeFile.java similarity index 100% rename from http/http-static/src/test/java/io/quarkus/ts/http/GenerateLargeFile.java rename to http/http-static/src/test/java/io/quarkus/ts/httpstatic/GenerateLargeFile.java diff --git a/http/http-static/src/test/java/io/quarkus/ts/http/LargeStaticResourceIT.java b/http/http-static/src/test/java/io/quarkus/ts/httpstatic/LargeStaticResourceIT.java similarity index 100% rename from http/http-static/src/test/java/io/quarkus/ts/http/LargeStaticResourceIT.java rename to http/http-static/src/test/java/io/quarkus/ts/httpstatic/LargeStaticResourceIT.java diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/ExecutionModelResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResource.java similarity index 96% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/ExecutionModelResource.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResource.java index b83f6d5ce..6d9039ff8 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/ExecutionModelResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/HttpCachingResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResource.java similarity index 95% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/HttpCachingResource.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResource.java index 98645bcf7..a828f1fe7 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/HttpCachingResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/MultipartBody.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartBody.java similarity index 90% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/MultipartBody.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartBody.java index 45e793669..0a2dbd75e 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/MultipartBody.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartBody.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import java.io.File; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/MultipartResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResource.java similarity index 97% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/MultipartResource.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResource.java index b68b5628d..9ed397e1e 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/MultipartResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import java.io.IOException; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/ClientMultipartBody.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/ClientMultipartBody.java similarity index 84% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/ClientMultipartBody.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/ClientMultipartBody.java index f4afae8b2..33626e22c 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/ClientMultipartBody.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/ClientMultipartBody.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.client; +package io.quarkus.ts.http.jaxrs.reactive.client; import javax.ws.rs.core.MediaType; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/MultipartClientResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResource.java similarity index 93% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/MultipartClientResource.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResource.java index 8281b163d..9c0a35586 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/MultipartClientResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.client; +package io.quarkus.ts.http.jaxrs.reactive.client; import javax.inject.Inject; import javax.ws.rs.POST; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/MultipartService.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartService.java similarity index 91% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/MultipartService.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartService.java index 17f609326..92a438cc5 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/MultipartService.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartService.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.client; +package io.quarkus.ts.http.jaxrs.reactive.client; import javax.ws.rs.Consumes; import javax.ws.rs.POST; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/PojoData.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/PojoData.java similarity index 76% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/PojoData.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/PojoData.java index 7307f3429..c6c97a2e5 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/client/PojoData.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/client/PojoData.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.client; +package io.quarkus.ts.http.jaxrs.reactive.client; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/JsonResource.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResource.java similarity index 94% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/JsonResource.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResource.java index 2c7d29821..5fca4c900 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/JsonResource.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.json; +package io.quarkus.ts.http.jaxrs.reactive.json; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/UnquotedFields.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/UnquotedFields.java similarity index 91% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/UnquotedFields.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/UnquotedFields.java index 155b2c6a7..1c123f5da 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/UnquotedFields.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/UnquotedFields.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.json; +package io.quarkus.ts.http.jaxrs.reactive.json; import java.lang.reflect.Type; import java.util.function.BiFunction; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/User.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/User.java similarity index 80% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/User.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/User.java index 46afb3e4c..c7c0db23e 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/User.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/User.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.json; +package io.quarkus.ts.http.jaxrs.reactive.json; import com.fasterxml.jackson.annotation.JsonView; diff --git a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/Views.java b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/Views.java similarity index 71% rename from http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/Views.java rename to http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/Views.java index b84687153..be5193e68 100644 --- a/http/jaxrs-reactive/src/main/java/io/quarkus/ts/jaxrs/reactive/json/Views.java +++ b/http/jaxrs-reactive/src/main/java/io/quarkus/ts/http/jaxrs/reactive/json/Views.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.json; +package io.quarkus.ts.http.jaxrs.reactive.json; public class Views { diff --git a/http/jaxrs-reactive/src/main/resources/application.properties b/http/jaxrs-reactive/src/main/resources/application.properties index ed255c199..f32c211c5 100644 --- a/http/jaxrs-reactive/src/main/resources/application.properties +++ b/http/jaxrs-reactive/src/main/resources/application.properties @@ -1,4 +1,4 @@ # Disable sticky session in order to be able to test HTTP cache features in OpenShiftHttpCachingResourceIT # See https://access.redhat.comsolutions/4820731. quarkus.openshift.route.annotations."haproxy.router.openshift.io/disable_cookies"=true -io.quarkus.ts.jaxrs.reactive.client.MultipartService/mp-rest/url=http://localhost:${quarkus.http.port} \ No newline at end of file +io.quarkus.ts.http.jaxrs.reactive.client.MultipartService/mp-rest/url=http://localhost:${quarkus.http.port} \ No newline at end of file diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/AsciiMultipartResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/AsciiMultipartResourceIT.java similarity index 97% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/AsciiMultipartResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/AsciiMultipartResourceIT.java index 7ad2d9341..5780d9373 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/AsciiMultipartResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/AsciiMultipartResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/ExecutionModelResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResourceIT.java similarity index 97% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/ExecutionModelResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResourceIT.java index ace7865a1..8c936a23c 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/ExecutionModelResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/ExecutionModelResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/HttpCachingResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResourceIT.java similarity index 98% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/HttpCachingResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResourceIT.java index 9a61aa211..5c8047f07 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/HttpCachingResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/HttpCachingResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.allOf; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/MultipartResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResourceIT.java similarity index 98% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/MultipartResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResourceIT.java index c1e0d2915..e3722edb8 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/MultipartResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/MultipartResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftExecutionModelResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftExecutionModelResourceIT.java similarity index 78% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftExecutionModelResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftExecutionModelResourceIT.java index b126fbc2d..a7130dd8b 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftExecutionModelResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftExecutionModelResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftHttpCachingResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftHttpCachingResourceIT.java similarity index 89% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftHttpCachingResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftHttpCachingResourceIT.java index 9ffba38b3..4296417ac 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftHttpCachingResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftHttpCachingResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import org.junit.jupiter.api.Tag; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftMultipartResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftMultipartResourceIT.java similarity index 77% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftMultipartResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftMultipartResourceIT.java index 7e1bca292..408e13984 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/OpenShiftMultipartResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/OpenShiftMultipartResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive; +package io.quarkus.ts.http.jaxrs.reactive; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/client/MultipartClientResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResourceIT.java similarity index 93% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/client/MultipartClientResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResourceIT.java index d73a41593..43fa4f641 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/client/MultipartClientResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/client/MultipartClientResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.client; +package io.quarkus.ts.http.jaxrs.reactive.client; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsStringIgnoringCase; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/json/JsonResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResourceIT.java similarity index 97% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/json/JsonResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResourceIT.java index 459beec02..d798138cf 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/json/JsonResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/json/JsonResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.json; +package io.quarkus.ts.http.jaxrs.reactive.json; import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/json/OpenShiftJsonResourceIT.java b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/json/OpenShiftJsonResourceIT.java similarity index 74% rename from http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/json/OpenShiftJsonResourceIT.java rename to http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/json/OpenShiftJsonResourceIT.java index 09ea84d3b..05a536e2a 100644 --- a/http/jaxrs-reactive/src/test/java/io/quarkus/ts/jaxrs/reactive/json/OpenShiftJsonResourceIT.java +++ b/http/jaxrs-reactive/src/test/java/io/quarkus/ts/http/jaxrs/reactive/json/OpenShiftJsonResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.jaxrs.reactive.json; +package io.quarkus.ts.http.jaxrs.reactive.json; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/GreetingResource.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java similarity index 99% rename from http/jaxrs/src/main/java/io/quarkus/ts/security/core/GreetingResource.java rename to http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java index 795377a28..7f7bc0005 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/GreetingResource.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/GreetingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/MultipartBody.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartBody.java similarity index 92% rename from http/jaxrs/src/main/java/io/quarkus/ts/security/core/MultipartBody.java rename to http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartBody.java index 8435123a3..26a2cb7e7 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/MultipartBody.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartBody.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import java.io.InputStream; diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/MultipartResource.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartResource.java similarity index 97% rename from http/jaxrs/src/main/java/io/quarkus/ts/security/core/MultipartResource.java rename to http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartResource.java index b5c44460f..2ae3e9f41 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/MultipartResource.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/MultipartResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import java.io.IOException; diff --git a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/SerializationConfig.java b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/SerializationConfig.java similarity index 94% rename from http/jaxrs/src/main/java/io/quarkus/ts/security/core/SerializationConfig.java rename to http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/SerializationConfig.java index 3b272d4c8..66bf44f6b 100644 --- a/http/jaxrs/src/main/java/io/quarkus/ts/security/core/SerializationConfig.java +++ b/http/jaxrs/src/main/java/io/quarkus/ts/http/jaxrs/SerializationConfig.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import java.util.ArrayList; import java.util.List; diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/AsciiMultipartResourceIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/AsciiMultipartResourceIT.java similarity index 97% rename from http/jaxrs/src/test/java/io/quarkus/ts/security/core/AsciiMultipartResourceIT.java rename to http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/AsciiMultipartResourceIT.java index d6d43581f..09c80cb1e 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/AsciiMultipartResourceIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/AsciiMultipartResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/BaseQuarkusBundleIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BaseQuarkusBundleIT.java similarity index 92% rename from http/jaxrs/src/test/java/io/quarkus/ts/security/core/BaseQuarkusBundleIT.java rename to http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BaseQuarkusBundleIT.java index 669b5e66f..d9cd18cfd 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/BaseQuarkusBundleIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/BaseQuarkusBundleIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/MultipartResourceIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/MultipartResourceIT.java similarity index 99% rename from http/jaxrs/src/test/java/io/quarkus/ts/security/core/MultipartResourceIT.java rename to http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/MultipartResourceIT.java index 841e22242..3a16dab15 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/MultipartResourceIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/MultipartResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/OpenShiftMultipartResourceIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/OpenShiftMultipartResourceIT.java similarity index 79% rename from http/jaxrs/src/test/java/io/quarkus/ts/security/core/OpenShiftMultipartResourceIT.java rename to http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/OpenShiftMultipartResourceIT.java index 79e780a82..c6b076944 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/OpenShiftMultipartResourceIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/OpenShiftMultipartResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/SerializationIT.java b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/SerializationIT.java similarity index 98% rename from http/jaxrs/src/test/java/io/quarkus/ts/security/core/SerializationIT.java rename to http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/SerializationIT.java index 8dfe33efd..08eba34a3 100644 --- a/http/jaxrs/src/test/java/io/quarkus/ts/security/core/SerializationIT.java +++ b/http/jaxrs/src/test/java/io/quarkus/ts/http/jaxrs/SerializationIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.core; +package io.quarkus.ts.http.jaxrs; import static io.restassured.RestAssured.given; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/BasicsRouteHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/BasicsRouteHandler.java similarity index 90% rename from http/reactive-routes/src/main/java/io/quarkus/ts/BasicsRouteHandler.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/BasicsRouteHandler.java index a0fab5288..10c2cb9bc 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/BasicsRouteHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/BasicsRouteHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.http.reactiveroutes; import io.quarkus.vertx.web.Param; import io.quarkus.vertx.web.Route; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/ReactiveRoutesTracing.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/ReactiveRoutesTracing.java similarity index 86% rename from http/reactive-routes/src/main/java/io/quarkus/ts/ReactiveRoutesTracing.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/ReactiveRoutesTracing.java index dc3cb3ffe..3aad7a2bf 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/ReactiveRoutesTracing.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/ReactiveRoutesTracing.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.http.reactiveroutes; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RouteBase; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/Request.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Request.java similarity index 86% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/Request.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Request.java index 10f712cb6..fb5e59527 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/Request.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Request.java @@ -1,9 +1,9 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import io.quarkus.ts.validation.annotations.Uppercase; +import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase; public class Request { @Size(min = 3, max = 3, message = "First code must have 3 characters") diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/Response.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Response.java similarity index 77% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/Response.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Response.java index cb56ff4d5..18e407a3f 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/Response.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/Response.java @@ -1,8 +1,8 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; import javax.validation.constraints.NotNull; -import io.quarkus.ts.validation.annotations.Uppercase; +import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase; public class Response { @NotNull(message = "id can't be null") diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnRequestBodyRouteHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandler.java similarity index 88% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnRequestBodyRouteHandler.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandler.java index 26564be4a..9092fcf8c 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnRequestBodyRouteHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; import javax.validation.Valid; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnRequestParamsRouteHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamsRouteHandler.java similarity index 90% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnRequestParamsRouteHandler.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamsRouteHandler.java index f8032db56..09b5426f5 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnRequestParamsRouteHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamsRouteHandler.java @@ -1,9 +1,9 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import io.quarkus.ts.validation.annotations.Uppercase; +import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase; import io.quarkus.vertx.web.Param; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.Route.HttpMethod; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnResponseRouteHandler.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandler.java similarity index 96% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnResponseRouteHandler.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandler.java index d20107f0c..5a93e4711 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/ValidationOnResponseRouteHandler.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; import javax.validation.Valid; import javax.validation.constraints.Size; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/Uppercase.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/Uppercase.java similarity index 93% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/Uppercase.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/Uppercase.java index 6782fec34..46b4570de 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/Uppercase.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/Uppercase.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation.annotations; +package io.quarkus.ts.http.reactiveroutes.validation.annotations; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.CONSTRUCTOR; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/UppercaseService.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseService.java similarity index 81% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/UppercaseService.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseService.java index 249f94862..454879d51 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/UppercaseService.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseService.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation.annotations; +package io.quarkus.ts.http.reactiveroutes.validation.annotations; import javax.enterprise.context.ApplicationScoped; diff --git a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/UppercaseValidator.java b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseValidator.java similarity index 88% rename from http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/UppercaseValidator.java rename to http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseValidator.java index 896af1f3b..0bfa8d077 100644 --- a/http/reactive-routes/src/main/java/io/quarkus/ts/validation/annotations/UppercaseValidator.java +++ b/http/reactive-routes/src/main/java/io/quarkus/ts/http/reactiveroutes/validation/annotations/UppercaseValidator.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation.annotations; +package io.quarkus.ts.http.reactiveroutes.validation.annotations; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/BasicsRouteHandlerIT.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/BasicsRouteHandlerIT.java similarity index 91% rename from http/reactive-routes/src/test/java/io/quarkus/ts/BasicsRouteHandlerIT.java rename to http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/BasicsRouteHandlerIT.java index d6ef918fc..6d4afec42 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/BasicsRouteHandlerIT.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/BasicsRouteHandlerIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.http.reactiveroutes; import static io.restassured.RestAssured.given; diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnRequestBodyRouteHandlerIT.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandlerIT.java similarity index 77% rename from http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnRequestBodyRouteHandlerIT.java rename to http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandlerIT.java index c9478febb..adc22dfe9 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnRequestBodyRouteHandlerIT.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestBodyRouteHandlerIT.java @@ -1,16 +1,16 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorDetails; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorField; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorStatus; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorTitle; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorDetails; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorField; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorStatus; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorTitle; import static io.restassured.RestAssured.given; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import io.quarkus.test.scenarios.QuarkusScenario; -import io.quarkus.ts.validation.utils.ValidationErrorResponse; +import io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationErrorResponse; import io.vertx.core.json.Json; @QuarkusScenario @@ -32,7 +32,8 @@ public void shouldGetValidationErrorWhenRequestFirstCodeIsWrong() { assertValidationErrorTitle(response); assertValidationErrorDetails(response); assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST); - assertValidationErrorField(response, "validateRequestBody.param.firstCode", "First code must have 3 characters"); + assertValidationErrorField(response, "validateRequestBody.param.firstCode", + "First code must have 3 characters"); } @Test @@ -51,8 +52,10 @@ public void shouldGetValidationErrorsWhenFirstAndSecondCodesAreWrong() { assertValidationErrorTitle(response); assertValidationErrorDetails(response); assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST); - assertValidationErrorField(response, "validateRequestBody.param.firstCode", "First code must have 3 characters"); - assertValidationErrorField(response, "validateRequestBody.param.secondCode", "Second second must match pattern"); + assertValidationErrorField(response, "validateRequestBody.param.firstCode", + "First code must have 3 characters"); + assertValidationErrorField(response, "validateRequestBody.param.secondCode", + "Second second must match pattern"); } @Test @@ -73,7 +76,8 @@ public void shouldGetValidationErrorWhenSingleParamIsLowercase() { assertValidationErrorTitle(response); assertValidationErrorDetails(response); assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST); - assertValidationErrorField(response, "validateRequestBody.param.custom", "Value must be uppercase"); + assertValidationErrorField(response, "validateRequestBody.param.custom", + "Value must be uppercase"); } @Test diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnRequestParamRouteHandlerIT.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamRouteHandlerIT.java similarity index 77% rename from http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnRequestParamRouteHandlerIT.java rename to http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamRouteHandlerIT.java index 659efcf79..326fd243b 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnRequestParamRouteHandlerIT.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnRequestParamRouteHandlerIT.java @@ -1,16 +1,16 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorDetails; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorField; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorStatus; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorTitle; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorDetails; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorField; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorStatus; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorTitle; import static io.restassured.RestAssured.given; import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import io.quarkus.test.scenarios.QuarkusScenario; -import io.quarkus.ts.validation.utils.ValidationErrorResponse; +import io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationErrorResponse; @QuarkusScenario public class ValidationOnRequestParamRouteHandlerIT { @@ -27,7 +27,8 @@ public void shouldGetValidationErrorWhenSingleParamIsWrong() { assertValidationErrorTitle(response); assertValidationErrorDetails(response); assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST); - assertValidationErrorField(response, "validateRequestSingleParam.param", "Param must have 3 characters"); + assertValidationErrorField(response, "validateRequestSingleParam.param", + "Param must have 3 characters"); } @Test @@ -48,8 +49,10 @@ public void shouldGetValidationErrorsWhenAllParamsAreWrong() { assertValidationErrorTitle(response); assertValidationErrorDetails(response); assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST); - assertValidationErrorField(response, "validateRequestMultipleParam.firstParam", "First param must have 3 characters"); - assertValidationErrorField(response, "validateRequestMultipleParam.secondParam", "Second param must match pattern"); + assertValidationErrorField(response, "validateRequestMultipleParam.firstParam", + "First param must have 3 characters"); + assertValidationErrorField(response, "validateRequestMultipleParam.secondParam", + "Second param must match pattern"); } @Test diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnResponseRouteHandlerIT.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandlerIT.java similarity index 74% rename from http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnResponseRouteHandlerIT.java rename to http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandlerIT.java index 6c9caeb65..d04aca380 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/ValidationOnResponseRouteHandlerIT.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/ValidationOnResponseRouteHandlerIT.java @@ -1,9 +1,9 @@ -package io.quarkus.ts.validation; +package io.quarkus.ts.http.reactiveroutes.validation; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorDetails; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorField; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorStatus; -import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorTitle; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorDetails; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorField; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorStatus; +import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorTitle; import static io.restassured.RestAssured.given; import org.apache.http.HttpStatus; @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import io.quarkus.test.scenarios.QuarkusScenario; -import io.quarkus.ts.validation.utils.ValidationErrorResponse; +import io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationErrorResponse; @QuarkusScenario public class ValidationOnResponseRouteHandlerIT { diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationAssertions.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationAssertions.java similarity index 96% rename from http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationAssertions.java rename to http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationAssertions.java index b2093f201..dd0eb8dfd 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationAssertions.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationAssertions.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation.utils; +package io.quarkus.ts.http.reactiveroutes.validation.utils; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationError.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationError.java similarity index 86% rename from http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationError.java rename to http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationError.java index 712874294..e8ed055bb 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationError.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationError.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation.utils; +package io.quarkus.ts.http.reactiveroutes.validation.utils; public class ValidationError { private String field; diff --git a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationErrorResponse.java b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationErrorResponse.java similarity index 92% rename from http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationErrorResponse.java rename to http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationErrorResponse.java index d84da176d..4d15b547b 100644 --- a/http/reactive-routes/src/test/java/io/quarkus/ts/validation/utils/ValidationErrorResponse.java +++ b/http/reactive-routes/src/test/java/io/quarkus/ts/http/reactiveroutes/validation/utils/ValidationErrorResponse.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.validation.utils; +package io.quarkus.ts.http.reactiveroutes.validation.utils; public class ValidationErrorResponse { private String title; diff --git a/http/servlet-undertow/src/main/java/io/quarkus/ts/filters/CustomRequestFilter.java b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/filters/CustomRequestFilter.java similarity index 94% rename from http/servlet-undertow/src/main/java/io/quarkus/ts/filters/CustomRequestFilter.java rename to http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/filters/CustomRequestFilter.java index 392233526..93d2308d8 100644 --- a/http/servlet-undertow/src/main/java/io/quarkus/ts/filters/CustomRequestFilter.java +++ b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/filters/CustomRequestFilter.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.filters; +package io.quarkus.ts.http.undertow.filters; import java.io.IOException; diff --git a/http/servlet-undertow/src/main/java/io/quarkus/ts/listener/SessionListener.java b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/listener/SessionListener.java similarity index 97% rename from http/servlet-undertow/src/main/java/io/quarkus/ts/listener/SessionListener.java rename to http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/listener/SessionListener.java index 2f66d6ece..573b0e383 100644 --- a/http/servlet-undertow/src/main/java/io/quarkus/ts/listener/SessionListener.java +++ b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/listener/SessionListener.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.listener; +package io.quarkus.ts.http.undertow.listener; import java.util.LinkedList; diff --git a/http/servlet-undertow/src/main/java/io/quarkus/ts/servlets/HelloWorld.java b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/servlets/HelloWorld.java similarity index 94% rename from http/servlet-undertow/src/main/java/io/quarkus/ts/servlets/HelloWorld.java rename to http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/servlets/HelloWorld.java index 673b8db01..24715524e 100644 --- a/http/servlet-undertow/src/main/java/io/quarkus/ts/servlets/HelloWorld.java +++ b/http/servlet-undertow/src/main/java/io/quarkus/ts/http/undertow/servlets/HelloWorld.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.servlets; +package io.quarkus.ts.http.undertow.servlets; import java.io.IOException; import java.io.PrintWriter; diff --git a/http/servlet-undertow/src/main/resources/META-INF/web.xml b/http/servlet-undertow/src/main/resources/META-INF/web.xml index 5c1b14d45..946b6166a 100644 --- a/http/servlet-undertow/src/main/resources/META-INF/web.xml +++ b/http/servlet-undertow/src/main/resources/META-INF/web.xml @@ -1,11 +1,11 @@ - io.quarkus.ts.listener.SessionListener + io.quarkus.ts.http.undertow.listener.SessionListener CustomRequestFilter - io.quarkus.ts.filters.CustomRequestFilter + io.quarkus.ts.http.undertow.filters.CustomRequestFilter CustomRequestFilter @@ -13,7 +13,7 @@ HelloWorld - io.quarkus.ts.servlets.HelloWorld + io.quarkus.ts.http.undertow.servlets.HelloWorld HelloWorld diff --git a/http/servlet-undertow/src/test/java/io/quarkus/ts/servlets/HttpServletWithSessionListenerIT.java b/http/servlet-undertow/src/test/java/io/quarkus/ts/http/undertow/HttpServletWithSessionListenerIT.java similarity index 93% rename from http/servlet-undertow/src/test/java/io/quarkus/ts/servlets/HttpServletWithSessionListenerIT.java rename to http/servlet-undertow/src/test/java/io/quarkus/ts/http/undertow/HttpServletWithSessionListenerIT.java index 9a6c242dc..fc5a2fb95 100644 --- a/http/servlet-undertow/src/test/java/io/quarkus/ts/servlets/HttpServletWithSessionListenerIT.java +++ b/http/servlet-undertow/src/test/java/io/quarkus/ts/http/undertow/HttpServletWithSessionListenerIT.java @@ -1,6 +1,6 @@ -package io.quarkus.ts.servlets; +package io.quarkus.ts.http.undertow; -import static io.quarkus.ts.listener.SessionListener.GAUGE_ACTIVE_SESSION; +import static io.quarkus.ts.http.undertow.listener.SessionListener.GAUGE_ACTIVE_SESSION; import static org.awaitility.Awaitility.await; import java.time.Duration; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/ChuckEndpointValue.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/ChuckEndpointValue.java similarity index 80% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/ChuckEndpointValue.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/ChuckEndpointValue.java index 6e789687a..281bdbb1c 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/ChuckEndpointValue.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/ChuckEndpointValue.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient.config; +package io.quarkus.ts.http.vertx.webclient.config; public class ChuckEndpointValue { diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/ChuckEndpointValueConverter.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/ChuckEndpointValueConverter.java similarity index 84% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/ChuckEndpointValueConverter.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/ChuckEndpointValueConverter.java index eaec99a43..8a7c0c1e6 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/ChuckEndpointValueConverter.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/ChuckEndpointValueConverter.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient.config; +package io.quarkus.ts.http.vertx.webclient.config; import org.eclipse.microprofile.config.spi.Converter; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/VertxWebClientConfig.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/VertxWebClientConfig.java similarity index 82% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/VertxWebClientConfig.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/VertxWebClientConfig.java index f51cb74ee..2066b27da 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/config/VertxWebClientConfig.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/config/VertxWebClientConfig.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient.config; +package io.quarkus.ts.http.vertx.webclient.config; import io.smallrye.config.ConfigMapping; import io.smallrye.config.WithName; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/ChuckNorrisResource.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/ChuckNorrisResource.java similarity index 92% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/ChuckNorrisResource.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/ChuckNorrisResource.java index 41b20198c..74c8a209e 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/ChuckNorrisResource.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/ChuckNorrisResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient.handler; +package io.quarkus.ts.http.vertx.webclient.handler; import static io.quarkus.vertx.web.Route.HttpMethod; @@ -13,9 +13,9 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; -import io.quarkus.qe.vertx.webclient.config.ChuckEndpointValue; -import io.quarkus.qe.vertx.webclient.config.VertxWebClientConfig; -import io.quarkus.qe.vertx.webclient.model.Joke; +import io.quarkus.ts.http.vertx.webclient.config.ChuckEndpointValue; +import io.quarkus.ts.http.vertx.webclient.config.VertxWebClientConfig; +import io.quarkus.ts.http.vertx.webclient.model.Joke; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RouteBase; import io.smallrye.mutiny.Uni; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/FailureHandler.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/FailureHandler.java similarity index 94% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/FailureHandler.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/FailureHandler.java index 1b99ba881..0f4086007 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/FailureHandler.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/FailureHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient.handler; +package io.quarkus.ts.http.vertx.webclient.handler; import java.net.HttpURLConnection; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/TracingExampleResource.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/TracingExampleResource.java similarity index 78% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/TracingExampleResource.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/TracingExampleResource.java index f965e1542..467e63f51 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/handler/TracingExampleResource.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/handler/TracingExampleResource.java @@ -1,8 +1,8 @@ -package io.quarkus.qe.vertx.webclient.handler; +package io.quarkus.ts.http.vertx.webclient.handler; import javax.inject.Inject; -import io.quarkus.qe.vertx.webclient.service.PongService; +import io.quarkus.ts.http.vertx.webclient.service.PongService; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.RouteBase; import io.smallrye.mutiny.Uni; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/model/Joke.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/model/Joke.java similarity index 93% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/model/Joke.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/model/Joke.java index 807efc6af..6e91b7b93 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/model/Joke.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/model/Joke.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient.model; +package io.quarkus.ts.http.vertx.webclient.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/service/PongService.java b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/service/PongService.java similarity index 95% rename from http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/service/PongService.java rename to http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/service/PongService.java index 7647af7f0..d8b0e8018 100644 --- a/http/vertx-web-client/src/main/java/io/quarkus/qe/vertx/webclient/service/PongService.java +++ b/http/vertx-web-client/src/main/java/io/quarkus/ts/http/vertx/webclient/service/PongService.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient.service; +package io.quarkus.ts.http.vertx.webclient.service; import java.net.HttpURLConnection; diff --git a/http/vertx-web-client/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter b/http/vertx-web-client/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter index 6565db531..a9e69bad9 100644 --- a/http/vertx-web-client/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter +++ b/http/vertx-web-client/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter @@ -1 +1 @@ -io.quarkus.qe.vertx.webclient.config.ChuckEndpointValueConverter \ No newline at end of file +io.quarkus.ts.http.vertx.webclient.config.ChuckEndpointValueConverter \ No newline at end of file diff --git a/http/vertx-web-client/src/test/java/io/quarkus/qe/vertx/webclient/ChuckNorrisResourceIT.java b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/ChuckNorrisResourceIT.java similarity index 98% rename from http/vertx-web-client/src/test/java/io/quarkus/qe/vertx/webclient/ChuckNorrisResourceIT.java rename to http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/ChuckNorrisResourceIT.java index f8ad2a955..2b2d5ff02 100644 --- a/http/vertx-web-client/src/test/java/io/quarkus/qe/vertx/webclient/ChuckNorrisResourceIT.java +++ b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/ChuckNorrisResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient; +package io.quarkus.ts.http.vertx.webclient; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.get; @@ -101,7 +101,7 @@ public void getTimeoutWhenResponseItsTooSlow() { @Test public void endpointShouldTrace() { final int pageLimit = 50; - final String expectedOperationName = "trace/ping"; + final String expectedOperationName = "/trace/ping"; await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(1)).untilAsserted(() -> { whenIMakePingRequest(); thenRetrieveTraces(pageLimit, "1h", getServiceName(), expectedOperationName); @@ -117,7 +117,7 @@ public void endpointShouldTrace() { @Test public void httpClientShouldHaveHisOwnSpan() { final int pageLimit = 50; - final String expectedOperationName = "trace/ping"; + final String expectedOperationName = "/trace/ping"; await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(1)).untilAsserted(() -> { whenIMakePingRequest(); thenRetrieveTraces(pageLimit, "1h", getServiceName(), expectedOperationName); diff --git a/http/vertx-web-client/src/test/java/io/quarkus/qe/vertx/webclient/PureVertxHttpClientTest.java b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/PureVertxHttpClientTest.java similarity index 97% rename from http/vertx-web-client/src/test/java/io/quarkus/qe/vertx/webclient/PureVertxHttpClientTest.java rename to http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/PureVertxHttpClientTest.java index a359f2c36..d1385eed9 100644 --- a/http/vertx-web-client/src/test/java/io/quarkus/qe/vertx/webclient/PureVertxHttpClientTest.java +++ b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/PureVertxHttpClientTest.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.webclient; +package io.quarkus.ts.http.vertx.webclient; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/CustomHealthCheckGroup.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/CustomHealthCheckGroup.java similarity index 91% rename from javaee-like-getting-started/src/main/java/io/quarkus/ts/core/CustomHealthCheckGroup.java rename to javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/CustomHealthCheckGroup.java index 0bc26a98a..0b6b9a0e3 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/CustomHealthCheckGroup.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/CustomHealthCheckGroup.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import javax.enterprise.context.ApplicationScoped; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/FallbackResource.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/FallbackResource.java similarity index 92% rename from javaee-like-getting-started/src/main/java/io/quarkus/ts/core/FallbackResource.java rename to javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/FallbackResource.java index 292a08a3c..e9569ce61 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/FallbackResource.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/FallbackResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingHealthCheck.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingHealthCheck.java similarity index 90% rename from javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingHealthCheck.java rename to javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingHealthCheck.java index e74a1e29a..380bff525 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingHealthCheck.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingHealthCheck.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import javax.enterprise.context.ApplicationScoped; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingLivenessCheck.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingLivenessCheck.java similarity index 89% rename from javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingLivenessCheck.java rename to javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingLivenessCheck.java index e06fb02e3..650df601f 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingLivenessCheck.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingLivenessCheck.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingReadinessCheck.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingReadinessCheck.java similarity index 89% rename from javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingReadinessCheck.java rename to javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingReadinessCheck.java index f22d2e2ba..87871b2dc 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingReadinessCheck.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingReadinessCheck.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingResource.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingResource.java similarity index 89% rename from javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingResource.java rename to javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingResource.java index 06beb92c8..88691378e 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/GreetingResource.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/GreetingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/InjectingScopedBeansResource.java b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResource.java similarity index 95% rename from javaee-like-getting-started/src/main/java/io/quarkus/ts/core/InjectingScopedBeansResource.java rename to javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResource.java index 741b8250e..48cdcfdea 100644 --- a/javaee-like-getting-started/src/main/java/io/quarkus/ts/core/InjectingScopedBeansResource.java +++ b/javaee-like-getting-started/src/main/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import javax.inject.Inject; import javax.servlet.ServletContext; diff --git a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/FallbackResourceIT.java b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/FallbackResourceIT.java similarity index 92% rename from javaee-like-getting-started/src/test/java/io/quarkus/ts/core/FallbackResourceIT.java rename to javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/FallbackResourceIT.java index 681ed39c9..e03cf21d6 100644 --- a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/FallbackResourceIT.java +++ b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/FallbackResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; @@ -13,7 +13,7 @@ public class FallbackResourceIT { private static final String WORK_METHOD = "work"; private static final String FAIL_METHOD = "fail"; - private static final String FALLBACK_METRIC = "base_ft_invocations_total{fallback=\"%s\",method=\"io.quarkus.ts.core.FallbackResource.%s\",result=\"valueReturned\"} %s.0"; + private static final String FALLBACK_METRIC = "base_ft_invocations_total{fallback=\"%s\",method=\"io.quarkus.ts.javaee.gettingstarted.FallbackResource.%s\",result=\"valueReturned\"} %s.0"; private static final String FALLBACK_APPLIED = "applied"; private static final String FALLBACK_NOT_APPLIED = "notApplied"; private static final String ONE = "1"; diff --git a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/InjectingScopedBeansResourceIT.java b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResourceIT.java similarity index 93% rename from javaee-like-getting-started/src/test/java/io/quarkus/ts/core/InjectingScopedBeansResourceIT.java rename to javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResourceIT.java index a465063e7..bb04d3c8f 100644 --- a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/InjectingScopedBeansResourceIT.java +++ b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/InjectingScopedBeansResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.notNullValue; diff --git a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/JavaEELikeHealthCheckIT.java b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/JavaEELikeHealthCheckIT.java similarity index 98% rename from javaee-like-getting-started/src/test/java/io/quarkus/ts/core/JavaEELikeHealthCheckIT.java rename to javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/JavaEELikeHealthCheckIT.java index ca24b9e1b..4442e33b4 100644 --- a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/JavaEELikeHealthCheckIT.java +++ b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/JavaEELikeHealthCheckIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/JavaEELikeQuarkusBundleIT.java b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/JavaEELikeQuarkusBundleIT.java similarity index 90% rename from javaee-like-getting-started/src/test/java/io/quarkus/ts/core/JavaEELikeQuarkusBundleIT.java rename to javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/JavaEELikeQuarkusBundleIT.java index 748af3fd0..87b63c0b6 100644 --- a/javaee-like-getting-started/src/test/java/io/quarkus/ts/core/JavaEELikeQuarkusBundleIT.java +++ b/javaee-like-getting-started/src/test/java/io/quarkus/ts/javaee/gettingstarted/JavaEELikeQuarkusBundleIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.core; +package io.quarkus.ts.javaee.gettingstarted; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/InfinispanPopulated.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanPopulated.java similarity index 95% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/InfinispanPopulated.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanPopulated.java index e84a41798..15be908fc 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/InfinispanPopulated.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanPopulated.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan; +package io.quarkus.ts.messaging.infinispan.grpc.kafka; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/Book.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/Book.java similarity index 96% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/Book.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/Book.java index 68bf6442f..7cc4af042 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/Book.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/Book.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.books; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.books; import java.util.Objects; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookCacheInitializer.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookCacheInitializer.java similarity index 93% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookCacheInitializer.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookCacheInitializer.java index fdb81b540..84f40f84c 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookCacheInitializer.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookCacheInitializer.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.books; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.books; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookContextInitializer.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookContextInitializer.java similarity index 83% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookContextInitializer.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookContextInitializer.java index 0add1a951..f0434d6a5 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookContextInitializer.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookContextInitializer.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.books; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.books; import org.infinispan.protostream.SerializationContextInitializer; import org.infinispan.protostream.annotations.AutoProtoSchemaBuilder; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookResource.java similarity index 93% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookResource.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookResource.java index ce0c46d4d..ff624f464 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/books/BookResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/books/BookResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.books; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.books; import javax.inject.Inject; import javax.validation.Valid; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/BlockingHelloService.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/BlockingHelloService.java similarity index 90% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/BlockingHelloService.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/BlockingHelloService.java index 891500f1e..b27c3ad84 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/BlockingHelloService.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/BlockingHelloService.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.greeting; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.greeting; import io.grpc.stub.StreamObserver; import io.quarkus.example.blocking.GreeterGrpc; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/GreetingResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/GreetingResource.java similarity index 94% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/GreetingResource.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/GreetingResource.java index 32a481936..2ab0b137b 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/GreetingResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/GreetingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.greeting; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.greeting; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/MutinyHelloService.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/MutinyHelloService.java similarity index 89% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/MutinyHelloService.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/MutinyHelloService.java index 53da97d06..1e5a5e155 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/greeting/MutinyHelloService.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/greeting/MutinyHelloService.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.greeting; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.greeting; import io.quarkus.example.dto.HelloReply; import io.quarkus.example.dto.HelloRequest; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceConsumer.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConsumer.java similarity index 90% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceConsumer.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConsumer.java index 7e2e871ef..6ff53893e 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceConsumer.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConsumer.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.prices; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.prices; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceConverter.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConverter.java similarity index 91% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceConverter.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConverter.java index 8831fc567..7e6219c6b 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceConverter.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceConverter.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.prices; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.prices; import javax.enterprise.context.ApplicationScoped; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceGenerator.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceGenerator.java similarity index 92% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceGenerator.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceGenerator.java index 2b0d47900..cf379c6c9 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceGenerator.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceGenerator.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.prices; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.prices; import java.time.Duration; import java.util.Random; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceResource.java similarity index 88% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceResource.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceResource.java index 728b88519..9c6897729 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/prices/PriceResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/prices/PriceResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.prices; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.prices; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/providers/KafkaProviders.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/KafkaProviders.java similarity index 95% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/providers/KafkaProviders.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/KafkaProviders.java index c6d68a774..7682ca52b 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/providers/KafkaProviders.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/KafkaProviders.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.providers; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.providers; import java.util.Properties; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/providers/SaslKafkaProvider.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/SaslKafkaProvider.java similarity index 97% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/providers/SaslKafkaProvider.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/SaslKafkaProvider.java index b08b55fca..6ddc4e23c 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/providers/SaslKafkaProvider.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/providers/SaslKafkaProvider.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.providers; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.providers; import java.util.Collections; import java.util.Properties; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/GreetingCachedResource.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/GreetingCachedResource.java similarity index 88% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/GreetingCachedResource.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/GreetingCachedResource.java index 2597f7fa4..9ecc68b6f 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/GreetingCachedResource.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/GreetingCachedResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.quickstart; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.quickstart; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/KafkaEndpoint.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/KafkaEndpoint.java similarity index 97% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/KafkaEndpoint.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/KafkaEndpoint.java index f161ddd7c..5f52e2920 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/KafkaEndpoint.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/KafkaEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.quickstart; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.quickstart; import java.time.Duration; import java.util.Collections; diff --git a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/SaslKafkaEndpoint.java b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/SaslKafkaEndpoint.java similarity index 96% rename from messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/SaslKafkaEndpoint.java rename to messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/SaslKafkaEndpoint.java index 14ffd5ce5..ab0df52d6 100644 --- a/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/qe/messaging/infinispan/quickstart/SaslKafkaEndpoint.java +++ b/messaging/infinispan-grpc-kafka/src/main/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/quickstart/SaslKafkaEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan.quickstart; +package io.quarkus.ts.messaging.infinispan.grpc.kafka.quickstart; import java.util.Set; import java.util.concurrent.ExecutionException; diff --git a/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/qe/messaging/infinispan/InfinispanKafkaIT.java b/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanKafkaIT.java similarity index 97% rename from messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/qe/messaging/infinispan/InfinispanKafkaIT.java rename to messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanKafkaIT.java index 2c784727d..ebf9c55c0 100644 --- a/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/qe/messaging/infinispan/InfinispanKafkaIT.java +++ b/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanKafkaIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan; +package io.quarkus.ts.messaging.infinispan.grpc.kafka; import static io.restassured.RestAssured.get; import static io.restassured.RestAssured.given; @@ -13,7 +13,6 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import io.quarkus.qe.messaging.infinispan.books.Book; import io.quarkus.test.bootstrap.InfinispanService; import io.quarkus.test.bootstrap.KafkaService; import io.quarkus.test.bootstrap.RestService; @@ -22,6 +21,7 @@ import io.quarkus.test.services.KafkaContainer; import io.quarkus.test.services.QuarkusApplication; import io.quarkus.test.services.containers.model.KafkaVendor; +import io.quarkus.ts.messaging.infinispan.grpc.kafka.books.Book; import io.restassured.http.ContentType; @QuarkusScenario diff --git a/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/qe/messaging/infinispan/InfinispanKafkaSaslIT.java b/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanKafkaSaslIT.java similarity index 98% rename from messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/qe/messaging/infinispan/InfinispanKafkaSaslIT.java rename to messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanKafkaSaslIT.java index 8a2daa430..eba1cc905 100644 --- a/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/qe/messaging/infinispan/InfinispanKafkaSaslIT.java +++ b/messaging/infinispan-grpc-kafka/src/test/java/io/quarkus/ts/messaging/infinispan/grpc/kafka/InfinispanKafkaSaslIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.messaging.infinispan; +package io.quarkus.ts.messaging.infinispan.grpc.kafka; import static io.restassured.RestAssured.get; import static io.restassured.RestAssured.given; diff --git a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/Application.java b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/Application.java similarity index 97% rename from messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/Application.java rename to messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/Application.java index f47d35b12..2c8e72e35 100644 --- a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/Application.java +++ b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/Application.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.producer; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; diff --git a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/FailureHandler.java b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/FailureHandler.java similarity index 96% rename from messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/FailureHandler.java rename to messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/FailureHandler.java index 17f80aa7d..94ad2e19c 100644 --- a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/FailureHandler.java +++ b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/FailureHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.producer; import javax.enterprise.context.ApplicationScoped; diff --git a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/KafkaBlockingProducer.java b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/KafkaBlockingProducer.java similarity index 98% rename from messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/KafkaBlockingProducer.java rename to messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/KafkaBlockingProducer.java index bb9506ebd..8f4addb05 100644 --- a/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/KafkaBlockingProducer.java +++ b/messaging/kafka-producer/src/main/java/io/quarkus/ts/messaging/kafka/producer/KafkaBlockingProducer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.producer; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/BlockingProducerIT.java b/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/producer/BlockingProducerIT.java similarity index 98% rename from messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/BlockingProducerIT.java rename to messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/producer/BlockingProducerIT.java index ce3050d91..c1ac9843f 100644 --- a/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/BlockingProducerIT.java +++ b/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/producer/BlockingProducerIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.producer; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/CustomStrimziKafkaContainer.java b/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/producer/CustomStrimziKafkaContainer.java similarity index 98% rename from messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/CustomStrimziKafkaContainer.java rename to messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/producer/CustomStrimziKafkaContainer.java index 207b27d5a..549f12cd0 100644 --- a/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/CustomStrimziKafkaContainer.java +++ b/messaging/kafka-producer/src/test/java/io/quarkus/ts/messaging/kafka/producer/CustomStrimziKafkaContainer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.producer; import java.nio.charset.StandardCharsets; import java.util.Collection; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/model/LoginAggregation.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/model/LoginAggregation.java similarity index 91% rename from messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/model/LoginAggregation.java rename to messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/model/LoginAggregation.java index 59ea6d97a..457e05923 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/model/LoginAggregation.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/model/LoginAggregation.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka.aggregator.model; +package io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.model; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/model/LoginAttempt.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/model/LoginAttempt.java similarity index 91% rename from messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/model/LoginAttempt.java rename to messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/model/LoginAttempt.java index 90ab53108..6c14b4e66 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/model/LoginAttempt.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/model/LoginAttempt.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka.aggregator.model; +package io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.model; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/rest/AlertMonitor.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/rest/AlertMonitor.java similarity index 78% rename from messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/rest/AlertMonitor.java rename to messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/rest/AlertMonitor.java index 60dd112a1..54ddbee15 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/rest/AlertMonitor.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/rest/AlertMonitor.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka.aggregator.rest; +package io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.rest; import javax.inject.Inject; import javax.ws.rs.GET; @@ -10,7 +10,7 @@ import org.jboss.resteasy.annotations.SseElementType; import org.reactivestreams.Publisher; -import io.quarkus.ts.messaging.kafka.aggregator.streams.WindowedLoginDeniedStream; +import io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.streams.WindowedLoginDeniedStream; @Path("/") public class AlertMonitor { diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/streams/WindowedLoginDeniedStream.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/streams/WindowedLoginDeniedStream.java similarity index 91% rename from messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/streams/WindowedLoginDeniedStream.java rename to messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/streams/WindowedLoginDeniedStream.java index 3eae4723c..385719520 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/aggregator/streams/WindowedLoginDeniedStream.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/aggregator/streams/WindowedLoginDeniedStream.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka.aggregator.streams; +package io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.streams; import static javax.ws.rs.core.Response.Status.FORBIDDEN; import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; @@ -22,8 +22,8 @@ import org.eclipse.microprofile.reactive.messaging.Outgoing; import io.quarkus.kafka.client.serialization.JsonbSerde; -import io.quarkus.ts.messaging.kafka.aggregator.model.LoginAggregation; -import io.quarkus.ts.messaging.kafka.aggregator.model.LoginAttempt; +import io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.model.LoginAggregation; +import io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.model.LoginAttempt; import io.smallrye.reactive.messaging.annotations.Broadcast; @ApplicationScoped diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/producer/EventsProducer.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/producer/EventsProducer.java similarity index 87% rename from messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/producer/EventsProducer.java rename to messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/producer/EventsProducer.java index f6b967be7..482f02f3f 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/producer/EventsProducer.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/producer/EventsProducer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka.producer; +package io.quarkus.ts.messaging.kafka.reactive.streams.producer; import java.time.Duration; import java.util.Base64; @@ -10,8 +10,8 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.reactive.messaging.Outgoing; -import io.quarkus.ts.messaging.kafka.aggregator.model.LoginAttempt; -import io.quarkus.ts.messaging.kafka.aggregator.streams.WindowedLoginDeniedStream; +import io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.model.LoginAttempt; +import io.quarkus.ts.messaging.kafka.reactive.streams.aggregator.streams.WindowedLoginDeniedStream; import io.smallrye.mutiny.Multi; import io.smallrye.reactive.messaging.kafka.Record; import io.vertx.core.json.Json; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/shutdown/SlowTopicConsumer.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicConsumer.java similarity index 92% rename from messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/shutdown/SlowTopicConsumer.java rename to messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicConsumer.java index a27caa27a..d1ed99e62 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/shutdown/SlowTopicConsumer.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicConsumer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka.shutdown; +package io.quarkus.ts.messaging.kafka.reactive.streams.shutdown; import java.util.concurrent.CompletionStage; diff --git a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/shutdown/SlowTopicResource.java b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicResource.java similarity index 89% rename from messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/shutdown/SlowTopicResource.java rename to messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicResource.java index b784ce5d5..74dcbb417 100644 --- a/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/shutdown/SlowTopicResource.java +++ b/messaging/kafka-streams-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/reactive/streams/shutdown/SlowTopicResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka.shutdown; +package io.quarkus.ts.messaging.kafka.reactive.streams.shutdown; import javax.inject.Inject; import javax.ws.rs.POST; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaStreamTest.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/BaseKafkaStreamTest.java similarity index 96% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaStreamTest.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/BaseKafkaStreamTest.java index 3e2c6b3f9..78d4e6983 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaStreamTest.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/BaseKafkaStreamTest.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DevModeKafkaStreamIT.java similarity index 94% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeKafkaStreamIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DevModeKafkaStreamIT.java index 19dc34464..d39297809 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DevModeKafkaStreamIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeRedPandaDevServiceUserExperienceIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DevModeRedPandaDevServiceUserExperienceIT.java similarity index 96% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeRedPandaDevServiceUserExperienceIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DevModeRedPandaDevServiceUserExperienceIT.java index 4493c5372..c6af8a9c0 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeRedPandaDevServiceUserExperienceIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/DevModeRedPandaDevServiceUserExperienceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/KafkaGratefulShutdownIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/KafkaGratefulShutdownIT.java similarity index 94% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/KafkaGratefulShutdownIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/KafkaGratefulShutdownIT.java index d541424b3..c69de8e59 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/KafkaGratefulShutdownIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/KafkaGratefulShutdownIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -17,8 +17,8 @@ import io.quarkus.test.services.KafkaContainer; import io.quarkus.test.services.QuarkusApplication; import io.quarkus.test.services.containers.model.KafkaVendor; -import io.quarkus.ts.messaging.kafka.shutdown.SlowTopicConsumer; -import io.quarkus.ts.messaging.kafka.shutdown.SlowTopicResource; +import io.quarkus.ts.messaging.kafka.reactive.streams.shutdown.SlowTopicConsumer; +import io.quarkus.ts.messaging.kafka.reactive.streams.shutdown.SlowTopicResource; @QuarkusScenario @DisabledOnNative(reason = "Due to high native build execution time") diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftAmqStreamsKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java similarity index 95% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftAmqStreamsKafkaStreamIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java index e7f5ba06c..c92296d59 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftAmqStreamsKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftAmqStreamsKafkaStreamIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftStrimziKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java similarity index 72% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftStrimziKafkaStreamIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java index e774f2889..801512279 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftStrimziKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OpenShiftStrimziKafkaStreamIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OperatorOpenShiftAmqStreamsKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java similarity index 93% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OperatorOpenShiftAmqStreamsKafkaStreamIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java index c44abe1d8..16013361d 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OperatorOpenShiftAmqStreamsKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/OperatorOpenShiftAmqStreamsKafkaStreamIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/SslAlertMonitorIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/SslAlertMonitorIT.java similarity index 96% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/SslAlertMonitorIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/SslAlertMonitorIT.java index 430a2218a..7b99b277e 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/SslAlertMonitorIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/SslAlertMonitorIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import io.quarkus.test.bootstrap.KafkaService; import io.quarkus.test.bootstrap.RestService; diff --git a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaStreamIT.java b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/StrimziKafkaStreamIT.java similarity index 93% rename from messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaStreamIT.java rename to messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/StrimziKafkaStreamIT.java index e29e9cc39..2ad10671a 100644 --- a/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaStreamIT.java +++ b/messaging/kafka-streams-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/reactive/streams/StrimziKafkaStreamIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.kafka.reactive.streams; import io.quarkus.test.bootstrap.KafkaService; import io.quarkus.test.bootstrap.RestService; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceConsumer.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceConsumer.java similarity index 89% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceConsumer.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceConsumer.java index fbaab9450..9903d548a 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceConsumer.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceConsumer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import java.util.List; import java.util.stream.Collectors; @@ -8,6 +8,8 @@ import org.eclipse.microprofile.reactive.messaging.Incoming; import org.eclipse.microprofile.reactive.messaging.Outgoing; +import io.quarkus.ts.messaging.kafka.StockPrice; +import io.quarkus.ts.messaging.kafka.status; import io.smallrye.reactive.messaging.annotations.Broadcast; import io.vertx.core.json.JsonObject; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceProducer.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceProducer.java similarity index 91% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceProducer.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceProducer.java index 392870881..560c59ec4 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/KStockPriceProducer.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/KStockPriceProducer.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import java.util.Random; import java.util.function.BiConsumer; @@ -13,6 +13,8 @@ import org.jboss.logging.Logger; import io.quarkus.scheduler.Scheduled; +import io.quarkus.ts.messaging.kafka.StockPrice; +import io.quarkus.ts.messaging.kafka.status; import io.smallrye.common.constraint.NotNull; @ApplicationScoped diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceDto.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceDto.java similarity index 78% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceDto.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceDto.java index c2d2d42b5..a54ab0816 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceDto.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceDto.java @@ -1,4 +1,7 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; + +import io.quarkus.ts.messaging.kafka.StockPrice; +import io.quarkus.ts.messaging.kafka.status; public class StockPriceDto { private String id; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceEndpoint.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceEndpoint.java similarity index 93% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceEndpoint.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceEndpoint.java index 0e31d666d..aeeac86d1 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/kafka/StockPriceEndpoint.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/main/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StockPriceEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import java.util.List; @@ -16,6 +16,8 @@ import org.jboss.resteasy.annotations.SseElementType; import org.reactivestreams.Publisher; +import io.quarkus.ts.messaging.kafka.StockPrice; + @Path("/stock-price") public class StockPriceEndpoint { diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroGroupIdIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroGroupIdIT.java similarity index 98% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroGroupIdIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroGroupIdIT.java index efef8fb73..a6638aa14 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroGroupIdIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroGroupIdIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroIT.java similarity index 97% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroIT.java index 6c0dc32c5..f5dc19b88 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/BaseKafkaAvroIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/BaseKafkaAvroIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeApicurioDevServiceUserExperienceIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/DevModeApicurioDevServiceUserExperienceIT.java similarity index 97% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeApicurioDevServiceUserExperienceIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/DevModeApicurioDevServiceUserExperienceIT.java index 5dde466d0..c8a1764eb 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeApicurioDevServiceUserExperienceIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/DevModeApicurioDevServiceUserExperienceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeApicurioIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/DevModeApicurioIT.java similarity index 90% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeApicurioIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/DevModeApicurioIT.java index aa87594fd..a8b25e157 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/DevModeApicurioIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/DevModeApicurioIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import org.junit.jupiter.api.Tag; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftAmqStreamsKafkaAvroIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/OpenShiftAmqStreamsKafkaAvroIT.java similarity index 95% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftAmqStreamsKafkaAvroIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/OpenShiftAmqStreamsKafkaAvroIT.java index 1c5ecc0eb..3ea4f7173 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftAmqStreamsKafkaAvroIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/OpenShiftAmqStreamsKafkaAvroIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftStrimziKafkaAvroIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/OpenShiftStrimziKafkaAvroIT.java similarity index 72% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftStrimziKafkaAvroIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/OpenShiftStrimziKafkaAvroIT.java index 98f4d8222..853fde1c4 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/OpenShiftStrimziKafkaAvroIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/OpenShiftStrimziKafkaAvroIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaAvroGroupIdIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StrimziKafkaAvroGroupIdIT.java similarity index 96% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaAvroGroupIdIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StrimziKafkaAvroGroupIdIT.java index 8ddab8bc4..41280c159 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaAvroGroupIdIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StrimziKafkaAvroGroupIdIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import org.junit.jupiter.api.Tag; diff --git a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaAvroIT.java b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StrimziKafkaAvroIT.java similarity index 94% rename from messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaAvroIT.java rename to messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StrimziKafkaAvroIT.java index 685fd3bf0..43bf6f87c 100644 --- a/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/kafka/StrimziKafkaAvroIT.java +++ b/messaging/kafka-strimzi-avro-reactive-messaging/src/test/java/io/quarkus/ts/messaging/strimzi/kafka/reactive/StrimziKafkaAvroIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.messaging.kafka; +package io.quarkus.ts.messaging.strimzi.kafka.reactive; import io.quarkus.test.bootstrap.KafkaService; import io.quarkus.test.bootstrap.RestService; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/ClientResource.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/ClientResource.java similarity index 95% rename from monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/ClientResource.java rename to monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/ClientResource.java index dc728d07a..edf06d32b 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/ClientResource.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/ClientResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.microprofile; +package io.quarkus.ts.microprofile.opentracing; import java.util.concurrent.CompletionStage; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloClient.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloClient.java similarity index 95% rename from monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloClient.java rename to monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloClient.java index 1fde10d0c..4d01a0c74 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloClient.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloClient.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.microprofile; +package io.quarkus.ts.microprofile.opentracing; import static java.util.concurrent.CompletableFuture.completedFuture; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloResource.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloResource.java similarity index 94% rename from monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloResource.java rename to monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloResource.java index 3bf19b016..bf0220177 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloResource.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.microprofile; +package io.quarkus.ts.microprofile.opentracing; import java.util.concurrent.CompletionStage; diff --git a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloService.java b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloService.java similarity index 92% rename from monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloService.java rename to monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloService.java index cd0016d16..5e5d7e925 100644 --- a/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/HelloService.java +++ b/monitoring/microprofile-opentracing/src/main/java/io/quarkus/ts/microprofile/opentracing/HelloService.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.microprofile; +package io.quarkus.ts.microprofile.opentracing; import java.util.concurrent.CompletionStage; diff --git a/monitoring/microprofile-opentracing/src/main/resources/application.properties b/monitoring/microprofile-opentracing/src/main/resources/application.properties index f47283cde..4f72cf7a2 100644 --- a/monitoring/microprofile-opentracing/src/main/resources/application.properties +++ b/monitoring/microprofile-opentracing/src/main/resources/application.properties @@ -5,4 +5,4 @@ quarkus.jaeger.sampler-type=const quarkus.jaeger.sampler-param=1 quarkus.jaeger.endpoint=http://localhost:14268/api/traces -io.quarkus.ts.microprofile.HelloClient/mp-rest/url=http://localhost:${quarkus.http.port} \ No newline at end of file +io.quarkus.ts.microprofile.opentracing.HelloClient/mp-rest/url=http://localhost:${quarkus.http.port} \ No newline at end of file diff --git a/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/MicroProfileIT.java b/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/opentracing/MicroProfileIT.java similarity index 93% rename from monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/MicroProfileIT.java rename to monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/opentracing/MicroProfileIT.java index 1eae67705..c2246ddfe 100644 --- a/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/MicroProfileIT.java +++ b/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/opentracing/MicroProfileIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.microprofile; +package io.quarkus.ts.microprofile.opentracing; import static io.restassured.RestAssured.when; import static org.awaitility.Awaitility.await; @@ -75,9 +75,9 @@ public void verifyTracesInJaegerTest() { .body("data", hasSize(EXPECTED_DATA_SIZE)) .body("data[0].spans", hasSize(EXPECTED_SPANS_SIZE)) .body("data[0].spans.operationName", hasItems( - "GET:io.quarkus.ts.microprofile.ClientResource.get", + "GET:io.quarkus.ts.microprofile.opentracing.ClientResource.get", "GET", - "GET:io.quarkus.ts.microprofile.HelloResource.get")) + "GET:io.quarkus.ts.microprofile.opentracing.HelloResource.get")) .body("data[0].spans.logs.fields.value.flatten()", hasItems( "ClientResource called", "HelloResource called", @@ -85,7 +85,7 @@ public void verifyTracesInJaegerTest() { "HelloService async processing")) .body("data[0].spans.find { " + - "it.operationName == 'GET:io.quarkus.ts.microprofile.ClientResource.get' }.tags.collect" + "it.operationName == 'GET:io.quarkus.ts.microprofile.opentracing.ClientResource.get' }.tags.collect" + " { \"${it.key}=${it.value}\".toString() }", hasItems( @@ -104,7 +104,7 @@ public void verifyTracesInJaegerTest() { "http.status_code=200")) .body("data[0].spans.find { " + - "it.operationName == 'GET:io.quarkus.ts.microprofile.HelloResource.get' }.tags.collect " + "it.operationName == 'GET:io.quarkus.ts.microprofile.opentracing.HelloResource.get' }.tags.collect " + "{ \"${it.key}=${it.value}\".toString() }", hasItems( diff --git a/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/OpenShiftMicroProfileIT.java b/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/opentracing/OpenShiftMicroProfileIT.java similarity index 90% rename from monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/OpenShiftMicroProfileIT.java rename to monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/opentracing/OpenShiftMicroProfileIT.java index 172eb1ba7..95870c7e1 100644 --- a/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/OpenShiftMicroProfileIT.java +++ b/monitoring/microprofile-opentracing/src/test/java/io/quarkus/ts/microprofile/opentracing/OpenShiftMicroProfileIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.microprofile; +package io.quarkus.ts.microprofile.opentracing; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.scenarios.annotations.DisabledOnQuarkusVersion; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/GrpcPingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/GrpcPingResource.java similarity index 80% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/GrpcPingResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/GrpcPingResource.java index 9fbea7e9a..9d298f307 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/GrpcPingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/GrpcPingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.ping; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; import javax.inject.Inject; import javax.ws.rs.GET; @@ -9,7 +9,7 @@ import io.quarkus.example.PongRequest; import io.quarkus.example.PongServiceGrpc; import io.quarkus.grpc.GrpcClient; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; @Path("/grpc-ping") public class GrpcPingResource extends TraceableResource { diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/PingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/PingResource.java similarity index 67% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/PingResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/PingResource.java index 973e08aa3..d19a63369 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/PingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/PingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.ping; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; import javax.inject.Inject; import javax.ws.rs.GET; @@ -8,8 +8,8 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; -import io.quarkus.qe.ping.clients.PongClient; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.PongClient; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; @Path("/rest-ping") public class PingResource extends TraceableResource { diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/ReactivePingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ReactivePingResource.java similarity index 70% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/ReactivePingResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ReactivePingResource.java index c18f7936f..38fa3cf59 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/ReactivePingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ReactivePingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.ping; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; import javax.inject.Inject; import javax.ws.rs.GET; @@ -8,8 +8,8 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; -import io.quarkus.qe.ping.clients.ReactivePongClient; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ReactivePongClient; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; import io.smallrye.mutiny.Uni; @Path("/reactive-ping") diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/ServerSentEventsPingResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ServerSentEventsPingResource.java similarity index 71% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/ServerSentEventsPingResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ServerSentEventsPingResource.java index 1191d3481..156c13dd9 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/ServerSentEventsPingResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/ServerSentEventsPingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.ping; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping; import javax.inject.Inject; import javax.ws.rs.GET; @@ -8,8 +8,8 @@ import org.eclipse.microprofile.rest.client.inject.RestClient; -import io.quarkus.qe.ping.clients.ServerSentEventsPongClient; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ServerSentEventsPongClient; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; import io.smallrye.mutiny.Multi; @Path("/server-sent-events-ping") diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/PongClient.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/PongClient.java similarity index 81% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/PongClient.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/PongClient.java index bcfbacad2..304501d81 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/PongClient.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/PongClient.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.ping.clients; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/ReactivePongClient.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ReactivePongClient.java similarity index 83% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/ReactivePongClient.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ReactivePongClient.java index 6315eb7a0..40b0d32c0 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/ReactivePongClient.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ReactivePongClient.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.ping.clients; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/ServerSentEventsPongClient.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ServerSentEventsPongClient.java similarity index 85% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/ServerSentEventsPongClient.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ServerSentEventsPongClient.java index e17504f6b..359d8fb20 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/ping/clients/ServerSentEventsPongClient.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ping/clients/ServerSentEventsPongClient.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.ping.clients; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/GrpcPongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongResource.java similarity index 84% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/GrpcPongResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongResource.java index 6b14b39ee..9a8a98871 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/GrpcPongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.pong; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; import javax.inject.Inject; import javax.ws.rs.GET; @@ -11,7 +11,7 @@ import io.quarkus.example.LastTraceIdRequest; import io.quarkus.example.PongServiceGrpc; import io.quarkus.grpc.GrpcClient; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; @Path("/grpc-pong") public class GrpcPongResource { diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/GrpcPongService.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongService.java similarity index 94% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/GrpcPongService.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongService.java index 52527e66d..63c9334b9 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/GrpcPongService.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/GrpcPongService.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.pong; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; import org.jboss.logmanager.MDC; diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/PongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/PongResource.java similarity index 67% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/PongResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/PongResource.java index 1e07bf6e5..daab170b2 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/PongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/PongResource.java @@ -1,11 +1,11 @@ -package io.quarkus.qe.pong; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; @Path("/rest-pong") public class PongResource extends TraceableResource { diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/ReactivePongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ReactivePongResource.java similarity index 72% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/ReactivePongResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ReactivePongResource.java index f38db9dbb..cb65abec8 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/ReactivePongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ReactivePongResource.java @@ -1,11 +1,11 @@ -package io.quarkus.qe.pong; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; import io.smallrye.mutiny.Uni; @Path("/reactive-pong") diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/ServerSentEventsPongResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ServerSentEventsPongResource.java similarity index 73% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/ServerSentEventsPongResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ServerSentEventsPongResource.java index e281e4e69..1289af881 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/pong/ServerSentEventsPongResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/pong/ServerSentEventsPongResource.java @@ -1,11 +1,11 @@ -package io.quarkus.qe.pong; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.pong; import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import io.quarkus.qe.traceable.TraceableResource; +import io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable.TraceableResource; import io.smallrye.mutiny.Multi; @Path("/server-sent-events-pong") diff --git a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/traceable/TraceableResource.java b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/traceable/TraceableResource.java similarity index 89% rename from monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/traceable/TraceableResource.java rename to monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/traceable/TraceableResource.java index 9271ee83f..e9e7d80df 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/qe/traceable/TraceableResource.java +++ b/monitoring/opentracing-reactive-grpc/src/main/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/traceable/TraceableResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.traceable; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc.traceable; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties b/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties index 09cddfe72..04f4a96f9 100644 --- a/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties +++ b/monitoring/opentracing-reactive-grpc/src/main/resources/application.properties @@ -5,14 +5,14 @@ quarkus.jaeger.sampler-param=1 quarkus.log.console.format=%d{HH:mm:ss} %-5p traceId=%X{traceId}, parentId=%X{parentId}, spanId=%X{spanId}, sampled=%X{sampled} [%c{2.}] (%t) %s%e%n # RestClient -io.quarkus.qe.ping.clients.PongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.qe.ping.clients.PongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.PongClient/mp-rest/url=http://localhost:${quarkus.http.port} +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.PongClient/mp-rest/scope=javax.inject.Singleton -io.quarkus.qe.ping.clients.ReactivePongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.qe.ping.clients.ReactivePongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ReactivePongClient/mp-rest/url=http://localhost:${quarkus.http.port} +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ReactivePongClient/mp-rest/scope=javax.inject.Singleton -io.quarkus.qe.ping.clients.ServerSentEventsPongClient/mp-rest/url=http://localhost:${quarkus.http.port} -io.quarkus.qe.ping.clients.ServerSentEventsPongClient/mp-rest/scope=javax.inject.Singleton +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ServerSentEventsPongClient/mp-rest/url=http://localhost:${quarkus.http.port} +io.quarkus.ts.monitoring.opentracing.reactive.grpc.ping.clients.ServerSentEventsPongClient/mp-rest/scope=javax.inject.Singleton # gRPC quarkus.grpc.clients.pong.host=localhost \ No newline at end of file diff --git a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/AbstractPingPongResourceIT.java b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/AbstractPingPongResourceIT.java similarity index 97% rename from monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/AbstractPingPongResourceIT.java rename to monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/AbstractPingPongResourceIT.java index c3954aef0..a6efaae59 100644 --- a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/AbstractPingPongResourceIT.java +++ b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/AbstractPingPongResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc; import static io.restassured.RestAssured.given; import static org.awaitility.Awaitility.await; diff --git a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/GrpcPingPongResourceIT.java b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/GrpcPingPongResourceIT.java similarity index 87% rename from monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/GrpcPingPongResourceIT.java rename to monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/GrpcPingPongResourceIT.java index 552d052b7..da7bb1848 100644 --- a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/GrpcPingPongResourceIT.java +++ b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/GrpcPingPongResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc; import org.junit.jupiter.api.Disabled; diff --git a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/ReactivePingPongResourceOpentracingIT.java b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ReactivePingPongResourceOpentracingIT.java similarity index 80% rename from monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/ReactivePingPongResourceOpentracingIT.java rename to monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ReactivePingPongResourceOpentracingIT.java index e344f7680..297a33484 100644 --- a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/ReactivePingPongResourceOpentracingIT.java +++ b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ReactivePingPongResourceOpentracingIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc; import io.quarkus.test.scenarios.QuarkusScenario; diff --git a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/RestPingPongResourceOpentracingIT.java b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/RestPingPongResourceOpentracingIT.java similarity index 79% rename from monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/RestPingPongResourceOpentracingIT.java rename to monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/RestPingPongResourceOpentracingIT.java index 3ad75ea63..0ef01a505 100644 --- a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/RestPingPongResourceOpentracingIT.java +++ b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/RestPingPongResourceOpentracingIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc; import io.quarkus.test.scenarios.QuarkusScenario; diff --git a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/ServerSentEventsPingPongResourceOpentracingIT.java b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ServerSentEventsPingPongResourceOpentracingIT.java similarity index 81% rename from monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/ServerSentEventsPingPongResourceOpentracingIT.java rename to monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ServerSentEventsPingPongResourceOpentracingIT.java index 47dd56285..ab3957f64 100644 --- a/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/qe/ServerSentEventsPingPongResourceOpentracingIT.java +++ b/monitoring/opentracing-reactive-grpc/src/test/java/io/quarkus/ts/monitoring/opentracing/reactive/grpc/ServerSentEventsPingPongResourceOpentracingIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe; +package io.quarkus.ts.monitoring.opentracing.reactive.grpc; import io.quarkus.test.scenarios.QuarkusScenario; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractReactiveMongoDao.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractReactiveMongoDao.java similarity index 95% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractReactiveMongoDao.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractReactiveMongoDao.java index b1adff9f3..d213aed16 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/AbstractReactiveMongoDao.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractReactiveMongoDao.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import java.util.List; import java.util.function.Function; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/Fruit.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/Fruit.java similarity index 96% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/Fruit.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/Fruit.java index 6df33e9bc..af6b67cea 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/Fruit.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/Fruit.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import java.util.Objects; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasket.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/FruitBasket.java similarity index 97% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasket.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/FruitBasket.java index f1fa46be5..1cbaa3d41 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/FruitBasket.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/FruitBasket.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import java.util.List; import java.util.Objects; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/MongoDaoInterface.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/MongoDaoInterface.java similarity index 61% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/MongoDaoInterface.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/MongoDaoInterface.java index 1c0c7f4a1..18b7662e2 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/MongoDaoInterface.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/MongoDaoInterface.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; public interface MongoDaoInterface { String FRUIT_DB_NAME = "fruit"; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitBasketResource.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketResource.java similarity index 95% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitBasketResource.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketResource.java index 98454490f..057c4b125 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitBasketResource.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import java.util.List; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitBasketService.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketService.java similarity index 95% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitBasketService.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketService.java index aea2cc525..178093937 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitBasketService.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitBasketService.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import java.util.List; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitResource.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitResource.java similarity index 93% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitResource.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitResource.java index 0b478ae0a..00370c16e 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitResource.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import java.util.List; diff --git a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitService.java b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitService.java similarity index 92% rename from nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitService.java rename to nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitService.java index d78147f22..9f54e73e3 100644 --- a/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/ReactiveFruitService.java +++ b/nosql-db/mongodb-reactive/src/main/java/io/quarkus/ts/nosqldb/mongodb/reactive/ReactiveFruitService.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import java.util.List; diff --git a/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/AbstractMongoDbIT.java b/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractMongoDbIT.java similarity index 99% rename from nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/AbstractMongoDbIT.java rename to nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractMongoDbIT.java index d40e53969..17c445994 100644 --- a/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/AbstractMongoDbIT.java +++ b/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/AbstractMongoDbIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import static org.assertj.core.api.Assertions.assertThat; diff --git a/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/MongoDbIT.java b/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/MongoDbIT.java similarity index 93% rename from nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/MongoDbIT.java rename to nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/MongoDbIT.java index 08e20fc98..a9d4f6f69 100644 --- a/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/MongoDbIT.java +++ b/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/MongoDbIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import io.quarkus.test.bootstrap.MongoDbService; import io.quarkus.test.bootstrap.RestService; diff --git a/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/OpenShiftMongoDbIT.java b/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/OpenShiftMongoDbIT.java similarity index 93% rename from nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/OpenShiftMongoDbIT.java rename to nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/OpenShiftMongoDbIT.java index 1b4fbd262..c408c4a41 100644 --- a/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/OpenShiftMongoDbIT.java +++ b/nosql-db/mongodb-reactive/src/test/java/io/quarkus/ts/nosqldb/mongodb/reactive/OpenShiftMongoDbIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.nosqldb.mongodb; +package io.quarkus.ts.nosqldb.mongodb.reactive; import io.quarkus.test.bootstrap.MongoDbService; import io.quarkus.test.bootstrap.RestService; diff --git a/properties/src/main/java/io/quarkus/qe/properties/GreetingResource.java b/properties/src/main/java/io/quarkus/ts/properties/GreetingResource.java similarity index 89% rename from properties/src/main/java/io/quarkus/qe/properties/GreetingResource.java rename to properties/src/main/java/io/quarkus/ts/properties/GreetingResource.java index db658f480..8e8a78032 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/GreetingResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/GreetingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties; +package io.quarkus.ts.properties; import java.util.List; import java.util.stream.Collectors; @@ -12,9 +12,9 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.inject.ConfigProperty; -import io.quarkus.qe.properties.config.AntagonistConfiguration; -import io.quarkus.qe.properties.config.ProtagonistConfiguration; -import io.quarkus.qe.properties.converter.KrustyEmail; +import io.quarkus.ts.properties.config.AntagonistConfiguration; +import io.quarkus.ts.properties.config.ProtagonistConfiguration; +import io.quarkus.ts.properties.converter.KrustyEmail; @Path("/hello") public class GreetingResource { diff --git a/properties/src/main/java/io/quarkus/qe/properties/bulk/BindMapsUsingConfigValueResource.java b/properties/src/main/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueResource.java similarity index 94% rename from properties/src/main/java/io/quarkus/qe/properties/bulk/BindMapsUsingConfigValueResource.java rename to properties/src/main/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueResource.java index 783bfbe74..7b945beff 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/bulk/BindMapsUsingConfigValueResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.bulk; +package io.quarkus.ts.properties.bulk; import java.util.Map; diff --git a/properties/src/main/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesConfiguration.java b/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesConfiguration.java similarity index 95% rename from properties/src/main/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesConfiguration.java rename to properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesConfiguration.java index 8b1d963da..4159b395b 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesConfiguration.java +++ b/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesConfiguration.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.bulk; +package io.quarkus.ts.properties.bulk; import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/properties/src/main/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesResource.java b/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesResource.java similarity index 97% rename from properties/src/main/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesResource.java rename to properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesResource.java index d696069fc..33dce604d 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.bulk; +package io.quarkus.ts.properties.bulk; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/properties/src/main/java/io/quarkus/qe/properties/bulk/ConfigValueResource.java b/properties/src/main/java/io/quarkus/ts/properties/bulk/ConfigValueResource.java similarity index 95% rename from properties/src/main/java/io/quarkus/qe/properties/bulk/ConfigValueResource.java rename to properties/src/main/java/io/quarkus/ts/properties/bulk/ConfigValueResource.java index 73599a0f9..917f4e07e 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/bulk/ConfigValueResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/bulk/ConfigValueResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.bulk; +package io.quarkus.ts.properties.bulk; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/properties/src/main/java/io/quarkus/qe/properties/config/AntagonistConfiguration.java b/properties/src/main/java/io/quarkus/ts/properties/config/AntagonistConfiguration.java similarity index 87% rename from properties/src/main/java/io/quarkus/qe/properties/config/AntagonistConfiguration.java rename to properties/src/main/java/io/quarkus/ts/properties/config/AntagonistConfiguration.java index a737b790c..42970803e 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/config/AntagonistConfiguration.java +++ b/properties/src/main/java/io/quarkus/ts/properties/config/AntagonistConfiguration.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.config; +package io.quarkus.ts.properties.config; import io.smallrye.config.ConfigMapping; diff --git a/properties/src/main/java/io/quarkus/qe/properties/config/ProtagonistConfiguration.java b/properties/src/main/java/io/quarkus/ts/properties/config/ProtagonistConfiguration.java similarity index 86% rename from properties/src/main/java/io/quarkus/qe/properties/config/ProtagonistConfiguration.java rename to properties/src/main/java/io/quarkus/ts/properties/config/ProtagonistConfiguration.java index 4dbfe8168..0c918b677 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/config/ProtagonistConfiguration.java +++ b/properties/src/main/java/io/quarkus/ts/properties/config/ProtagonistConfiguration.java @@ -1,9 +1,9 @@ -package io.quarkus.qe.properties.config; +package io.quarkus.ts.properties.config; import javax.inject.Inject; import javax.inject.Singleton; -import io.quarkus.qe.properties.config.interfaces.ProtagonistConfigurable; +import io.quarkus.ts.properties.config.interfaces.ProtagonistConfigurable; @Singleton public class ProtagonistConfiguration { diff --git a/properties/src/main/java/io/quarkus/qe/properties/config/interfaces/IBiography.java b/properties/src/main/java/io/quarkus/ts/properties/config/interfaces/IBiography.java similarity index 74% rename from properties/src/main/java/io/quarkus/qe/properties/config/interfaces/IBiography.java rename to properties/src/main/java/io/quarkus/ts/properties/config/interfaces/IBiography.java index 623b57a59..4fde99912 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/config/interfaces/IBiography.java +++ b/properties/src/main/java/io/quarkus/ts/properties/config/interfaces/IBiography.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.config.interfaces; +package io.quarkus.ts.properties.config.interfaces; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/properties/src/main/java/io/quarkus/qe/properties/config/interfaces/ProtagonistConfigurable.java b/properties/src/main/java/io/quarkus/ts/properties/config/interfaces/ProtagonistConfigurable.java similarity index 90% rename from properties/src/main/java/io/quarkus/qe/properties/config/interfaces/ProtagonistConfigurable.java rename to properties/src/main/java/io/quarkus/ts/properties/config/interfaces/ProtagonistConfigurable.java index 6e4e7491b..3334fec83 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/config/interfaces/ProtagonistConfigurable.java +++ b/properties/src/main/java/io/quarkus/ts/properties/config/interfaces/ProtagonistConfigurable.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.config.interfaces; +package io.quarkus.ts.properties.config.interfaces; import org.eclipse.microprofile.config.inject.ConfigProperty; diff --git a/properties/src/main/java/io/quarkus/qe/properties/configmapping/ConfigMappingResource.java b/properties/src/main/java/io/quarkus/ts/properties/configmapping/ConfigMappingResource.java similarity index 96% rename from properties/src/main/java/io/quarkus/qe/properties/configmapping/ConfigMappingResource.java rename to properties/src/main/java/io/quarkus/ts/properties/configmapping/ConfigMappingResource.java index 9a3537be1..4ebd06933 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/configmapping/ConfigMappingResource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/configmapping/ConfigMappingResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.configmapping; +package io.quarkus.ts.properties.configmapping; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/properties/src/main/java/io/quarkus/qe/properties/configmapping/PersonInterface.java b/properties/src/main/java/io/quarkus/ts/properties/configmapping/PersonInterface.java similarity index 81% rename from properties/src/main/java/io/quarkus/qe/properties/configmapping/PersonInterface.java rename to properties/src/main/java/io/quarkus/ts/properties/configmapping/PersonInterface.java index c00671858..25e14b35c 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/configmapping/PersonInterface.java +++ b/properties/src/main/java/io/quarkus/ts/properties/configmapping/PersonInterface.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.configmapping; +package io.quarkus.ts.properties.configmapping; import java.util.Map; diff --git a/properties/src/main/java/io/quarkus/qe/properties/converter/CustomEmailConverter.java b/properties/src/main/java/io/quarkus/ts/properties/converter/CustomEmailConverter.java similarity index 87% rename from properties/src/main/java/io/quarkus/qe/properties/converter/CustomEmailConverter.java rename to properties/src/main/java/io/quarkus/ts/properties/converter/CustomEmailConverter.java index 935c0024a..b5dbaa693 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/converter/CustomEmailConverter.java +++ b/properties/src/main/java/io/quarkus/ts/properties/converter/CustomEmailConverter.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.converter; +package io.quarkus.ts.properties.converter; import org.eclipse.microprofile.config.spi.Converter; diff --git a/properties/src/main/java/io/quarkus/qe/properties/converter/KrustyEmail.java b/properties/src/main/java/io/quarkus/ts/properties/converter/KrustyEmail.java similarity index 81% rename from properties/src/main/java/io/quarkus/qe/properties/converter/KrustyEmail.java rename to properties/src/main/java/io/quarkus/ts/properties/converter/KrustyEmail.java index 1628e243f..144fcdf78 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/converter/KrustyEmail.java +++ b/properties/src/main/java/io/quarkus/ts/properties/converter/KrustyEmail.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.converter; +package io.quarkus.ts.properties.converter; public class KrustyEmail { diff --git a/properties/src/main/java/io/quarkus/qe/properties/providers/CustomConfigSource.java b/properties/src/main/java/io/quarkus/ts/properties/providers/CustomConfigSource.java similarity index 96% rename from properties/src/main/java/io/quarkus/qe/properties/providers/CustomConfigSource.java rename to properties/src/main/java/io/quarkus/ts/properties/providers/CustomConfigSource.java index 1fb020bf3..3a0568f93 100644 --- a/properties/src/main/java/io/quarkus/qe/properties/providers/CustomConfigSource.java +++ b/properties/src/main/java/io/quarkus/ts/properties/providers/CustomConfigSource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.providers; +package io.quarkus.ts.properties.providers; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource b/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource index a38b02d40..67e25300b 100644 --- a/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource +++ b/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource @@ -1 +1 @@ -io.quarkus.qe.properties.providers.CustomConfigSource \ No newline at end of file +io.quarkus.ts.properties.providers.CustomConfigSource \ No newline at end of file diff --git a/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter b/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter index b9d7ae1dd..7bebb5797 100644 --- a/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter +++ b/properties/src/main/resources/META-INF/services/org.eclipse.microprofile.config.spi.Converter @@ -1 +1 @@ -io.quarkus.qe.properties.converter.CustomEmailConverter \ No newline at end of file +io.quarkus.ts.properties.converter.CustomEmailConverter \ No newline at end of file diff --git a/properties/src/test/java/io/quarkus/qe/properties/bulk/BindMapsUsingConfigValueIT.java b/properties/src/test/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueIT.java similarity index 96% rename from properties/src/test/java/io/quarkus/qe/properties/bulk/BindMapsUsingConfigValueIT.java rename to properties/src/test/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueIT.java index 0d5d7a3b3..d408a41b4 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/bulk/BindMapsUsingConfigValueIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/bulk/BindMapsUsingConfigValueIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.bulk; +package io.quarkus.ts.properties.bulk; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; diff --git a/properties/src/test/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesIT.java b/properties/src/test/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesIT.java similarity index 98% rename from properties/src/test/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesIT.java rename to properties/src/test/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesIT.java index 4db02d147..aa888d161 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/bulk/BulkOfPropertiesIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/bulk/BulkOfPropertiesIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.bulk; +package io.quarkus.ts.properties.bulk; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; diff --git a/properties/src/test/java/io/quarkus/qe/properties/bulk/ConfigValueIT.java b/properties/src/test/java/io/quarkus/ts/properties/bulk/ConfigValueIT.java similarity index 96% rename from properties/src/test/java/io/quarkus/qe/properties/bulk/ConfigValueIT.java rename to properties/src/test/java/io/quarkus/ts/properties/bulk/ConfigValueIT.java index 78482c109..ce5dbe9ae 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/bulk/ConfigValueIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/bulk/ConfigValueIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.bulk; +package io.quarkus.ts.properties.bulk; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.containsString; diff --git a/properties/src/test/java/io/quarkus/qe/properties/config/VariousConfigurationSourcesIT.java b/properties/src/test/java/io/quarkus/ts/properties/config/VariousConfigurationSourcesIT.java similarity index 98% rename from properties/src/test/java/io/quarkus/qe/properties/config/VariousConfigurationSourcesIT.java rename to properties/src/test/java/io/quarkus/ts/properties/config/VariousConfigurationSourcesIT.java index e0b2622cb..012b6cebe 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/config/VariousConfigurationSourcesIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/config/VariousConfigurationSourcesIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.config; +package io.quarkus.ts.properties.config; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.containsString; diff --git a/properties/src/test/java/io/quarkus/qe/properties/configmapping/ConfigMappingResourceIT.java b/properties/src/test/java/io/quarkus/ts/properties/configmapping/ConfigMappingResourceIT.java similarity index 97% rename from properties/src/test/java/io/quarkus/qe/properties/configmapping/ConfigMappingResourceIT.java rename to properties/src/test/java/io/quarkus/ts/properties/configmapping/ConfigMappingResourceIT.java index aeb591300..a2c5cd765 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/configmapping/ConfigMappingResourceIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/configmapping/ConfigMappingResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.configmapping; +package io.quarkus.ts.properties.configmapping; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; diff --git a/properties/src/test/java/io/quarkus/qe/properties/consul/ConsulConfigSourceIT.java b/properties/src/test/java/io/quarkus/ts/properties/consul/ConsulConfigSourceIT.java similarity index 98% rename from properties/src/test/java/io/quarkus/qe/properties/consul/ConsulConfigSourceIT.java rename to properties/src/test/java/io/quarkus/ts/properties/consul/ConsulConfigSourceIT.java index 3c7d99d67..249bac702 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/consul/ConsulConfigSourceIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/consul/ConsulConfigSourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.consul; +package io.quarkus.ts.properties.consul; import static io.quarkus.test.utils.AwaitilityUtils.untilAsserted; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/properties/src/test/java/io/quarkus/qe/properties/consul/OpenShiftConsulConfigSourceIT.java b/properties/src/test/java/io/quarkus/ts/properties/consul/OpenShiftConsulConfigSourceIT.java similarity index 78% rename from properties/src/test/java/io/quarkus/qe/properties/consul/OpenShiftConsulConfigSourceIT.java rename to properties/src/test/java/io/quarkus/ts/properties/consul/OpenShiftConsulConfigSourceIT.java index 0ac8113bd..19c45f03e 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/consul/OpenShiftConsulConfigSourceIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/consul/OpenShiftConsulConfigSourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.consul; +package io.quarkus.ts.properties.consul; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/properties/src/test/java/io/quarkus/qe/properties/toggle/BaseToggleablePropertiesIT.java b/properties/src/test/java/io/quarkus/ts/properties/toggle/BaseToggleablePropertiesIT.java similarity index 97% rename from properties/src/test/java/io/quarkus/qe/properties/toggle/BaseToggleablePropertiesIT.java rename to properties/src/test/java/io/quarkus/ts/properties/toggle/BaseToggleablePropertiesIT.java index 10d2629c2..5e56fa618 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/toggle/BaseToggleablePropertiesIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/toggle/BaseToggleablePropertiesIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.toggle; +package io.quarkus.ts.properties.toggle; import java.time.Duration; diff --git a/properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleablePropertiesOnDevModeIT.java b/properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleablePropertiesOnDevModeIT.java similarity index 95% rename from properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleablePropertiesOnDevModeIT.java rename to properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleablePropertiesOnDevModeIT.java index e31ae0eb8..1994bd732 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleablePropertiesOnDevModeIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleablePropertiesOnDevModeIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.toggle; +package io.quarkus.ts.properties.toggle; import io.quarkus.test.bootstrap.DevModeQuarkusService; import io.quarkus.test.scenarios.QuarkusScenario; diff --git a/properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleablePropertiesOnJvmModeIT.java b/properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleablePropertiesOnJvmModeIT.java similarity index 94% rename from properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleablePropertiesOnJvmModeIT.java rename to properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleablePropertiesOnJvmModeIT.java index 7ce9ef5fd..18a6509f0 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleablePropertiesOnJvmModeIT.java +++ b/properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleablePropertiesOnJvmModeIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.toggle; +package io.quarkus.ts.properties.toggle; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; diff --git a/properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleableServices.java b/properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleableServices.java similarity index 95% rename from properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleableServices.java rename to properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleableServices.java index d0fe7513a..4558efdc9 100644 --- a/properties/src/test/java/io/quarkus/qe/properties/toggle/ToggleableServices.java +++ b/properties/src/test/java/io/quarkus/ts/properties/toggle/ToggleableServices.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.properties.toggle; +package io.quarkus.ts.properties.toggle; public enum ToggleableServices { SWAGGER("Swagger", "/q/swagger-ui", "quarkus.swagger-ui.enable"), diff --git a/qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/AlertMessages.java b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/AlertMessages.java similarity index 89% rename from qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/AlertMessages.java rename to qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/AlertMessages.java index 40487fd2c..9bdd338b5 100644 --- a/qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/AlertMessages.java +++ b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/AlertMessages.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.qute.api; +package io.quarkus.ts.qute.api; import io.quarkus.qute.i18n.Message; import io.quarkus.qute.i18n.MessageBundle; diff --git a/qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/MyQuteMessages.java b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteMessages.java similarity index 88% rename from qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/MyQuteMessages.java rename to qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteMessages.java index c376f30ae..7c9b8a83b 100644 --- a/qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/MyQuteMessages.java +++ b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteMessages.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.qute.api; +package io.quarkus.ts.qute.api; import io.quarkus.qute.i18n.Message; import io.quarkus.qute.i18n.MessageBundle; diff --git a/qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/MyQuteResource.java b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteResource.java similarity index 98% rename from qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/MyQuteResource.java rename to qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteResource.java index d930fb036..d02068b25 100644 --- a/qute/multimodule/qute-api/src/main/java/io/quarkus/qe/qute/api/MyQuteResource.java +++ b/qute/multimodule/qute-api/src/main/java/io/quarkus/ts/qute/api/MyQuteResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.qute.api; +package io.quarkus.ts.qute.api; import static java.util.Objects.requireNonNull; diff --git a/qute/multimodule/qute-test/src/test/java/io/quarkus/qe/qute/LocalizedMessagesIT.java b/qute/multimodule/qute-test/src/test/java/io/quarkus/ts/qute/test/LocalizedMessagesIT.java similarity index 97% rename from qute/multimodule/qute-test/src/test/java/io/quarkus/qe/qute/LocalizedMessagesIT.java rename to qute/multimodule/qute-test/src/test/java/io/quarkus/ts/qute/test/LocalizedMessagesIT.java index 1194aca31..43f2f6706 100644 --- a/qute/multimodule/qute-test/src/test/java/io/quarkus/qe/qute/LocalizedMessagesIT.java +++ b/qute/multimodule/qute-test/src/test/java/io/quarkus/ts/qute/test/LocalizedMessagesIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.qute; +package io.quarkus.ts.qute.test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.containsString; diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/AnnotationScheduledCounter.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/AnnotationScheduledCounter.java similarity index 84% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/AnnotationScheduledCounter.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/AnnotationScheduledCounter.java index 04adde627..673953fb4 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/AnnotationScheduledCounter.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/AnnotationScheduledCounter.java @@ -1,11 +1,11 @@ -package io.quarkus.qe.scheduling.quartz.basic; +package io.quarkus.ts.scheduling.quartz.basic; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import io.quarkus.qe.scheduling.quartz.basic.services.CounterService; import io.quarkus.scheduler.Scheduled; +import io.quarkus.ts.scheduling.quartz.basic.services.CounterService; @ApplicationScoped public class AnnotationScheduledCounter { diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/CountResource.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/CountResource.java similarity index 93% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/CountResource.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/CountResource.java index f972c2e23..3ab4cee42 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/CountResource.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/CountResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz.basic; +package io.quarkus.ts.scheduling.quartz.basic; import javax.inject.Inject; import javax.ws.rs.GET; diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/ManuallyScheduledCounter.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/ManuallyScheduledCounter.java similarity index 94% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/ManuallyScheduledCounter.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/ManuallyScheduledCounter.java index 907cbb95d..bd67eaf95 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/ManuallyScheduledCounter.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/ManuallyScheduledCounter.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz.basic; +package io.quarkus.ts.scheduling.quartz.basic; import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; @@ -17,9 +17,9 @@ import org.quartz.Trigger; import org.quartz.TriggerBuilder; -import io.quarkus.qe.scheduling.quartz.basic.services.CounterService; import io.quarkus.runtime.Startup; import io.quarkus.runtime.annotations.RegisterForReflection; +import io.quarkus.ts.scheduling.quartz.basic.services.CounterService; @Startup @ApplicationScoped diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/services/CounterService.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/services/CounterService.java similarity index 91% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/services/CounterService.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/services/CounterService.java index 0ebaef6c2..e38991abf 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/basic/services/CounterService.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/basic/services/CounterService.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz.basic.services; +package io.quarkus.ts.scheduling.quartz.basic.services; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/AnnotationScheduledJob.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/AnnotationScheduledJob.java similarity index 91% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/AnnotationScheduledJob.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/AnnotationScheduledJob.java index ff25a01dc..eefa33c5c 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/AnnotationScheduledJob.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/AnnotationScheduledJob.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz.failover; +package io.quarkus.ts.scheduling.quartz.failover; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionEntity.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionEntity.java similarity index 80% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionEntity.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionEntity.java index 809d5ddb1..29717eaca 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionEntity.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz.failover; +package io.quarkus.ts.scheduling.quartz.failover; import javax.persistence.Entity; diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionService.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionService.java similarity index 90% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionService.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionService.java index d81ca86fe..7bd3ed536 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionService.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionService.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz.failover; +package io.quarkus.ts.scheduling.quartz.failover; import java.time.Instant; diff --git a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionsResource.java b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionsResource.java similarity index 87% rename from scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionsResource.java rename to scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionsResource.java index 7f1a4e741..5b42c48d8 100644 --- a/scheduling/quartz/src/main/java/io/quarkus/qe/scheduling/quartz/failover/ExecutionsResource.java +++ b/scheduling/quartz/src/main/java/io/quarkus/ts/scheduling/quartz/failover/ExecutionsResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz.failover; +package io.quarkus.ts.scheduling.quartz.failover; import java.util.List; diff --git a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/AnnotationScheduledJobsMySqlQuartzIT.java b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/AnnotationScheduledJobsMySqlQuartzIT.java similarity index 95% rename from scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/AnnotationScheduledJobsMySqlQuartzIT.java rename to scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/AnnotationScheduledJobsMySqlQuartzIT.java index ba09d021c..65d8f8ece 100644 --- a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/AnnotationScheduledJobsMySqlQuartzIT.java +++ b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/AnnotationScheduledJobsMySqlQuartzIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz; +package io.quarkus.ts.scheduling.quartz; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,10 +8,10 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import io.quarkus.qe.scheduling.quartz.failover.ExecutionEntity; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.QuarkusApplication; +import io.quarkus.ts.scheduling.quartz.failover.ExecutionEntity; @QuarkusScenario public class AnnotationScheduledJobsMySqlQuartzIT extends BaseMySqlQuartzIT { diff --git a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/BaseMySqlQuartzIT.java b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/BaseMySqlQuartzIT.java similarity index 91% rename from scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/BaseMySqlQuartzIT.java rename to scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/BaseMySqlQuartzIT.java index 16adef8d8..18fd507d3 100644 --- a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/BaseMySqlQuartzIT.java +++ b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/BaseMySqlQuartzIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz; +package io.quarkus.ts.scheduling.quartz; import io.quarkus.test.bootstrap.MySqlService; import io.quarkus.test.services.Container; diff --git a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/BasicMySqlQuartzIT.java b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/BasicMySqlQuartzIT.java similarity index 97% rename from scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/BasicMySqlQuartzIT.java rename to scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/BasicMySqlQuartzIT.java index 4de894e67..aebd0b235 100644 --- a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/BasicMySqlQuartzIT.java +++ b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/BasicMySqlQuartzIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz; +package io.quarkus.ts.scheduling.quartz; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/OpenShiftBasicQuartzIT.java b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/OpenShiftBasicQuartzIT.java similarity index 77% rename from scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/OpenShiftBasicQuartzIT.java rename to scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/OpenShiftBasicQuartzIT.java index 7adbc5a05..c8daea55a 100644 --- a/scheduling/quartz/src/test/java/io/quarkus/qe/scheduling/quartz/OpenShiftBasicQuartzIT.java +++ b/scheduling/quartz/src/test/java/io/quarkus/ts/scheduling/quartz/OpenShiftBasicQuartzIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.scheduling.quartz; +package io.quarkus.ts.scheduling.quartz; import io.quarkus.test.scenarios.OpenShiftScenario; diff --git a/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsJsseEndpoint.java b/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseEndpoint.java similarity index 93% rename from security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsJsseEndpoint.java rename to security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseEndpoint.java index 82db0b261..22402b79b 100644 --- a/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsJsseEndpoint.java +++ b/security/bouncycastle-fips/bcFipsJsse/src/main/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.bouncycastle.fips; +package io.quarkus.ts.security.bouncycastle.fips.jsse; import java.security.Security; import java.security.Signature; diff --git a/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsJsseIT.java b/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseIT.java similarity index 98% rename from security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsJsseIT.java rename to security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseIT.java index 46d58d160..745a88203 100644 --- a/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/BouncyCastleFipsJsseIT.java +++ b/security/bouncycastle-fips/bcFipsJsse/src/test/java/io/quarkus/ts/security/bouncycastle/fips/jsse/BouncyCastleFipsJsseIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security.bouncycastle.fips; +package io.quarkus.ts.security.bouncycastle.fips.jsse; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/AdminResource.java b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/AdminResource.java similarity index 91% rename from security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/AdminResource.java rename to security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/AdminResource.java index a2e2b1ba8..ec9862139 100644 --- a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/AdminResource.java +++ b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/AdminResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak.oauth2; import javax.annotation.security.RolesAllowed; import javax.inject.Inject; diff --git a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/UserResource.java b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/UserResource.java similarity index 91% rename from security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/UserResource.java rename to security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/UserResource.java index 03f81fa8b..8b4f020ec 100644 --- a/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/UserResource.java +++ b/security/keycloak-oauth2/src/main/java/io/quarkus/ts/security/keycloak/oauth2/UserResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak.oauth2; import javax.annotation.security.RolesAllowed; import javax.inject.Inject; diff --git a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/BaseOauth2SecurityIT.java b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/BaseOauth2SecurityIT.java similarity index 98% rename from security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/BaseOauth2SecurityIT.java rename to security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/BaseOauth2SecurityIT.java index fcddf4ee1..a768f64f5 100644 --- a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/BaseOauth2SecurityIT.java +++ b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/BaseOauth2SecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak.oauth2; import static org.hamcrest.Matchers.equalTo; diff --git a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/KeycloakOauth2SecurityIT.java b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/KeycloakOauth2SecurityIT.java similarity index 96% rename from security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/KeycloakOauth2SecurityIT.java rename to security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/KeycloakOauth2SecurityIT.java index b78569a23..dd1ed2f45 100644 --- a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/KeycloakOauth2SecurityIT.java +++ b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/KeycloakOauth2SecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak.oauth2; import io.quarkus.test.bootstrap.KeycloakService; import io.quarkus.test.bootstrap.RestService; diff --git a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/OpenShiftRhSso73Oauth2SecurityIT.java b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/OpenShiftRhSso73Oauth2SecurityIT.java similarity index 95% rename from security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/OpenShiftRhSso73Oauth2SecurityIT.java rename to security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/OpenShiftRhSso73Oauth2SecurityIT.java index caae08136..5bf3f7e3f 100644 --- a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/OpenShiftRhSso73Oauth2SecurityIT.java +++ b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/OpenShiftRhSso73Oauth2SecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak.oauth2; import io.quarkus.test.bootstrap.KeycloakService; import io.quarkus.test.bootstrap.RestService; diff --git a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/OpenShiftRhSso75Oauth2SecurityIT.java b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/OpenShiftRhSso75Oauth2SecurityIT.java similarity index 96% rename from security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/OpenShiftRhSso75Oauth2SecurityIT.java rename to security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/OpenShiftRhSso75Oauth2SecurityIT.java index d6e9ab2aa..960aecd22 100644 --- a/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/OpenShiftRhSso75Oauth2SecurityIT.java +++ b/security/keycloak-oauth2/src/test/java/io/quarkus/ts/security/keycloak/oauth2/OpenShiftRhSso75Oauth2SecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak.oauth2; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/security/keycloak/src/main/java/io/quarkus/ts/security/AdminResource.java b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/AdminResource.java similarity index 94% rename from security/keycloak/src/main/java/io/quarkus/ts/security/AdminResource.java rename to security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/AdminResource.java index 95c9ced28..2da78ec54 100644 --- a/security/keycloak/src/main/java/io/quarkus/ts/security/AdminResource.java +++ b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/AdminResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import javax.annotation.security.RolesAllowed; import javax.inject.Inject; diff --git a/security/keycloak/src/main/java/io/quarkus/ts/security/UserResource.java b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/UserResource.java similarity index 94% rename from security/keycloak/src/main/java/io/quarkus/ts/security/UserResource.java rename to security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/UserResource.java index 43b80b618..5d96220a6 100644 --- a/security/keycloak/src/main/java/io/quarkus/ts/security/UserResource.java +++ b/security/keycloak/src/main/java/io/quarkus/ts/security/keycloak/UserResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import javax.annotation.security.RolesAllowed; import javax.inject.Inject; diff --git a/security/keycloak/src/test/java/io/quarkus/ts/security/BaseOidcSecurityIT.java b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/BaseOidcSecurityIT.java similarity index 99% rename from security/keycloak/src/test/java/io/quarkus/ts/security/BaseOidcSecurityIT.java rename to security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/BaseOidcSecurityIT.java index 64862cc65..20f10fc25 100644 --- a/security/keycloak/src/test/java/io/quarkus/ts/security/BaseOidcSecurityIT.java +++ b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/BaseOidcSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import static io.restassured.RestAssured.given; import static org.awaitility.Awaitility.await; diff --git a/security/keycloak/src/test/java/io/quarkus/ts/security/DevModeKeycloakDevServiceUserExperienceIT.java b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/DevModeKeycloakDevServiceUserExperienceIT.java similarity index 94% rename from security/keycloak/src/test/java/io/quarkus/ts/security/DevModeKeycloakDevServiceUserExperienceIT.java rename to security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/DevModeKeycloakDevServiceUserExperienceIT.java index ba54ce8f1..e9e23a800 100644 --- a/security/keycloak/src/test/java/io/quarkus/ts/security/DevModeKeycloakDevServiceUserExperienceIT.java +++ b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/DevModeKeycloakDevServiceUserExperienceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; @@ -15,7 +15,7 @@ @QuarkusScenario public class DevModeKeycloakDevServiceUserExperienceIT { - private static final String KEYCLOAK_VERSION = "13.0.1"; + private static final String KEYCLOAK_VERSION = "18.0"; private static final String KEYCLOAK_IMAGE = "quay.io/keycloak/keycloak"; /** diff --git a/security/keycloak/src/test/java/io/quarkus/ts/security/DevModeOidcSecurityIT.java b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/DevModeOidcSecurityIT.java similarity index 96% rename from security/keycloak/src/test/java/io/quarkus/ts/security/DevModeOidcSecurityIT.java rename to security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/DevModeOidcSecurityIT.java index 7132c9776..62917abbb 100644 --- a/security/keycloak/src/test/java/io/quarkus/ts/security/DevModeOidcSecurityIT.java +++ b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/DevModeOidcSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import static io.restassured.RestAssured.given; diff --git a/security/keycloak/src/test/java/io/quarkus/ts/security/KeycloakOidcSecurityIT.java b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/KeycloakOidcSecurityIT.java similarity index 96% rename from security/keycloak/src/test/java/io/quarkus/ts/security/KeycloakOidcSecurityIT.java rename to security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/KeycloakOidcSecurityIT.java index e33ba4a18..bb4b1dd30 100644 --- a/security/keycloak/src/test/java/io/quarkus/ts/security/KeycloakOidcSecurityIT.java +++ b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/KeycloakOidcSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import io.quarkus.test.bootstrap.KeycloakService; import io.quarkus.test.bootstrap.RestService; diff --git a/security/keycloak/src/test/java/io/quarkus/ts/security/OpenShiftRhSso73OidcSecurityIT.java b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/OpenShiftRhSso73OidcSecurityIT.java similarity index 96% rename from security/keycloak/src/test/java/io/quarkus/ts/security/OpenShiftRhSso73OidcSecurityIT.java rename to security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/OpenShiftRhSso73OidcSecurityIT.java index dc224f78e..3e95f9b5a 100644 --- a/security/keycloak/src/test/java/io/quarkus/ts/security/OpenShiftRhSso73OidcSecurityIT.java +++ b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/OpenShiftRhSso73OidcSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import io.quarkus.test.bootstrap.KeycloakService; import io.quarkus.test.bootstrap.RestService; diff --git a/security/keycloak/src/test/java/io/quarkus/ts/security/OpenShiftRhSso75OidcSecurityIT.java b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/OpenShiftRhSso75OidcSecurityIT.java similarity index 96% rename from security/keycloak/src/test/java/io/quarkus/ts/security/OpenShiftRhSso75OidcSecurityIT.java rename to security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/OpenShiftRhSso75OidcSecurityIT.java index 8cfdde895..076a3cc86 100644 --- a/security/keycloak/src/test/java/io/quarkus/ts/security/OpenShiftRhSso75OidcSecurityIT.java +++ b/security/keycloak/src/test/java/io/quarkus/ts/security/keycloak/OpenShiftRhSso75OidcSecurityIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.security; +package io.quarkus.ts.security.keycloak; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/model/Book.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java similarity index 96% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/model/Book.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java index cf916e14d..bd92cc9c9 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/model/Book.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.persistence.model; +package io.quarkus.ts.spring.web.reactive.boostrap.persistence.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/repo/BookRepository.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java similarity index 70% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/repo/BookRepository.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java index 2a0f844b6..73b4aab35 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/repo/BookRepository.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java @@ -1,9 +1,9 @@ -package io.quarkus.ts.spring.web.boostrap.persistence.repo; +package io.quarkus.ts.spring.web.reactive.boostrap.persistence.repo; import javax.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.reactive.panache.PanacheRepository; -import io.quarkus.ts.spring.web.boostrap.persistence.model.Book; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; import io.smallrye.mutiny.Multi; @ApplicationScoped diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/BookController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java similarity index 89% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/BookController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java index 2b7adfeff..b7e43d312 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/BookController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web; +package io.quarkus.ts.spring.web.reactive.boostrap.web; import static javax.ws.rs.core.Response.Status.CREATED; import static javax.ws.rs.core.Response.Status.NOT_FOUND; @@ -24,10 +24,10 @@ import io.quarkus.hibernate.reactive.panache.Panache; import io.quarkus.hibernate.reactive.panache.common.runtime.ReactiveTransactional; -import io.quarkus.ts.spring.web.boostrap.persistence.model.Book; -import io.quarkus.ts.spring.web.boostrap.persistence.repo.BookRepository; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookIdMismatchException; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookNotFoundException; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.repo.BookRepository; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookIdMismatchException; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookNotFoundException; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/RestExceptionHandler.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java similarity index 79% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/RestExceptionHandler.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java index 169f4d6df..c0bda456b 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/RestExceptionHandler.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web; +package io.quarkus.ts.spring.web.reactive.boostrap.web; import javax.persistence.PersistenceException; @@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookIdMismatchException; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookNotFoundException; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookIdMismatchException; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookNotFoundException; @RestControllerAdvice public class RestExceptionHandler { diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/SimpleController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java similarity index 93% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/SimpleController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java index 10a59e63c..05aa6c90b 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/SimpleController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web; +package io.quarkus.ts.spring.web.reactive.boostrap.web; import javax.ws.rs.core.MediaType; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookIdMismatchException.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java similarity index 87% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookIdMismatchException.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java index 4304d1fa4..6d1933368 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookIdMismatchException.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web.exception; +package io.quarkus.ts.spring.web.reactive.boostrap.web.exception; import javax.ws.rs.WebApplicationException; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookNotFoundException.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java similarity index 87% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookNotFoundException.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java index b15b6f73b..d1149d90c 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookNotFoundException.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web.exception; +package io.quarkus.ts.spring.web.reactive.boostrap.web.exception; import javax.ws.rs.WebApplicationException; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteController.java similarity index 96% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteController.java index 8bc1bedc9..9efed5508 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteTextPlainController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteTextPlainController.java similarity index 92% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteTextPlainController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteTextPlainController.java index b28ef89fb..0bcf97a26 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteTextPlainController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/GetController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetController.java similarity index 95% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/GetController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetController.java index 17942e08c..841a21b02 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/GetController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/GetTextPlainController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetTextPlainController.java similarity index 91% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/GetTextPlainController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetTextPlainController.java index 99214b601..04240f174 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/GetTextPlainController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PatchController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchController.java similarity index 96% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PatchController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchController.java index cf3007bb4..1ca9ae9f2 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PatchController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PatchMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PatchTextPlainController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchTextPlainController.java similarity index 92% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PatchTextPlainController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchTextPlainController.java index e2e864858..b903e080a 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PatchTextPlainController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PatchMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PostController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostController.java similarity index 96% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PostController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostController.java index 0d462536f..5a27ceaba 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PostController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PostTextPlainController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostTextPlainController.java similarity index 92% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PostTextPlainController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostTextPlainController.java index a4c0b86a7..c86356c44 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PostTextPlainController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PutController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutController.java similarity index 96% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PutController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutController.java index ff7c9cb51..9a62681ae 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PutController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PutMapping; diff --git a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PutTextPlainController.java b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutTextPlainController.java similarity index 92% rename from spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PutTextPlainController.java rename to spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutTextPlainController.java index cbe22e211..ce75eeb0a 100644 --- a/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/openapi/PutTextPlainController.java +++ b/spring/spring-web-reactive/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PutMapping; diff --git a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/AbstractDbReactiveIT.java b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/AbstractDbReactiveIT.java similarity index 92% rename from spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/AbstractDbReactiveIT.java rename to spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/AbstractDbReactiveIT.java index 1cac333ac..4e8bdfbd4 100644 --- a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/AbstractDbReactiveIT.java +++ b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/AbstractDbReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.reactive; +package io.quarkus.ts.spring.web.reactive.reactive; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/BookResourceReactiveIT.java b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/BookResourceSpringWebReactiveIT.java similarity index 94% rename from spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/BookResourceReactiveIT.java rename to spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/BookResourceSpringWebReactiveIT.java index 376c75068..fbadee473 100644 --- a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/BookResourceReactiveIT.java +++ b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/BookResourceSpringWebReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.reactive.boostrap; +package io.quarkus.ts.spring.web.reactive.reactive.boostrap; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; @@ -16,12 +16,12 @@ import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.boostrap.persistence.model.Book; -import io.quarkus.ts.spring.web.reactive.AbstractDbReactiveIT; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; +import io.quarkus.ts.spring.web.reactive.reactive.AbstractDbReactiveIT; import io.restassured.response.Response; @QuarkusScenario -public class BookResourceReactiveIT extends AbstractDbReactiveIT { +public class BookResourceSpringWebReactiveIT extends AbstractDbReactiveIT { private static final String API_ROOT = "/api/books"; diff --git a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftHomePageReactiveIT.java b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/OpenShiftBookResourceSpringWebReactiveIT.java similarity index 87% rename from spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftHomePageReactiveIT.java rename to spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/OpenShiftBookResourceSpringWebReactiveIT.java index 3cf06e558..57919fbe6 100644 --- a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftHomePageReactiveIT.java +++ b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/OpenShiftBookResourceSpringWebReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.reactive.boostrap; +package io.quarkus.ts.spring.web.reactive.reactive.boostrap; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; @@ -7,7 +7,7 @@ import io.quarkus.test.services.QuarkusApplication; @OpenShiftScenario -public class OpenShiftHomePageReactiveIT extends HomePageReactiveIT { +public class OpenShiftBookResourceSpringWebReactiveIT extends BookResourceSpringWebReactiveIT { private static final String API_ROOT = "/api/books"; diff --git a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftBookResourceReactiveIT.java b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/OpenShiftQuteHomePageSpringWebReactiveIT.java similarity index 87% rename from spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftBookResourceReactiveIT.java rename to spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/OpenShiftQuteHomePageSpringWebReactiveIT.java index e503616fa..7f915c883 100644 --- a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftBookResourceReactiveIT.java +++ b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/OpenShiftQuteHomePageSpringWebReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.reactive.boostrap; +package io.quarkus.ts.spring.web.reactive.reactive.boostrap; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; @@ -7,7 +7,7 @@ import io.quarkus.test.services.QuarkusApplication; @OpenShiftScenario -public class OpenShiftBookResourceReactiveIT extends BookResourceReactiveIT { +public class OpenShiftQuteHomePageSpringWebReactiveIT extends QuteHomePageSpringWebReactiveIT { private static final String API_ROOT = "/api/books"; diff --git a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/HomePageReactiveIT.java b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/QuteHomePageSpringWebReactiveIT.java similarity index 83% rename from spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/HomePageReactiveIT.java rename to spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/QuteHomePageSpringWebReactiveIT.java index 16b66fdc5..673152b49 100644 --- a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/HomePageReactiveIT.java +++ b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/boostrap/QuteHomePageSpringWebReactiveIT.java @@ -1,14 +1,14 @@ -package io.quarkus.ts.spring.web.reactive.boostrap; +package io.quarkus.ts.spring.web.reactive.reactive.boostrap; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.reactive.AbstractDbReactiveIT; +import io.quarkus.ts.spring.web.reactive.reactive.AbstractDbReactiveIT; @QuarkusScenario -public class HomePageReactiveIT extends AbstractDbReactiveIT { +public class QuteHomePageSpringWebReactiveIT extends AbstractDbReactiveIT { static final int MARIADB_PORT = 3306; diff --git a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenApiReactiveIT.java b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/openapi/OpenApiReactiveIT.java similarity index 95% rename from spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenApiReactiveIT.java rename to spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/openapi/OpenApiReactiveIT.java index 36643bc2d..18a09efbe 100644 --- a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenApiReactiveIT.java +++ b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/openapi/OpenApiReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.reactive.openapi; +package io.quarkus.ts.spring.web.reactive.reactive.openapi; import java.util.Map; import java.util.stream.Collectors; @@ -18,7 +18,7 @@ import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.reactive.AbstractDbReactiveIT; +import io.quarkus.ts.spring.web.reactive.reactive.AbstractDbReactiveIT; import io.restassured.response.Response; @QuarkusScenario diff --git a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenShiftOpenApiReactiveIT.java b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/openapi/OpenShiftOpenApiReactiveIT.java similarity index 95% rename from spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenShiftOpenApiReactiveIT.java rename to spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/openapi/OpenShiftOpenApiReactiveIT.java index df4a67d8d..072da65e2 100644 --- a/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenShiftOpenApiReactiveIT.java +++ b/spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/reactive/openapi/OpenShiftOpenApiReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.reactive.openapi; +package io.quarkus.ts.spring.web.reactive.reactive.openapi; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/model/Book.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java similarity index 96% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/model/Book.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java index cf916e14d..bd92cc9c9 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/model/Book.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/model/Book.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.persistence.model; +package io.quarkus.ts.spring.web.reactive.boostrap.persistence.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/repo/BookRepository.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java similarity index 68% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/repo/BookRepository.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java index 1935477b2..1f0cc35da 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/persistence/repo/BookRepository.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/persistence/repo/BookRepository.java @@ -1,11 +1,11 @@ -package io.quarkus.ts.spring.web.boostrap.persistence.repo; +package io.quarkus.ts.spring.web.reactive.boostrap.persistence.repo; import java.util.List; import javax.enterprise.context.ApplicationScoped; import io.quarkus.hibernate.orm.panache.PanacheRepository; -import io.quarkus.ts.spring.web.boostrap.persistence.model.Book; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; @ApplicationScoped public class BookRepository implements PanacheRepository { diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/BookController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java similarity index 85% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/BookController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java index b1b51cfc3..990f6aa41 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/BookController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/BookController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web; +package io.quarkus.ts.spring.web.reactive.boostrap.web; import java.util.List; @@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import io.quarkus.ts.spring.web.boostrap.persistence.model.Book; -import io.quarkus.ts.spring.web.boostrap.persistence.repo.BookRepository; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookIdMismatchException; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookNotFoundException; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.repo.BookRepository; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookIdMismatchException; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookNotFoundException; @RestController @RequestMapping("/api/books") diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/RestExceptionHandler.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java similarity index 79% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/RestExceptionHandler.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java index 169f4d6df..c0bda456b 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/RestExceptionHandler.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/RestExceptionHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web; +package io.quarkus.ts.spring.web.reactive.boostrap.web; import javax.persistence.PersistenceException; @@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookIdMismatchException; -import io.quarkus.ts.spring.web.boostrap.web.exception.BookNotFoundException; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookIdMismatchException; +import io.quarkus.ts.spring.web.reactive.boostrap.web.exception.BookNotFoundException; @RestControllerAdvice public class RestExceptionHandler { diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/SimpleController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java similarity index 93% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/SimpleController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java index 254352215..697ff9349 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/SimpleController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/SimpleController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web; +package io.quarkus.ts.spring.web.reactive.boostrap.web; import javax.inject.Inject; import javax.ws.rs.core.MediaType; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookIdMismatchException.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java similarity index 86% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookIdMismatchException.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java index aa588daa7..059f9f602 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookIdMismatchException.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookIdMismatchException.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web.exception; +package io.quarkus.ts.spring.web.reactive.boostrap.web.exception; public class BookIdMismatchException extends RuntimeException { diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookNotFoundException.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java similarity index 86% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookNotFoundException.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java index 3d7c3f385..b7e1a0f78 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/boostrap/web/exception/BookNotFoundException.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/boostrap/web/exception/BookNotFoundException.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap.web.exception; +package io.quarkus.ts.spring.web.reactive.boostrap.web.exception; public class BookNotFoundException extends RuntimeException { diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteController.java similarity index 95% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteController.java index cbc043bdd..7ac5d851e 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteTextPlainController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteTextPlainController.java similarity index 91% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteTextPlainController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteTextPlainController.java index aa1451077..c790a201f 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/DeleteTextPlainController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/DeleteTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/GetController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetController.java similarity index 94% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/GetController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetController.java index 6f85041a0..17a1387e2 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/GetController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/GetTextPlainController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetTextPlainController.java similarity index 89% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/GetTextPlainController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetTextPlainController.java index fd653b32b..5a668584c 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/GetTextPlainController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/GetTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PatchController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchController.java similarity index 95% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PatchController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchController.java index ffba70a56..eed4b6685 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PatchController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PatchMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PatchTextPlainController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchTextPlainController.java similarity index 91% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PatchTextPlainController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchTextPlainController.java index 8cc51d0eb..23d3118aa 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PatchTextPlainController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PatchTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PatchMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PostController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostController.java similarity index 95% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PostController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostController.java index 8dbb10750..d43058a03 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PostController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PostTextPlainController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostTextPlainController.java similarity index 91% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PostTextPlainController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostTextPlainController.java index 6568679ce..5505e6de2 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PostTextPlainController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PostTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PutController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutController.java similarity index 95% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PutController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutController.java index 6311d758e..57c361b9c 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PutController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PutMapping; diff --git a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PutTextPlainController.java b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutTextPlainController.java similarity index 91% rename from spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PutTextPlainController.java rename to spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutTextPlainController.java index 183ddc2b2..f6b545e0c 100644 --- a/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/openapi/PutTextPlainController.java +++ b/spring/spring-web/src/main/java/io/quarkus/ts/spring/web/reactive/openapi/PutTextPlainController.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PutMapping; diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/AbstractDbIT.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/AbstractDbIT.java similarity index 93% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/AbstractDbIT.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/AbstractDbIT.java index e070e46cf..bcde4da63 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/AbstractDbIT.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/AbstractDbIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web; +package io.quarkus.ts.spring.web.reactive; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/MariaDBUtils.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/MariaDBUtils.java similarity index 79% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/MariaDBUtils.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/MariaDBUtils.java index 86491d3c8..7a480ce0a 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/MariaDBUtils.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/MariaDBUtils.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web; +package io.quarkus.ts.spring.web.reactive; public class MariaDBUtils { public static final int PORT = 3306; diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/BookResourceIT.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/BookResourceIT.java similarity index 95% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/BookResourceIT.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/BookResourceIT.java index 01a2ffebd..1979b5eb9 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/BookResourceIT.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/BookResourceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.boostrap; +package io.quarkus.ts.spring.web.reactive.boostrap; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; @@ -16,9 +16,9 @@ import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.AbstractDbIT; -import io.quarkus.ts.spring.web.MariaDBUtils; -import io.quarkus.ts.spring.web.boostrap.persistence.model.Book; +import io.quarkus.ts.spring.web.reactive.AbstractDbIT; +import io.quarkus.ts.spring.web.reactive.MariaDBUtils; +import io.quarkus.ts.spring.web.reactive.boostrap.persistence.model.Book; import io.restassured.response.Response; @QuarkusScenario diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/HomePageIT.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/HomePageIT.java similarity index 84% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/HomePageIT.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/HomePageIT.java index f1b21f1c7..8afe45016 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/HomePageIT.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/HomePageIT.java @@ -1,12 +1,12 @@ -package io.quarkus.ts.spring.web.boostrap; +package io.quarkus.ts.spring.web.reactive.boostrap; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.AbstractDbIT; -import io.quarkus.ts.spring.web.MariaDBUtils; +import io.quarkus.ts.spring.web.reactive.AbstractDbIT; +import io.quarkus.ts.spring.web.reactive.MariaDBUtils; @QuarkusScenario public class HomePageIT extends AbstractDbIT { diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/OpenShiftBookResourceIT.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftBookResourceIT.java similarity index 89% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/OpenShiftBookResourceIT.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftBookResourceIT.java index 63515d8b3..233c33173 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/OpenShiftBookResourceIT.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftBookResourceIT.java @@ -1,11 +1,11 @@ -package io.quarkus.ts.spring.web.boostrap; +package io.quarkus.ts.spring.web.reactive.boostrap; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.AbstractDbIT; +import io.quarkus.ts.spring.web.reactive.AbstractDbIT; @OpenShiftScenario public class OpenShiftBookResourceIT extends AbstractDbIT { diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/OpenShiftHomePageIT.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftHomePageIT.java similarity index 89% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/OpenShiftHomePageIT.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftHomePageIT.java index 32bbcf104..e3eb62338 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/boostrap/OpenShiftHomePageIT.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/boostrap/OpenShiftHomePageIT.java @@ -1,11 +1,11 @@ -package io.quarkus.ts.spring.web.boostrap; +package io.quarkus.ts.spring.web.reactive.boostrap; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.AbstractDbIT; +import io.quarkus.ts.spring.web.reactive.AbstractDbIT; @OpenShiftScenario public class OpenShiftHomePageIT extends AbstractDbIT { diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/openapi/OpenApiIT.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenApiIT.java similarity index 94% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/openapi/OpenApiIT.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenApiIT.java index 5aab441d1..c4981afbc 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/openapi/OpenApiIT.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenApiIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import java.util.Map; import java.util.stream.Collectors; @@ -18,8 +18,8 @@ import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.AbstractDbIT; -import io.quarkus.ts.spring.web.MariaDBUtils; +import io.quarkus.ts.spring.web.reactive.AbstractDbIT; +import io.quarkus.ts.spring.web.reactive.MariaDBUtils; import io.restassured.response.Response; @QuarkusScenario diff --git a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/openapi/OpenShiftOpenApiIT.java b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenShiftOpenApiIT.java similarity index 89% rename from spring/spring-web/src/test/java/io/quarkus/ts/spring/web/openapi/OpenShiftOpenApiIT.java rename to spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenShiftOpenApiIT.java index c6a217f77..e13202e23 100644 --- a/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/openapi/OpenShiftOpenApiIT.java +++ b/spring/spring-web/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/OpenShiftOpenApiIT.java @@ -1,11 +1,11 @@ -package io.quarkus.ts.spring.web.openapi; +package io.quarkus.ts.spring.web.reactive.openapi; import io.quarkus.test.bootstrap.MariaDbService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.spring.web.AbstractDbIT; +import io.quarkus.ts.spring.web.reactive.AbstractDbIT; @OpenShiftScenario public class OpenShiftOpenApiIT extends AbstractDbIT { diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/AnalysisConfigurer.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/AnalysisConfigurer.java similarity index 94% rename from sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/AnalysisConfigurer.java rename to sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/AnalysisConfigurer.java index b569b95de..f1037eb49 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/AnalysisConfigurer.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/AnalysisConfigurer.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import javax.enterprise.context.Dependent; import javax.inject.Named; diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/CustomTenantResolver.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/CustomTenantResolver.java similarity index 96% rename from sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/CustomTenantResolver.java rename to sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/CustomTenantResolver.java index 82660eebd..45f5940f6 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/CustomTenantResolver.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/CustomTenantResolver.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/Fruit.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/Fruit.java similarity index 96% rename from sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/Fruit.java rename to sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/Fruit.java index 1282488f7..2059b496c 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/Fruit.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/Fruit.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,7 +24,7 @@ public class Fruit { @Id @GeneratedValue(generator = "fruitsSequence") - @GenericGenerator(name = "fruitsSequence", strategy = "io.quarkus.qe.hibernate.search.MyCustomIdGenerator") + @GenericGenerator(name = "fruitsSequence", strategy = "io.quarkus.ts.hibernate.search.MyCustomIdGenerator") private Integer id; @FullTextField(analyzer = "name") diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/FruitResource.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/FruitResource.java similarity index 98% rename from sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/FruitResource.java rename to sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/FruitResource.java index e7ab2364c..30e4ac9b0 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/FruitResource.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/FruitResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import java.util.List; diff --git a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/MyCustomIdGenerator.java b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/MyCustomIdGenerator.java similarity index 96% rename from sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/MyCustomIdGenerator.java rename to sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/MyCustomIdGenerator.java index 261997705..4a6a75c3c 100644 --- a/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/qe/hibernate/search/MyCustomIdGenerator.java +++ b/sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/ts/hibernate/search/MyCustomIdGenerator.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import java.io.Serializable; import java.util.HashSet; diff --git a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/AbstractMultitenantIT.java b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java similarity index 97% rename from sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/AbstractMultitenantIT.java rename to sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java index 10909d8fd..15ca8fea1 100644 --- a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/AbstractMultitenantIT.java +++ b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import static io.restassured.RestAssured.given; import static org.hamcrest.MatcherAssert.assertThat; @@ -17,7 +17,7 @@ import io.restassured.common.mapper.TypeRef; import io.restassured.http.ContentType; -public abstract class AbstractMultitenantIT { +public abstract class AbstractMultitenantHibernateSearchIT { public static final TypeRef> FRUIT_LIST_TYPE_REF = new TypeRef<>() { }; diff --git a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/MysqlMultitenantHibernateIT.java b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/MysqlMultitenantHibernateSearchIT.java similarity index 94% rename from sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/MysqlMultitenantHibernateIT.java rename to sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/MysqlMultitenantHibernateSearchIT.java index 5b1b5df53..a757dcb77 100644 --- a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/MysqlMultitenantHibernateIT.java +++ b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/MysqlMultitenantHibernateSearchIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import io.quarkus.test.bootstrap.DefaultService; import io.quarkus.test.bootstrap.MySqlService; @@ -8,7 +8,7 @@ import io.quarkus.test.services.QuarkusApplication; @QuarkusScenario -public class MysqlMultitenantHibernateIT extends AbstractMultitenantIT { +public class MysqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT { static final int ELASTIC_PORT = 9200; static final int MYSQL_PORT = 3306; diff --git a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/OpenShiftMysqlMultitenantIT.java b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/OpenShiftMysqlMultitenantHibernateSearchIT.java similarity index 95% rename from sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/OpenShiftMysqlMultitenantIT.java rename to sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/OpenShiftMysqlMultitenantHibernateSearchIT.java index 751ca655c..52a5cc44e 100644 --- a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/OpenShiftMysqlMultitenantIT.java +++ b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/OpenShiftMysqlMultitenantHibernateSearchIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; @@ -14,7 +14,7 @@ @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true") @Disabled //TODO https://github.com/quarkus-qe/quarkus-test-framework/issues/427 -public class OpenShiftMysqlMultitenantIT extends AbstractMultitenantIT { +public class OpenShiftMysqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT { static final int ELASTIC_PORT = 9200; static final int MYSQL_PORT = 3306; diff --git a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/OpenShiftPostgresqlMultitenantIT.java b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/OpenShiftPostgresqlMultitenantHibernateSearchIT.java similarity index 91% rename from sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/OpenShiftPostgresqlMultitenantIT.java rename to sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/OpenShiftPostgresqlMultitenantHibernateSearchIT.java index 59d1d608a..a466c6ddb 100644 --- a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/OpenShiftPostgresqlMultitenantIT.java +++ b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/OpenShiftPostgresqlMultitenantHibernateSearchIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; @@ -11,7 +11,7 @@ @OpenShiftScenario @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true") -public class OpenShiftPostgresqlMultitenantIT extends AbstractMultitenantIT { +public class OpenShiftPostgresqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT { static final int ELASTIC_PORT = 9200; static final int POSTGRESQL_PORT = 5432; diff --git a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/PostgresqlMultitenantHibernateIT.java b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/PostgresqlMultitenantHibernateSearchIT.java similarity index 92% rename from sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/PostgresqlMultitenantHibernateIT.java rename to sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/PostgresqlMultitenantHibernateSearchIT.java index f229730e7..470a38f7b 100644 --- a/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/qe/hibernate/search/PostgresqlMultitenantHibernateIT.java +++ b/sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/ts/hibernate/search/PostgresqlMultitenantHibernateSearchIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.hibernate.search; +package io.quarkus.ts.hibernate.search; import io.quarkus.test.bootstrap.DefaultService; import io.quarkus.test.bootstrap.PostgresqlService; @@ -8,7 +8,7 @@ import io.quarkus.test.services.QuarkusApplication; @QuarkusScenario -public class PostgresqlMultitenantHibernateIT extends AbstractMultitenantIT { +public class PostgresqlMultitenantHibernateSearchIT extends AbstractMultitenantHibernateSearchIT { static final int ELASTIC_PORT = 9200; static final int POSTGRESQL_PORT = 5432; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/Author.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Author.java similarity index 93% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/Author.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Author.java index 5f84ecb90..b71a0bd5e 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/Author.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Author.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.database; +package io.quarkus.ts.hibernate.reactive.database; import static javax.persistence.CascadeType.PERSIST; @@ -27,7 +27,7 @@ public class Author { @Id @Column(name = "id") @GeneratedValue(generator = "authorIds") - @GenericGenerator(name = "authorIds", strategy = "io.quarkus.ts.reactive.database.AuthorIdGenerator") + @GenericGenerator(name = "authorIds", strategy = "io.quarkus.ts.hibernate.reactive.database.AuthorIdGenerator") private Integer id; @NotNull diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/AuthorIdGenerator.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorIdGenerator.java similarity index 94% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/AuthorIdGenerator.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorIdGenerator.java index d3e135e48..ca883c243 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/AuthorIdGenerator.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorIdGenerator.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.database; +package io.quarkus.ts.hibernate.reactive.database; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/AuthorRepository.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorRepository.java similarity index 91% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/AuthorRepository.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorRepository.java index a4c1478b3..9df0f6a6e 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/AuthorRepository.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/AuthorRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.database; +package io.quarkus.ts.hibernate.reactive.database; import javax.enterprise.context.ApplicationScoped; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/Book.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Book.java similarity index 97% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/Book.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Book.java index 21a1579a3..149ad49d4 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/Book.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/Book.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.database; +package io.quarkus.ts.hibernate.reactive.database; import javax.persistence.Column; import javax.persistence.Convert; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/ISBNConverter.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/ISBNConverter.java similarity index 95% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/ISBNConverter.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/ISBNConverter.java index 280f50e7a..28da0bd5f 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/database/ISBNConverter.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/database/ISBNConverter.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.database; +package io.quarkus.ts.hibernate.reactive.database; import javax.persistence.AttributeConverter; import javax.persistence.Converter; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/ApplicationExceptionMapper.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/ApplicationExceptionMapper.java similarity index 95% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/ApplicationExceptionMapper.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/ApplicationExceptionMapper.java index de0456889..3c3c6b5fb 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/ApplicationExceptionMapper.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/ApplicationExceptionMapper.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.http; +package io.quarkus.ts.hibernate.reactive.http; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/BookDescription.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/BookDescription.java similarity index 87% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/BookDescription.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/BookDescription.java index 3164a50d6..9096b2336 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/BookDescription.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/BookDescription.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.http; +package io.quarkus.ts.hibernate.reactive.http; import io.quarkus.hibernate.orm.panache.common.ProjectedFieldName; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/GroundedEndpoint.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/GroundedEndpoint.java similarity index 96% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/GroundedEndpoint.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/GroundedEndpoint.java index 9aba0215c..faecd90d0 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/GroundedEndpoint.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/GroundedEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.http; +package io.quarkus.ts.hibernate.reactive.http; import javax.inject.Inject; import javax.ws.rs.Consumes; @@ -14,8 +14,8 @@ import org.hibernate.reactive.mutiny.Mutiny; import io.quarkus.arc.Arc; -import io.quarkus.ts.reactive.database.Author; -import io.quarkus.ts.reactive.database.Book; +import io.quarkus.ts.hibernate.reactive.database.Author; +import io.quarkus.ts.hibernate.reactive.database.Book; import io.smallrye.mutiny.Uni; @Path("/hibernate") diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/OtherResource.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/OtherResource.java similarity index 89% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/OtherResource.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/OtherResource.java index 79684f09e..5c8574273 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/OtherResource.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/OtherResource.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.http; +package io.quarkus.ts.hibernate.reactive.http; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/PanacheEndpoint.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/PanacheEndpoint.java similarity index 95% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/PanacheEndpoint.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/PanacheEndpoint.java index c258cbf16..e0b71f95f 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/PanacheEndpoint.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/PanacheEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.http; +package io.quarkus.ts.hibernate.reactive.http; import javax.inject.Inject; import javax.ws.rs.Consumes; @@ -12,9 +12,9 @@ import javax.ws.rs.core.Response; import io.quarkus.hibernate.reactive.panache.Panache; -import io.quarkus.ts.reactive.database.Author; -import io.quarkus.ts.reactive.database.AuthorRepository; -import io.quarkus.ts.reactive.database.Book; +import io.quarkus.ts.hibernate.reactive.database.Author; +import io.quarkus.ts.hibernate.reactive.database.AuthorRepository; +import io.quarkus.ts.hibernate.reactive.database.Book; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; diff --git a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/SomeApi.java b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/SomeApi.java similarity index 90% rename from sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/SomeApi.java rename to sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/SomeApi.java index 69ed9b6fe..cd7f68420 100644 --- a/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/reactive/http/SomeApi.java +++ b/sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/hibernate/reactive/http/SomeApi.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.http; +package io.quarkus.ts.hibernate.reactive.http; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/AbstractReactiveDatabaseIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/AbstractDatabaseHibernateReactiveIT.java similarity index 98% rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/AbstractReactiveDatabaseIT.java rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/AbstractDatabaseHibernateReactiveIT.java index 15c6796a4..6b98ed20b 100644 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/AbstractReactiveDatabaseIT.java +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/AbstractDatabaseHibernateReactiveIT.java @@ -1,6 +1,5 @@ -package io.quarkus.ts.reactive; +package io.quarkus.ts.hibernate.reactive; -import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -18,7 +17,7 @@ import io.restassured.response.Response; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public abstract class AbstractReactiveDatabaseIT { +public abstract class AbstractDatabaseHibernateReactiveIT { @Test @Order(1) diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/DB2DatabaseIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/DB2DatabaseHibernateReactiveIT.java similarity index 90% rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/DB2DatabaseIT.java rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/DB2DatabaseHibernateReactiveIT.java index 23100f401..7251e4eff 100644 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/DB2DatabaseIT.java +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/DB2DatabaseHibernateReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive; +package io.quarkus.ts.hibernate.reactive; import org.junit.jupiter.api.Tag; @@ -10,7 +10,7 @@ @QuarkusScenario @Tag("fips-incompatible") // Reported in https://github.com/IBM/Db2/issues/43 -public class DB2DatabaseIT extends AbstractReactiveDatabaseIT { +public class DB2DatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT { private static final String DB2_USER = "test"; private static final String DB2_PASSWORD = "test"; diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MariaDbDatabaseIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MariaDbDatabaseHibernateReactiveIT.java similarity index 93% rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MariaDbDatabaseIT.java rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MariaDbDatabaseHibernateReactiveIT.java index 7d1312c55..ae31a540b 100644 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MariaDbDatabaseIT.java +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MariaDbDatabaseHibernateReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive; +package io.quarkus.ts.hibernate.reactive; import org.junit.jupiter.api.Disabled; @@ -9,7 +9,7 @@ import io.quarkus.test.services.QuarkusApplication; @QuarkusScenario -public class MariaDbDatabaseIT extends AbstractReactiveDatabaseIT { +public class MariaDbDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT { private static final String MYSQL_USER = "quarkus_test"; private static final String MYSQL_PASSWORD = "quarkus_test"; diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MsSQLDatabaseIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MsSQLDatabaseHibernateReactiveIT.java similarity index 91% rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MsSQLDatabaseIT.java rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MsSQLDatabaseHibernateReactiveIT.java index 11aebe9ac..c9d55af15 100644 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MsSQLDatabaseIT.java +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MsSQLDatabaseHibernateReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive; +package io.quarkus.ts.hibernate.reactive; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -11,7 +11,7 @@ @QuarkusScenario //TODO: enable disabled methods then the issue will be fixed -public class MsSQLDatabaseIT extends AbstractReactiveDatabaseIT { +public class MsSQLDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT { private static final int MSSQL_PORT = 1433; diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MySQLDatabaseIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MySQLDatabaseHibernateReactiveIT.java similarity index 91% rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MySQLDatabaseIT.java rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MySQLDatabaseHibernateReactiveIT.java index 57cb4a886..2b292ce4b 100644 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/MySQLDatabaseIT.java +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/MySQLDatabaseHibernateReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive; +package io.quarkus.ts.hibernate.reactive; import org.junit.jupiter.api.Disabled; @@ -9,7 +9,7 @@ import io.quarkus.test.services.QuarkusApplication; @QuarkusScenario -public class MySQLDatabaseIT extends AbstractReactiveDatabaseIT { +public class MySQLDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT { private static final String MYSQL_USER = "quarkus_test"; private static final String MYSQL_PASSWORD = "quarkus_test"; diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/PostgresqlDatabaseIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/PostgresqlDatabaseHibernateReactiveIT.java similarity index 91% rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/PostgresqlDatabaseIT.java rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/PostgresqlDatabaseHibernateReactiveIT.java index c9df0b311..b3914ee04 100644 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/PostgresqlDatabaseIT.java +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/PostgresqlDatabaseHibernateReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive; +package io.quarkus.ts.hibernate.reactive; import io.quarkus.test.bootstrap.PostgresqlService; import io.quarkus.test.bootstrap.RestService; @@ -7,7 +7,7 @@ import io.quarkus.test.services.QuarkusApplication; @QuarkusScenario -public class PostgresqlDatabaseIT extends AbstractReactiveDatabaseIT { +public class PostgresqlDatabaseHibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT { private static final String POSTGRES_USER = "quarkus_test"; private static final String POSTGRES_PASSWORD = "quarkus_test"; diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftHibernateReactiveMsSQLIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftHibernateReactiveMsSQLIT.java new file mode 100644 index 000000000..9324d7abb --- /dev/null +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftHibernateReactiveMsSQLIT.java @@ -0,0 +1,8 @@ +package io.quarkus.ts.hibernate.reactive.openshift; + +import io.quarkus.test.scenarios.OpenShiftScenario; +import io.quarkus.ts.hibernate.reactive.MsSQLDatabaseHibernateReactiveIT; + +@OpenShiftScenario +public class OpenShiftHibernateReactiveMsSQLIT extends MsSQLDatabaseHibernateReactiveIT { +} diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftMySqlHibernateReactiveIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftMySqlHibernateReactiveIT.java new file mode 100644 index 000000000..2ed6b48cf --- /dev/null +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftMySqlHibernateReactiveIT.java @@ -0,0 +1,8 @@ +package io.quarkus.ts.hibernate.reactive.openshift; + +import io.quarkus.test.scenarios.OpenShiftScenario; +import io.quarkus.ts.hibernate.reactive.MySQLDatabaseHibernateReactiveIT; + +@OpenShiftScenario +public class OpenShiftMySqlHibernateReactiveIT extends MySQLDatabaseHibernateReactiveIT { +} diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresql10IT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftPostgresql10HibernateReactiveIT.java similarity index 85% rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresql10IT.java rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftPostgresql10HibernateReactiveIT.java index ecafbf53f..1d78731d8 100644 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresql10IT.java +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftPostgresql10HibernateReactiveIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts.reactive.openshift; +package io.quarkus.ts.hibernate.reactive.openshift; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; @@ -7,11 +7,11 @@ import io.quarkus.test.scenarios.OpenShiftScenario; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -import io.quarkus.ts.reactive.AbstractReactiveDatabaseIT; +import io.quarkus.ts.hibernate.reactive.AbstractDatabaseHibernateReactiveIT; @OpenShiftScenario @EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true") -public class OpenShiftPostgresql10IT extends AbstractReactiveDatabaseIT { +public class OpenShiftPostgresql10HibernateReactiveIT extends AbstractDatabaseHibernateReactiveIT { private static final String POSTGRES_USER = "quarkus_test"; private static final String POSTGRES_PASSWORD = "quarkus_test"; diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftPostgresqlHibernateReactiveIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftPostgresqlHibernateReactiveIT.java new file mode 100644 index 000000000..1394e0e86 --- /dev/null +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftPostgresqlHibernateReactiveIT.java @@ -0,0 +1,8 @@ +package io.quarkus.ts.hibernate.reactive.openshift; + +import io.quarkus.test.scenarios.OpenShiftScenario; +import io.quarkus.ts.hibernate.reactive.PostgresqlDatabaseHibernateReactiveIT; + +@OpenShiftScenario +public class OpenShiftPostgresqlHibernateReactiveIT extends PostgresqlDatabaseHibernateReactiveIT { +} diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMsSQLIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMsSQLIT.java deleted file mode 100644 index 4020648b7..000000000 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMsSQLIT.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.quarkus.ts.reactive.openshift; - -import io.quarkus.test.scenarios.OpenShiftScenario; -import io.quarkus.ts.reactive.MsSQLDatabaseIT; - -@OpenShiftScenario -public class OpenShiftMsSQLIT extends MsSQLDatabaseIT { -} diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMySqlIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMySqlIT.java deleted file mode 100644 index 4c2a305d6..000000000 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMySqlIT.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.quarkus.ts.reactive.openshift; - -import io.quarkus.test.scenarios.OpenShiftScenario; -import io.quarkus.ts.reactive.MySQLDatabaseIT; - -@OpenShiftScenario -public class OpenShiftMySqlIT extends MySQLDatabaseIT { -} diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresqlIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresqlIT.java deleted file mode 100644 index 018140a28..000000000 --- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresqlIT.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.quarkus.ts.reactive.openshift; - -import io.quarkus.test.scenarios.OpenShiftScenario; -import io.quarkus.ts.reactive.PostgresqlDatabaseIT; - -@OpenShiftScenario -public class OpenShiftPostgresqlIT extends PostgresqlDatabaseIT { -} diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationEntity.java similarity index 97% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationEntity.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationEntity.java index 95c2f87bc..03a7373e9 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import java.util.ArrayList; import java.util.List; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationQueryResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationQueryResource.java similarity index 96% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationQueryResource.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationQueryResource.java index cc96464ef..02336cf71 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationQueryResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationQueryResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import java.util.Collections; import java.util.List; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationResource.java similarity index 79% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationResource.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationResource.java index dfa8c490e..a0e3fedf0 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ApplicationResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import io.quarkus.hibernate.orm.rest.data.panache.PanacheEntityResource; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/DataSourceResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceResource.java similarity index 95% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/DataSourceResource.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceResource.java index 5fdaa100d..3fcfb84ef 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/DataSourceResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ServiceEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ServiceEntity.java similarity index 94% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ServiceEntity.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ServiceEntity.java index 5cacff205..fdeeac954 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/ServiceEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/ServiceEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserEntity.java similarity index 92% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserEntity.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserEntity.java index 8df3a3ec7..4b26807f7 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserRepository.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserRepository.java similarity index 90% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserRepository.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserRepository.java index dc5c06e4d..c2f803cd8 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserRepository.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import javax.enterprise.context.ApplicationScoped; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserResource.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserResource.java similarity index 94% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserResource.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserResource.java index f9d340e95..b128526bd 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/UserResource.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/UserResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import java.util.List; diff --git a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/VersionEntity.java b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/VersionEntity.java similarity index 84% rename from sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/VersionEntity.java rename to sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/VersionEntity.java index 50d4a70d3..2bbfe25e2 100644 --- a/sql-db/panache-flyway/src/main/java/io/quarkus/qe/sqldb/panacheflyway/VersionEntity.java +++ b/sql-db/panache-flyway/src/main/java/io/quarkus/ts/sqldb/panacheflyway/VersionEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/UserResourceIT.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDAllInPanacheWithFlywayIT.java similarity index 96% rename from sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/UserResourceIT.java rename to sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDAllInPanacheWithFlywayIT.java index 6bed44824..ae8b87c82 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/UserResourceIT.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDAllInPanacheWithFlywayIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.containsString; @@ -12,7 +12,7 @@ import io.quarkus.test.scenarios.QuarkusScenario; @QuarkusScenario -class UserResourceIT extends BaseIT { +class CRUDAllInPanacheWithFlywayIT extends PanacheWithFlywayBaseIT { private final static String NEW_USER_ID = "3"; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationResourceIT.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java similarity index 98% rename from sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationResourceIT.java rename to sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java index 584c146ef..db6bf9ea5 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/ApplicationResourceIT.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.containsString; @@ -23,7 +23,7 @@ import io.restassured.specification.RequestSpecification; @QuarkusScenario -public class ApplicationResourceIT extends BaseIT { +public class CRUDPanacheWithFlywayIT extends PanacheWithFlywayBaseIT { static final String APPLICATION_PATH = "/application"; static final String EXPECTED_VERSION = "1.2.0"; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/DataSourceIT.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceConfigPanacheWithFlywayIT.java similarity index 87% rename from sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/DataSourceIT.java rename to sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceConfigPanacheWithFlywayIT.java index b7963631c..45ce99117 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/DataSourceIT.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/DataSourceConfigPanacheWithFlywayIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; @@ -10,7 +10,7 @@ import io.restassured.specification.RequestSpecification; @QuarkusScenario -public class DataSourceIT extends BaseIT { +public class DataSourceConfigPanacheWithFlywayIT extends PanacheWithFlywayBaseIT { private static final String DATA_SOURCE_PATH = "/data-source"; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/BaseIT.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/PanacheWithFlywayBaseIT.java similarity index 89% rename from sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/BaseIT.java rename to sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/PanacheWithFlywayBaseIT.java index 949f61a93..f29d6be49 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/BaseIT.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/PanacheWithFlywayBaseIT.java @@ -1,11 +1,11 @@ -package io.quarkus.qe.sqldb.panacheflyway; +package io.quarkus.ts.sqldb.panacheflyway; import io.quarkus.test.bootstrap.MySqlService; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.services.Container; import io.quarkus.test.services.QuarkusApplication; -public abstract class BaseIT { +public abstract class PanacheWithFlywayBaseIT { static final int MYSQL_PORT = 3306; @Container(image = "${mysql.80.image}", port = MYSQL_PORT, expectedLog = "Only MySQL server logs after this point") diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/AgroalPoolTest.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalPoolTest.java similarity index 98% rename from sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/AgroalPoolTest.java rename to sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalPoolTest.java index 599be1468..eb704e114 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/AgroalPoolTest.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalPoolTest.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway.dbpool; +package io.quarkus.ts.sqldb.panacheflyway.dbpool; import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -24,9 +24,9 @@ import org.junit.jupiter.api.Test; import io.agroal.api.AgroalDataSource; -import io.quarkus.qe.sqldb.panacheflyway.UserRepository; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; +import io.quarkus.ts.sqldb.panacheflyway.UserRepository; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.helpers.test.AssertSubscriber; import io.smallrye.mutiny.tuples.Tuple2; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/AgroalTestProfile.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalTestProfile.java similarity index 94% rename from sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/AgroalTestProfile.java rename to sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalTestProfile.java index a64198b2f..953c46759 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/AgroalTestProfile.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/AgroalTestProfile.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway.dbpool; +package io.quarkus.ts.sqldb.panacheflyway.dbpool; import java.util.Collections; import java.util.HashMap; diff --git a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java similarity index 97% rename from sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java rename to sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java index f259b5fe9..9a914c5ba 100644 --- a/sql-db/panache-flyway/src/test/java/io/quarkus/qe/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java +++ b/sql-db/panache-flyway/src/test/java/io/quarkus/ts/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.sqldb.panacheflyway.dbpool; +package io.quarkus.ts.sqldb.panacheflyway.dbpool; import java.util.Collections; import java.util.HashMap; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/CommonResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/CommonResource.java similarity index 97% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/CommonResource.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/CommonResource.java index fe1997ed5..cbd3c44a3 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/CommonResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/CommonResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import java.net.URI; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/HardCoverBookResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/HardCoverBookResource.java similarity index 94% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/HardCoverBookResource.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/HardCoverBookResource.java index 63be8475f..82e50698e 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/HardCoverBookResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/HardCoverBookResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; @@ -15,9 +15,9 @@ import org.jboss.logging.Logger; -import io.quarkus.qe.model.Book; -import io.quarkus.qe.model.HardCoverBook; import io.quarkus.runtime.StartupEvent; +import io.quarkus.ts.reactive.db.clients.model.Book; +import io.quarkus.ts.reactive.db.clients.model.HardCoverBook; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.mssqlclient.MSSQLPool; import io.vertx.mutiny.sqlclient.Pool; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/NoteBookResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/NoteBookResource.java similarity index 91% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/NoteBookResource.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/NoteBookResource.java index 588021887..ad129a33c 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/NoteBookResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/NoteBookResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; @@ -15,9 +15,9 @@ import org.jboss.logging.Logger; -import io.quarkus.qe.model.Book; -import io.quarkus.qe.model.NoteBook; import io.quarkus.runtime.StartupEvent; +import io.quarkus.ts.reactive.db.clients.model.Book; +import io.quarkus.ts.reactive.db.clients.model.NoteBook; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.mysqlclient.MySQLPool; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/SoftCoverBookResource.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/SoftCoverBookResource.java similarity index 91% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/SoftCoverBookResource.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/SoftCoverBookResource.java index e81d8b30d..603fb0940 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/resources/SoftCoverBookResource.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/SoftCoverBookResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; @@ -14,9 +14,9 @@ import org.jboss.logging.Logger; -import io.quarkus.qe.model.Book; -import io.quarkus.qe.model.SoftCoverBook; import io.quarkus.runtime.StartupEvent; +import io.quarkus.ts.reactive.db.clients.model.Book; +import io.quarkus.ts.reactive.db.clients.model.SoftCoverBook; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.pgclient.PgPool; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/Book.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/Book.java similarity index 97% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/Book.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/Book.java index 4dcd253f7..7d2b88c39 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/Book.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/Book.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.model; +package io.quarkus.ts.reactive.db.clients.model; import java.util.ArrayList; import java.util.List; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/HardCoverBook.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/HardCoverBook.java similarity index 97% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/HardCoverBook.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/HardCoverBook.java index 023df02eb..50b6e8103 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/HardCoverBook.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/HardCoverBook.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.model; +package io.quarkus.ts.reactive.db.clients.model; import java.util.List; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/NoteBook.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/NoteBook.java similarity index 97% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/NoteBook.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/NoteBook.java index 06917795e..c1e64a4a5 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/NoteBook.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/NoteBook.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.model; +package io.quarkus.ts.reactive.db.clients.model; import java.util.List; diff --git a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/SoftCoverBook.java b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/SoftCoverBook.java similarity index 97% rename from sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/SoftCoverBook.java rename to sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/SoftCoverBook.java index 41057ad9e..bafeeef44 100644 --- a/sql-db/reactive-vanilla/src/main/java/io/quarkus/qe/model/SoftCoverBook.java +++ b/sql-db/reactive-vanilla/src/main/java/io/quarkus/ts/reactive/db/clients/model/SoftCoverBook.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.model; +package io.quarkus.ts.reactive.db.clients.model; import java.util.List; diff --git a/sql-db/reactive-vanilla/src/main/resources/container-license-acceptance.txt b/sql-db/reactive-vanilla/src/main/resources/container-license-acceptance.txt index c1229a8fe..708bb30e4 100644 --- a/sql-db/reactive-vanilla/src/main/resources/container-license-acceptance.txt +++ b/sql-db/reactive-vanilla/src/main/resources/container-license-acceptance.txt @@ -1 +1,2 @@ mcr.microsoft.com/mssql/server:2019-CU10-ubuntu-20.04 +mcr.microsoft.com/mssql/server:2019-CU15-ubuntu-20.04 \ No newline at end of file diff --git a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveIT.java b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java similarity index 90% rename from sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveIT.java rename to sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java index 313858376..bc908e481 100644 --- a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveIT.java +++ b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.empty; @@ -11,19 +11,19 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import io.quarkus.qe.model.Book; -import io.quarkus.qe.model.HardCoverBook; -import io.quarkus.qe.model.NoteBook; -import io.quarkus.qe.model.SoftCoverBook; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.DevModeQuarkusApplication; +import io.quarkus.ts.reactive.db.clients.model.Book; +import io.quarkus.ts.reactive.db.clients.model.HardCoverBook; +import io.quarkus.ts.reactive.db.clients.model.NoteBook; +import io.quarkus.ts.reactive.db.clients.model.SoftCoverBook; import io.vertx.core.json.JsonObject; @Tag("QUARKUS-1080") @Tag("QUARKUS-1408") @QuarkusScenario -public class DevModeReactiveIT { +public class DevModeMultipleReactiveSqlClientsIT { @DevModeQuarkusApplication static RestService app = new RestService(); diff --git a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveMssqlDevServiceUserExperienceIT.java b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactiveMssqlDevServiceUserExperienceIT.java similarity index 97% rename from sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveMssqlDevServiceUserExperienceIT.java rename to sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactiveMssqlDevServiceUserExperienceIT.java index a81699f82..70065a675 100644 --- a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveMssqlDevServiceUserExperienceIT.java +++ b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactiveMssqlDevServiceUserExperienceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; diff --git a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveMysqlDevServiceUserExperienceIT.java b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactiveMysqlDevServiceUserExperienceIT.java similarity index 97% rename from sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveMysqlDevServiceUserExperienceIT.java rename to sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactiveMysqlDevServiceUserExperienceIT.java index b988d63ab..1b80cbbd4 100644 --- a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactiveMysqlDevServiceUserExperienceIT.java +++ b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactiveMysqlDevServiceUserExperienceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; diff --git a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactivePostgresqlDevServiceUserExperienceIT.java b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactivePostgresqlDevServiceUserExperienceIT.java similarity index 97% rename from sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactivePostgresqlDevServiceUserExperienceIT.java rename to sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactivePostgresqlDevServiceUserExperienceIT.java index fa79bd5dc..de2552eee 100644 --- a/sql-db/reactive-vanilla/src/test/java/io/quarkus/qe/resources/DevModeReactivePostgresqlDevServiceUserExperienceIT.java +++ b/sql-db/reactive-vanilla/src/test/java/io/quarkus/ts/reactive/db/clients/DevModeReactivePostgresqlDevServiceUserExperienceIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.resources; +package io.quarkus.ts.reactive.db.clients; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/Application.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/Application.java similarity index 96% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/Application.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/Application.java index fd646f0d3..02ae73693 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/Application.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/Application.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql; +package io.quarkus.ts.vertx.sql; import static com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -14,9 +14,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.arc.profile.IfBuildProfile; -import io.quarkus.qe.vertx.sql.services.DbPoolService; import io.quarkus.runtime.StartupEvent; import io.quarkus.runtime.configuration.ProfileManager; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.vertx.core.impl.logging.Logger; import io.vertx.core.impl.logging.LoggerFactory; import io.vertx.core.json.jackson.DatabindCodec; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Address.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Address.java similarity index 91% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Address.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Address.java index 84ea3040b..44af9af57 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Address.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Address.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.Arrays; import java.util.List; @@ -8,7 +8,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Uni; @Schema(name = "Address", description = "Address entity") @@ -69,10 +69,12 @@ public Uni save(DbPoolService sqlClient) { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Address address = (Address) o; return street.equals(address.street) && blockNumber.equals(address.blockNumber) && diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Airline.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Airline.java similarity index 93% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Airline.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Airline.java index 22be388ea..10b2c9f5d 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Airline.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Airline.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.Row; @@ -87,10 +87,12 @@ public static String codeFromFlight(String flightCode) { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Airline airline = (Airline) o; return Double.compare(airline.infantPrice, infantPrice) == 0 && code.equals(airline.code) && diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Airport.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Airport.java similarity index 91% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Airport.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Airport.java index 591a387d6..d2303d0d0 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Airport.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Airport.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.Row; @@ -64,10 +64,12 @@ public static Uni> findAllAsList(DbPoolService client) { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Airport airport = (Airport) o; return code.equals(airport.code) && city.equals(airport.city); diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Basket.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Basket.java similarity index 91% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Basket.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Basket.java index 9aec0a5c9..207eeb359 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Basket.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Basket.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.Arrays; import java.util.List; @@ -8,7 +8,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.SqlClientHelper; @@ -63,10 +63,12 @@ public Uni save(DbPoolService sqlClient) { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Basket basket = (Basket) o; return Double.compare(basket.price, price) == 0 && flight.equals(basket.flight); diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Flight.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Flight.java similarity index 95% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Flight.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Flight.java index 5e30482bf..83c6b1c1c 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Flight.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Flight.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.Row; @@ -105,10 +105,12 @@ public void setPrice(double price) { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Flight flight = (Flight) o; return Double.compare(flight.price, price) == 0 && origin.equals(flight.origin) && diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Passenger.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Passenger.java similarity index 92% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Passenger.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Passenger.java index 77c92b7f9..02ac3ba75 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Passenger.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Passenger.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.Arrays; import java.util.List; @@ -8,7 +8,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.SqlClientHelper; @@ -72,10 +72,12 @@ public Uni save(DbPoolService sqlClient) { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Passenger passenger = (Passenger) o; return nif.equals(passenger.nif) && name.equals(passenger.name) && diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/PricingRules.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/PricingRules.java similarity index 94% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/PricingRules.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/PricingRules.java index 1b8800fd2..4df85b86e 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/PricingRules.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/PricingRules.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.Row; @@ -92,10 +92,12 @@ public double applyAdultPercentage(double basePrice) { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } PricingRules that = (PricingRules) o; return from == that.from && to == that.to && diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/QueryFlightSearch.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/QueryFlightSearch.java similarity index 94% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/QueryFlightSearch.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/QueryFlightSearch.java index 363b0c3ad..ca62cadf1 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/QueryFlightSearch.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/QueryFlightSearch.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.Objects; @@ -89,10 +89,12 @@ public String toJsonStringify() { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } QueryFlightSearch that = (QueryFlightSearch) o; return adult == that.adult && child == that.child && diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Record.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Record.java similarity index 96% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Record.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Record.java index cfb22bfc8..c03da538f 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/domain/Record.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/domain/Record.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; import java.util.List; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/AirlineHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirlineHandler.java similarity index 88% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/AirlineHandler.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirlineHandler.java index 5462c77c6..e6e229aad 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/AirlineHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirlineHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import javax.inject.Inject; import javax.inject.Named; @@ -11,9 +11,9 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import io.quarkus.qe.vertx.sql.domain.Airline; -import io.quarkus.qe.vertx.sql.domain.Record; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.domain.Airline; +import io.quarkus.ts.vertx.sql.domain.Record; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.Route.HttpMethod; import io.quarkus.vertx.web.RouteBase; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/AirportsHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirportsHandler.java similarity index 88% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/AirportsHandler.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirportsHandler.java index a47830bb4..146638715 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/AirportsHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/AirportsHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import javax.inject.Inject; import javax.inject.Named; @@ -11,9 +11,9 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import io.quarkus.qe.vertx.sql.domain.Airport; -import io.quarkus.qe.vertx.sql.domain.Record; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.domain.Airport; +import io.quarkus.ts.vertx.sql.domain.Record; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.Route.HttpMethod; import io.quarkus.vertx.web.RouteBase; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/BasketHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/BasketHandler.java similarity index 88% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/BasketHandler.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/BasketHandler.java index ec7c15edb..60e2cf51c 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/BasketHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/BasketHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import javax.inject.Inject; import javax.inject.Named; @@ -11,9 +11,9 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import io.quarkus.qe.vertx.sql.domain.Basket; -import io.quarkus.qe.vertx.sql.domain.Record; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.domain.Basket; +import io.quarkus.ts.vertx.sql.domain.Record; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.quarkus.vertx.web.Body; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.Route.HttpMethod; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/FailureHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FailureHandler.java similarity index 98% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/FailureHandler.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FailureHandler.java index 3c28eafe1..79ecb05ea 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/FailureHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FailureHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import java.util.stream.Collectors; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/FlightsHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FlightsHandler.java similarity index 91% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/FlightsHandler.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FlightsHandler.java index 9fa137c7a..4870e4484 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/FlightsHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/FlightsHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import javax.inject.Inject; import javax.inject.Named; @@ -16,11 +16,11 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import io.quarkus.qe.vertx.sql.domain.Flight; -import io.quarkus.qe.vertx.sql.domain.QueryFlightSearch; -import io.quarkus.qe.vertx.sql.domain.Record; -import io.quarkus.qe.vertx.sql.services.DbPoolService; -import io.quarkus.qe.vertx.sql.services.FlightSearchService; +import io.quarkus.ts.vertx.sql.domain.Flight; +import io.quarkus.ts.vertx.sql.domain.QueryFlightSearch; +import io.quarkus.ts.vertx.sql.domain.Record; +import io.quarkus.ts.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.services.FlightSearchService; import io.quarkus.vertx.web.Body; import io.quarkus.vertx.web.Param; import io.quarkus.vertx.web.Route; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/PricingRulesHandler.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/PricingRulesHandler.java similarity index 88% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/PricingRulesHandler.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/PricingRulesHandler.java index 5c8e7abf9..10070be1e 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/handlers/PricingRulesHandler.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/handlers/PricingRulesHandler.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import javax.inject.Inject; import javax.inject.Named; @@ -11,9 +11,9 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import io.quarkus.qe.vertx.sql.domain.PricingRules; -import io.quarkus.qe.vertx.sql.domain.Record; -import io.quarkus.qe.vertx.sql.services.DbPoolService; +import io.quarkus.ts.vertx.sql.domain.PricingRules; +import io.quarkus.ts.vertx.sql.domain.Record; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import io.quarkus.vertx.web.Route; import io.quarkus.vertx.web.Route.HttpMethod; import io.quarkus.vertx.web.RouteBase; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/services/DbPoolService.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/DbPoolService.java similarity index 99% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/services/DbPoolService.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/DbPoolService.java index a2e2644eb..f79ad0353 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/services/DbPoolService.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/DbPoolService.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.services; +package io.quarkus.ts.vertx.sql.services; import java.util.List; import java.util.stream.Collectors; diff --git a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/services/FlightSearchService.java b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/FlightSearchService.java similarity index 79% rename from sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/services/FlightSearchService.java rename to sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/FlightSearchService.java index 2c486f299..1e5d2784d 100644 --- a/sql-db/vertx-sql/src/main/java/io/quarkus/qe/vertx/sql/services/FlightSearchService.java +++ b/sql-db/vertx-sql/src/main/java/io/quarkus/ts/vertx/sql/services/FlightSearchService.java @@ -1,7 +1,6 @@ -package io.quarkus.qe.vertx.sql.services; +package io.quarkus.ts.vertx.sql.services; -import static io.quarkus.qe.vertx.sql.domain.Airline.codeFromFlight; -import static io.quarkus.qe.vertx.sql.domain.PricingRules.daysToDepartureFilter; +import static io.quarkus.ts.vertx.sql.domain.PricingRules.daysToDepartureFilter; import java.util.ArrayList; import java.util.List; @@ -12,12 +11,12 @@ import javax.inject.Named; import javax.inject.Singleton; -import io.quarkus.qe.vertx.sql.domain.Airline; -import io.quarkus.qe.vertx.sql.domain.Basket; -import io.quarkus.qe.vertx.sql.domain.Flight; -import io.quarkus.qe.vertx.sql.domain.PricingRules; -import io.quarkus.qe.vertx.sql.domain.QueryFlightSearch; import io.quarkus.runtime.StartupEvent; +import io.quarkus.ts.vertx.sql.domain.Airline; +import io.quarkus.ts.vertx.sql.domain.Basket; +import io.quarkus.ts.vertx.sql.domain.Flight; +import io.quarkus.ts.vertx.sql.domain.PricingRules; +import io.quarkus.ts.vertx.sql.domain.QueryFlightSearch; import io.smallrye.mutiny.Uni; @Singleton @@ -51,7 +50,7 @@ private Basket calculatePrice(QueryFlightSearch query, Flight flight) { } private Double infantPrice(Flight flight) { - return airlines.get(codeFromFlight(flight.getFlightCode())).getInfantPrice(); + return airlines.get(Airline.codeFromFlight(flight.getFlightCode())).getInfantPrice(); } private Double childPrice(Flight flight, int dayToDeparture) { diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresPoolTest.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresPoolTest.java similarity index 99% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresPoolTest.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresPoolTest.java index 15339ebfd..26f1d013e 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresPoolTest.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresPoolTest.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.dbpool; +package io.quarkus.ts.vertx.sql.dbpool; import static io.restassured.RestAssured.given; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresqlResource.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresqlResource.java similarity index 97% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresqlResource.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresqlResource.java index f9f007fa9..b7e4f5bd4 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresqlResource.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresqlResource.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.dbpool; +package io.quarkus.ts.vertx.sql.dbpool; import java.util.HashMap; import java.util.Map; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresqlTestProfile.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresqlTestProfile.java similarity index 92% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresqlTestProfile.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresqlTestProfile.java index ca9eb0420..9f6c2b634 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/dbpool/PostgresqlTestProfile.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/dbpool/PostgresqlTestProfile.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.dbpool; +package io.quarkus.ts.vertx.sql.dbpool; import java.util.Collections; import java.util.List; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/CommonTestCases.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/CommonTestCases.java similarity index 68% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/CommonTestCases.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/CommonTestCases.java index bface649a..1ba57f220 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/CommonTestCases.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/CommonTestCases.java @@ -1,15 +1,16 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import org.junit.jupiter.api.Test; -import io.quarkus.qe.vertx.sql.handlers.spec.AirlineHandlerSpec; -import io.quarkus.qe.vertx.sql.handlers.spec.AirportHandlerSpec; -import io.quarkus.qe.vertx.sql.handlers.spec.BasketHandlerSpec; -import io.quarkus.qe.vertx.sql.handlers.spec.FlightsHandlerSpec; -import io.quarkus.qe.vertx.sql.handlers.spec.PricingRulesSpec; +import io.quarkus.ts.vertx.sql.handlers.spec.AirlineHandlerSpec; +import io.quarkus.ts.vertx.sql.handlers.spec.AirportHandlerSpec; +import io.quarkus.ts.vertx.sql.handlers.spec.BasketHandlerSpec; +import io.quarkus.ts.vertx.sql.handlers.spec.FlightsHandlerSpec; +import io.quarkus.ts.vertx.sql.handlers.spec.PricingRulesSpec; public abstract class CommonTestCases implements - PricingRulesSpec, FlightsHandlerSpec, BasketHandlerSpec, AirportHandlerSpec, AirlineHandlerSpec { + PricingRulesSpec, FlightsHandlerSpec, BasketHandlerSpec, AirportHandlerSpec, + AirlineHandlerSpec { @Test public void pricingRuleScenario() { diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/Db2HandlerIT.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/Db2HandlerIT.java similarity index 96% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/Db2HandlerIT.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/Db2HandlerIT.java index 6d1fd1310..9ef43fc29 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/Db2HandlerIT.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/Db2HandlerIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import org.junit.jupiter.api.Tag; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/MssqlHandlerIT.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/MssqlHandlerIT.java similarity index 96% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/MssqlHandlerIT.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/MssqlHandlerIT.java index d5a768cb3..2a38f6214 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/MssqlHandlerIT.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/MssqlHandlerIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.bootstrap.SqlServerService; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/MysqlHandlerIT.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/MysqlHandlerIT.java similarity index 96% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/MysqlHandlerIT.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/MysqlHandlerIT.java index c51901f45..21fb7aae8 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/MysqlHandlerIT.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/MysqlHandlerIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import io.quarkus.test.bootstrap.MySqlService; import io.quarkus.test.bootstrap.RestService; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/PostgresqlHandlerIT.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/PostgresqlHandlerIT.java similarity index 97% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/PostgresqlHandlerIT.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/PostgresqlHandlerIT.java index de4428a2f..c4d36a9c6 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/PostgresqlHandlerIT.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/PostgresqlHandlerIT.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; import io.quarkus.test.bootstrap.PostgresqlService; import io.quarkus.test.bootstrap.RestService; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/AirlineHandlerSpec.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/AirlineHandlerSpec.java similarity index 91% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/AirlineHandlerSpec.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/AirlineHandlerSpec.java index 742296454..f48404e14 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/AirlineHandlerSpec.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/AirlineHandlerSpec.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers.spec; +package io.quarkus.ts.vertx.sql.handlers.spec; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/AirportHandlerSpec.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/AirportHandlerSpec.java similarity index 91% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/AirportHandlerSpec.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/AirportHandlerSpec.java index cba5b4746..28bb93a92 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/AirportHandlerSpec.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/AirportHandlerSpec.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers.spec; +package io.quarkus.ts.vertx.sql.handlers.spec; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/BasketHandlerSpec.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/BasketHandlerSpec.java similarity index 90% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/BasketHandlerSpec.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/BasketHandlerSpec.java index de8ae6ada..9f425a022 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/BasketHandlerSpec.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/BasketHandlerSpec.java @@ -1,12 +1,12 @@ -package io.quarkus.qe.vertx.sql.handlers.spec; +package io.quarkus.ts.vertx.sql.handlers.spec; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; import io.netty.handler.codec.http.HttpResponseStatus; -import io.quarkus.qe.vertx.sql.domain.Address; -import io.quarkus.qe.vertx.sql.domain.Basket; -import io.quarkus.qe.vertx.sql.domain.Passenger; +import io.quarkus.ts.vertx.sql.domain.Address; +import io.quarkus.ts.vertx.sql.domain.Basket; +import io.quarkus.ts.vertx.sql.domain.Passenger; import io.restassured.http.ContentType; public interface BasketHandlerSpec { diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/FlightsHandlerSpec.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/FlightsHandlerSpec.java similarity index 96% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/FlightsHandlerSpec.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/FlightsHandlerSpec.java index 542287b20..eea23c000 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/FlightsHandlerSpec.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/FlightsHandlerSpec.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers.spec; +package io.quarkus.ts.vertx.sql.handlers.spec; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; @@ -11,9 +11,9 @@ import java.util.List; import io.netty.handler.codec.http.HttpResponseStatus; -import io.quarkus.qe.vertx.sql.domain.Basket; -import io.quarkus.qe.vertx.sql.domain.Flight; -import io.quarkus.qe.vertx.sql.domain.QueryFlightSearch; +import io.quarkus.ts.vertx.sql.domain.Basket; +import io.quarkus.ts.vertx.sql.domain.Flight; +import io.quarkus.ts.vertx.sql.domain.QueryFlightSearch; import io.restassured.http.ContentType; public interface FlightsHandlerSpec { diff --git a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/PricingRulesSpec.java b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/PricingRulesSpec.java similarity index 91% rename from sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/PricingRulesSpec.java rename to sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/PricingRulesSpec.java index 284811ae9..70d560eae 100644 --- a/sql-db/vertx-sql/src/test/java/io/quarkus/qe/vertx/sql/handlers/spec/PricingRulesSpec.java +++ b/sql-db/vertx-sql/src/test/java/io/quarkus/ts/vertx/sql/handlers/spec/PricingRulesSpec.java @@ -1,4 +1,4 @@ -package io.quarkus.qe.vertx.sql.handlers.spec; +package io.quarkus.ts.vertx.sql.handlers.spec; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.is; diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/Chat.java b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java similarity index 97% rename from websockets/websockets-client/src/main/java/io/quarkus/ts/Chat.java rename to websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java index 758769baa..017d5ee96 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/Chat.java +++ b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.websockets.producer; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/Pusher.java b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java similarity index 96% rename from websockets/websockets-client/src/main/java/io/quarkus/ts/Pusher.java rename to websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java index 407ebd4b0..91c3b76fe 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/Pusher.java +++ b/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.websockets.producer; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -17,6 +17,7 @@ @ApplicationScoped public class Pusher { private static final Logger LOG = Logger.getLogger(Chat.class); + private Session session; @OnOpen diff --git a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/OpenShiftChatIT.java b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/OpenShiftChatIT.java deleted file mode 100644 index f08a3e410..000000000 --- a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/OpenShiftChatIT.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.quarkus.ts; - -import io.quarkus.test.scenarios.OpenShiftScenario; - -@OpenShiftScenario -public class OpenShiftChatIT extends ChatIT { -} diff --git a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/OpenShiftWebSocketsProducerConsumerIT.java b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/OpenShiftWebSocketsProducerConsumerIT.java new file mode 100644 index 000000000..95c674acb --- /dev/null +++ b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/OpenShiftWebSocketsProducerConsumerIT.java @@ -0,0 +1,7 @@ +package io.quarkus.ts.websockets.producer; + +import io.quarkus.test.scenarios.OpenShiftScenario; + +@OpenShiftScenario +public class OpenShiftWebSocketsProducerConsumerIT extends WebSocketsProducerConsumerIT { +} diff --git a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/ChatIT.java b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java similarity index 98% rename from websockets/quarkus-websockets/src/test/java/io/quarkus/ts/ChatIT.java rename to websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java index 1b923dd03..2a15b84a2 100644 --- a/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/ChatIT.java +++ b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/WebSocketsProducerConsumerIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.websockets.producer; import java.io.IOException; import java.net.URI; @@ -23,7 +23,7 @@ import io.quarkus.test.services.QuarkusApplication; @QuarkusScenario -public class ChatIT { +public class WebSocketsProducerConsumerIT { @QuarkusApplication static final RestService server = new RestService(); diff --git a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/Chat.java b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Chat.java similarity index 97% rename from websockets/quarkus-websockets/src/main/java/io/quarkus/ts/Chat.java rename to websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Chat.java index 758769baa..c7f04ea03 100644 --- a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/Chat.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Chat.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.websockets.client; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/Pusher.java b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Pusher.java similarity index 96% rename from websockets/quarkus-websockets/src/main/java/io/quarkus/ts/Pusher.java rename to websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Pusher.java index 06abfdfdc..5d4172a10 100644 --- a/websockets/quarkus-websockets/src/main/java/io/quarkus/ts/Pusher.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/Pusher.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.websockets.client; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -17,7 +17,6 @@ @ApplicationScoped public class Pusher { private static final Logger LOG = Logger.getLogger(Chat.class); - private Session session; @OnOpen diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/RemoteClient.java b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/RemoteClient.java similarity index 98% rename from websockets/websockets-client/src/main/java/io/quarkus/ts/RemoteClient.java rename to websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/RemoteClient.java index 5c4c09cfc..a9580879e 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/RemoteClient.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/ts/websockets/client/RemoteClient.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.websockets.client; import java.io.IOException; import java.net.URI; diff --git a/websockets/websockets-client/src/test/java/io/quarkus/ts/OpenShiftClientIT.java b/websockets/websockets-client/src/test/java/io/quarkus/ts/OpenShiftClientIT.java deleted file mode 100644 index f32f0a2d9..000000000 --- a/websockets/websockets-client/src/test/java/io/quarkus/ts/OpenShiftClientIT.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.quarkus.ts; - -import io.quarkus.test.scenarios.OpenShiftScenario; - -@OpenShiftScenario -public class OpenShiftClientIT extends ClientIT { -} diff --git a/websockets/websockets-client/src/test/java/io/quarkus/ts/websockets/client/OpenShiftWebSocketsClientIT.java b/websockets/websockets-client/src/test/java/io/quarkus/ts/websockets/client/OpenShiftWebSocketsClientIT.java new file mode 100644 index 000000000..d60f46fe8 --- /dev/null +++ b/websockets/websockets-client/src/test/java/io/quarkus/ts/websockets/client/OpenShiftWebSocketsClientIT.java @@ -0,0 +1,7 @@ +package io.quarkus.ts.websockets.client; + +import io.quarkus.test.scenarios.OpenShiftScenario; + +@OpenShiftScenario +public class OpenShiftWebSocketsClientIT extends WebSocketsClientIT { +} diff --git a/websockets/websockets-client/src/test/java/io/quarkus/ts/ClientIT.java b/websockets/websockets-client/src/test/java/io/quarkus/ts/websockets/client/WebSocketsClientIT.java similarity index 95% rename from websockets/websockets-client/src/test/java/io/quarkus/ts/ClientIT.java rename to websockets/websockets-client/src/test/java/io/quarkus/ts/websockets/client/WebSocketsClientIT.java index 1f99f518e..172981bf8 100644 --- a/websockets/websockets-client/src/test/java/io/quarkus/ts/ClientIT.java +++ b/websockets/websockets-client/src/test/java/io/quarkus/ts/websockets/client/WebSocketsClientIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.ts.websockets.client; import java.util.List; @@ -13,7 +13,7 @@ import io.restassured.response.Response; @QuarkusScenario -public class ClientIT { +public class WebSocketsClientIT { // Adding `quarkus-websockets` extension @QuarkusApplication(dependencies = @Dependency(artifactId = "quarkus-websockets"))