From f26429659da7774630776ada1a5878917a412d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Thu, 26 May 2022 08:48:02 +0200 Subject: [PATCH] TS Clean-up - Move Sql & Websockets packages and rename tests --- .mvn/wrapper/maven-wrapper.properties | 2 +- .../hibernate/search/AnalysisConfigurer.java | 2 +- .../hibernate/search/CustomTenantResolver.java | 2 +- .../{qe => ts}/hibernate/search/Fruit.java | 4 ++-- .../hibernate/search/FruitResource.java | 2 +- .../hibernate/search/MyCustomIdGenerator.java | 2 +- .../AbstractMultitenantHibernateSearchIT.java} | 4 ++-- .../MysqlMultitenantHibernateSearchIT.java} | 4 ++-- ...ShiftMysqlMultitenantHibernateSearchIT.java} | 4 ++-- ...PostgresqlMultitenantHibernateSearchIT.java} | 4 ++-- ...PostgresqlMultitenantHibernateSearchIT.java} | 4 ++-- .../reactive/database/Author.java | 4 ++-- .../reactive/database/AuthorIdGenerator.java | 2 +- .../reactive/database/AuthorRepository.java | 2 +- .../{ => hibernate}/reactive/database/Book.java | 2 +- .../reactive/database/ISBNConverter.java | 2 +- .../http/ApplicationExceptionMapper.java | 2 +- .../reactive/http/BookDescription.java | 2 +- .../reactive/http/GroundedEndpoint.java | 6 +++--- .../reactive/http/OtherResource.java | 2 +- .../reactive/http/PanacheEndpoint.java | 8 ++++---- .../{ => hibernate}/reactive/http/SomeApi.java | 2 +- .../AbstractDatabaseHibernateReactiveIT.java} | 5 ++--- .../DB2DatabaseHibernateReactiveIT.java} | 4 ++-- .../MariaDbDatabaseHibernateReactiveIT.java} | 4 ++-- .../MsSQLDatabaseHibernateReactiveIT.java} | 4 ++-- .../MySQLDatabaseHibernateReactiveIT.java} | 4 ++-- .../PostgresqlDatabaseHibernateReactiveIT.java} | 4 ++-- .../OpenHibernateReactiveShiftMsSQLIT.java | 8 ++++++++ .../OpenShiftMySqlHibernateReactiveIT.java | 8 ++++++++ ...enShiftPostgresql10HibernateReactiveIT.java} | 6 +++--- .../OpenShiftPostgresqlHibernateReactiveIT.java | 8 ++++++++ .../ts/reactive/openshift/OpenShiftMsSQLIT.java | 8 -------- .../ts/reactive/openshift/OpenShiftMySqlIT.java | 8 -------- .../openshift/OpenShiftPostgresqlIT.java | 8 -------- .../sqldb/panacheflyway/ApplicationEntity.java | 2 +- .../panacheflyway/ApplicationQueryResource.java | 2 +- .../panacheflyway/ApplicationResource.java | 2 +- .../sqldb/panacheflyway/DataSourceResource.java | 2 +- .../sqldb/panacheflyway/ServiceEntity.java | 2 +- .../sqldb/panacheflyway/UserEntity.java | 2 +- .../sqldb/panacheflyway/UserRepository.java | 2 +- .../sqldb/panacheflyway/UserResource.java | 2 +- .../sqldb/panacheflyway/VersionEntity.java | 2 +- .../CRUDAllInPanacheWithFlywayIT.java} | 4 ++-- .../panacheflyway/CRUDPanacheWithFlywayIT.java} | 4 ++-- .../DataSourceConfigPanacheWithFlywayIT.java} | 4 ++-- .../panacheflyway/PanacheWithFlywayBaseIT.java} | 4 ++-- .../panacheflyway/dbpool/AgroalPoolTest.java | 4 ++-- .../panacheflyway/dbpool/AgroalTestProfile.java | 2 +- .../dbpool/MySqlDatabaseTestResource.java | 2 +- .../reactive/db/clients}/CommonResource.java | 2 +- .../db/clients}/HardCoverBookResource.java | 6 +++--- .../reactive/db/clients}/NoteBookResource.java | 6 +++--- .../db/clients}/SoftCoverBookResource.java | 6 +++--- .../reactive/db/clients}/model/Book.java | 2 +- .../db/clients}/model/HardCoverBook.java | 2 +- .../reactive/db/clients}/model/NoteBook.java | 2 +- .../db/clients}/model/SoftCoverBook.java | 2 +- .../DevModeMultipleReactiveSqlClientsIT.java} | 12 ++++++------ ...ReactiveMssqlDevServiceUserExperienceIT.java | 2 +- ...ReactiveMysqlDevServiceUserExperienceIT.java | 2 +- ...ivePostgresqlDevServiceUserExperienceIT.java | 2 +- .../{qe => ts}/vertx/sql/Application.java | 4 ++-- .../{qe => ts}/vertx/sql/domain/Address.java | 4 ++-- .../{qe => ts}/vertx/sql/domain/Airline.java | 4 ++-- .../{qe => ts}/vertx/sql/domain/Airport.java | 4 ++-- .../{qe => ts}/vertx/sql/domain/Basket.java | 4 ++-- .../{qe => ts}/vertx/sql/domain/Flight.java | 4 ++-- .../{qe => ts}/vertx/sql/domain/Passenger.java | 4 ++-- .../vertx/sql/domain/PricingRules.java | 4 ++-- .../vertx/sql/domain/QueryFlightSearch.java | 2 +- .../{qe => ts}/vertx/sql/domain/Record.java | 2 +- .../vertx/sql/handlers/AirlineHandler.java | 8 ++++---- .../vertx/sql/handlers/AirportsHandler.java | 8 ++++---- .../vertx/sql/handlers/BasketHandler.java | 8 ++++---- .../vertx/sql/handlers/FailureHandler.java | 2 +- .../vertx/sql/handlers/FlightsHandler.java | 12 ++++++------ .../vertx/sql/handlers/PricingRulesHandler.java | 8 ++++---- .../vertx/sql/services/DbPoolService.java | 2 +- .../vertx/sql/services/FlightSearchService.java | 17 ++++++++--------- .../vertx/sql/dbpool/PostgresPoolTest.java | 2 +- .../vertx/sql/dbpool/PostgresqlResource.java | 2 +- .../vertx/sql/dbpool/PostgresqlTestProfile.java | 2 +- .../vertx/sql/handlers/CommonTestCases.java | 15 ++++++++------- .../vertx/sql/handlers/Db2HandlerIT.java | 2 +- .../vertx/sql/handlers/MssqlHandlerIT.java | 2 +- .../vertx/sql/handlers/MysqlHandlerIT.java | 2 +- .../vertx/sql/handlers/PostgresqlHandlerIT.java | 2 +- .../sql/handlers/spec/AirlineHandlerSpec.java | 2 +- .../sql/handlers/spec/AirportHandlerSpec.java | 2 +- .../sql/handlers/spec/BasketHandlerSpec.java | 8 ++++---- .../sql/handlers/spec/FlightsHandlerSpec.java | 8 ++++---- .../sql/handlers/spec/PricingRulesSpec.java | 2 +- .../ts/{ => websockets/producer}/Chat.java | 2 +- .../ts/{ => websockets/producer}/Pusher.java | 2 +- .../java/io/quarkus/ts/OpenShiftChatIT.java | 7 ------- .../producer/OpenShiftWebSocketsProducerIT.java | 7 +++++++ .../producer/WebSocketsProducerIT.java} | 4 ++-- .../quarkus/{ts => websockets/client}/Chat.java | 2 +- .../{ts => websockets/client}/Pusher.java | 2 +- .../{ts => websockets/client}/RemoteClient.java | 2 +- .../java/io/quarkus/ts/OpenShiftClientIT.java | 7 ------- .../client/OpenShiftWebSocketsClientIT.java | 7 +++++++ .../client/WebSocketsClientIT.java} | 4 ++-- 105 files changed, 216 insertions(+), 217 deletions(-) rename sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/{qe => ts}/hibernate/search/AnalysisConfigurer.java (94%) rename sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/{qe => ts}/hibernate/search/CustomTenantResolver.java (96%) rename sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/{qe => ts}/hibernate/search/Fruit.java (96%) rename sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/{qe => ts}/hibernate/search/FruitResource.java (98%) rename sql-db/hibernate-fulltext-search/src/main/java/io/quarkus/{qe => ts}/hibernate/search/MyCustomIdGenerator.java (96%) rename sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/{qe/hibernate/search/AbstractMultitenantIT.java => ts/hibernate/search/AbstractMultitenantHibernateSearchIT.java} (97%) rename sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/{qe/hibernate/search/MysqlMultitenantHibernateIT.java => ts/hibernate/search/MysqlMultitenantHibernateSearchIT.java} (94%) rename sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/{qe/hibernate/search/OpenShiftMysqlMultitenantIT.java => ts/hibernate/search/OpenShiftMysqlMultitenantHibernateSearchIT.java} (95%) rename sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/{qe/hibernate/search/OpenShiftPostgresqlMultitenantIT.java => ts/hibernate/search/OpenShiftPostgresqlMultitenantHibernateSearchIT.java} (91%) rename sql-db/hibernate-fulltext-search/src/test/java/io/quarkus/{qe/hibernate/search/PostgresqlMultitenantHibernateIT.java => ts/hibernate/search/PostgresqlMultitenantHibernateSearchIT.java} (92%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/database/Author.java (93%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/database/AuthorIdGenerator.java (94%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/database/AuthorRepository.java (91%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/database/Book.java (97%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/database/ISBNConverter.java (95%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/http/ApplicationExceptionMapper.java (95%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/http/BookDescription.java (87%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/http/GroundedEndpoint.java (96%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/http/OtherResource.java (89%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/http/PanacheEndpoint.java (95%) rename sql-db/hibernate-reactive/src/main/java/io/quarkus/ts/{ => hibernate}/reactive/http/SomeApi.java (90%) rename sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/{reactive/AbstractReactiveDatabaseIT.java => hibernate/reactive/AbstractDatabaseHibernateReactiveIT.java} (98%) rename sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/{reactive/DB2DatabaseIT.java => hibernate/reactive/DB2DatabaseHibernateReactiveIT.java} (90%) rename sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/{reactive/MariaDbDatabaseIT.java => hibernate/reactive/MariaDbDatabaseHibernateReactiveIT.java} (93%) rename sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/{reactive/MsSQLDatabaseIT.java => hibernate/reactive/MsSQLDatabaseHibernateReactiveIT.java} (91%) rename sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/{reactive/MySQLDatabaseIT.java => hibernate/reactive/MySQLDatabaseHibernateReactiveIT.java} (91%) rename sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/{reactive/PostgresqlDatabaseIT.java => hibernate/reactive/PostgresqlDatabaseHibernateReactiveIT.java} (91%) create mode 100644 sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenHibernateReactiveShiftMsSQLIT.java create mode 100644 sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftMySqlHibernateReactiveIT.java rename sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/{reactive/openshift/OpenShiftPostgresql10IT.java => hibernate/reactive/openshift/OpenShiftPostgresql10HibernateReactiveIT.java} (85%) create mode 100644 sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenShiftPostgresqlHibernateReactiveIT.java delete mode 100644 sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMsSQLIT.java delete mode 100644 sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftMySqlIT.java delete mode 100644 sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresqlIT.java rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/ApplicationEntity.java (97%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/ApplicationQueryResource.java (96%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/ApplicationResource.java (79%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/DataSourceResource.java (95%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/ServiceEntity.java (94%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/UserEntity.java (92%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/UserRepository.java (90%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/UserResource.java (94%) rename sql-db/panache-flyway/src/main/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/VersionEntity.java (84%) rename sql-db/panache-flyway/src/test/java/io/quarkus/{qe/sqldb/panacheflyway/UserResourceIT.java => ts/sqldb/panacheflyway/CRUDAllInPanacheWithFlywayIT.java} (96%) rename sql-db/panache-flyway/src/test/java/io/quarkus/{qe/sqldb/panacheflyway/ApplicationResourceIT.java => ts/sqldb/panacheflyway/CRUDPanacheWithFlywayIT.java} (98%) rename sql-db/panache-flyway/src/test/java/io/quarkus/{qe/sqldb/panacheflyway/DataSourceIT.java => ts/sqldb/panacheflyway/DataSourceConfigPanacheWithFlywayIT.java} (87%) rename sql-db/panache-flyway/src/test/java/io/quarkus/{qe/sqldb/panacheflyway/BaseIT.java => ts/sqldb/panacheflyway/PanacheWithFlywayBaseIT.java} (89%) rename sql-db/panache-flyway/src/test/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/dbpool/AgroalPoolTest.java (98%) rename sql-db/panache-flyway/src/test/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/dbpool/AgroalTestProfile.java (94%) rename sql-db/panache-flyway/src/test/java/io/quarkus/{qe => ts}/sqldb/panacheflyway/dbpool/MySqlDatabaseTestResource.java (97%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe/resources => ts/reactive/db/clients}/CommonResource.java (97%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe/resources => ts/reactive/db/clients}/HardCoverBookResource.java (94%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe/resources => ts/reactive/db/clients}/NoteBookResource.java (91%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe/resources => ts/reactive/db/clients}/SoftCoverBookResource.java (91%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe => ts/reactive/db/clients}/model/Book.java (97%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe => ts/reactive/db/clients}/model/HardCoverBook.java (97%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe => ts/reactive/db/clients}/model/NoteBook.java (97%) rename sql-db/reactive-vanilla/src/main/java/io/quarkus/{qe => ts/reactive/db/clients}/model/SoftCoverBook.java (97%) rename sql-db/reactive-vanilla/src/test/java/io/quarkus/{qe/resources/DevModeReactiveIT.java => ts/reactive/db/clients/DevModeMultipleReactiveSqlClientsIT.java} (90%) rename sql-db/reactive-vanilla/src/test/java/io/quarkus/{qe/resources => ts/reactive/db/clients}/DevModeReactiveMssqlDevServiceUserExperienceIT.java (97%) rename sql-db/reactive-vanilla/src/test/java/io/quarkus/{qe/resources => ts/reactive/db/clients}/DevModeReactiveMysqlDevServiceUserExperienceIT.java (97%) rename sql-db/reactive-vanilla/src/test/java/io/quarkus/{qe/resources => ts/reactive/db/clients}/DevModeReactivePostgresqlDevServiceUserExperienceIT.java (97%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/Application.java (96%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/Address.java (95%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/Airline.java (96%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/Airport.java (95%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/Basket.java (95%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/Flight.java (97%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/Passenger.java (96%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/PricingRules.java (97%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/QueryFlightSearch.java (98%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/domain/Record.java (96%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/handlers/AirlineHandler.java (88%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/handlers/AirportsHandler.java (88%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/handlers/BasketHandler.java (88%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/handlers/FailureHandler.java (98%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/handlers/FlightsHandler.java (91%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/handlers/PricingRulesHandler.java (88%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/services/DbPoolService.java (99%) rename sql-db/vertx-sql/src/main/java/io/quarkus/{qe => ts}/vertx/sql/services/FlightSearchService.java (79%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/dbpool/PostgresPoolTest.java (99%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/dbpool/PostgresqlResource.java (97%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/dbpool/PostgresqlTestProfile.java (92%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/CommonTestCases.java (68%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/Db2HandlerIT.java (96%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/MssqlHandlerIT.java (96%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/MysqlHandlerIT.java (96%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/PostgresqlHandlerIT.java (97%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/spec/AirlineHandlerSpec.java (91%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/spec/AirportHandlerSpec.java (91%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/spec/BasketHandlerSpec.java (90%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/spec/FlightsHandlerSpec.java (96%) rename sql-db/vertx-sql/src/test/java/io/quarkus/{qe => ts}/vertx/sql/handlers/spec/PricingRulesSpec.java (91%) rename websockets/quarkus-websockets/src/main/java/io/quarkus/ts/{ => websockets/producer}/Chat.java (97%) rename websockets/quarkus-websockets/src/main/java/io/quarkus/ts/{ => websockets/producer}/Pusher.java (96%) delete mode 100644 websockets/quarkus-websockets/src/test/java/io/quarkus/ts/OpenShiftChatIT.java create mode 100644 websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/OpenShiftWebSocketsProducerIT.java rename websockets/quarkus-websockets/src/test/java/io/quarkus/ts/{ChatIT.java => websockets/producer/WebSocketsProducerIT.java} (98%) rename websockets/websockets-client/src/main/java/io/quarkus/{ts => websockets/client}/Chat.java (98%) rename websockets/websockets-client/src/main/java/io/quarkus/{ts => websockets/client}/Pusher.java (96%) rename websockets/websockets-client/src/main/java/io/quarkus/{ts => websockets/client}/RemoteClient.java (98%) delete mode 100644 websockets/websockets-client/src/test/java/io/quarkus/ts/OpenShiftClientIT.java create mode 100644 websockets/websockets-client/src/test/java/io/quarkus/websockets/client/OpenShiftWebSocketsClientIT.java rename websockets/websockets-client/src/test/java/io/quarkus/{ts/ClientIT.java => websockets/client/WebSocketsClientIT.java} (95%) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index fa87ad7ddf..7d59a01f25 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar 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 b569b95de2..f1037eb49a 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 82660eebd9..45f5940f6d 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 1282488f75..2059b496c5 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 e7ab2364cd..30e4ac9b08 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 2619977052..4a6a75c3c8 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 10909d8fd4..15ca8fea18 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 5b1b5df53f..a757dcb770 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 751ca655c7..52a5cc44e8 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 59d1d608a8..a466c6ddb7 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 f229730e7b..470a38f7b9 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 5f84ecb906..b71a0bd5e1 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 d3e135e48a..ca883c243e 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 a4c1478b3c..9df0f6a6e5 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 21a1579a34..149ad49d4c 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 280f50e7a5..28da0bd5f2 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 de04568898..3c3c6b5fb6 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 3164a50d67..9096b2336b 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 9aba0215cc..faecd90d03 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 79684f09ee..5c85742732 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 c258cbf169..e0b71f95f2 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 69ed9b6fe6..cd7f68420f 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 15c6796a48..6b98ed20b7 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 23100f4017..7251e4effb 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 7d1312c550..ae31a540b6 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 11aebe9acb..c9d55af150 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 57cb4a886c..2b292ce4b4 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 c9df0b311e..b3914ee044 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/OpenHibernateReactiveShiftMsSQLIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenHibernateReactiveShiftMsSQLIT.java new file mode 100644 index 0000000000..65f698d9a1 --- /dev/null +++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/hibernate/reactive/openshift/OpenHibernateReactiveShiftMsSQLIT.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 OpenHibernateReactiveShiftMsSQLIT 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 0000000000..2ed6b48cfa --- /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 ecafbf53fc..1d78731d8e 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 0000000000..1394e0e866 --- /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 4020648b73..0000000000 --- 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 4c2a305d6f..0000000000 --- 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 018140a284..0000000000 --- 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 95c2f87bc9..03a7373e91 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 cc96464ef9..02336cf718 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 dfa8c490e6..a0e3fedf03 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 5fdaa100d4..3fcfb84ef1 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 5cacff2057..fdeeac954b 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 8df3a3ec72..4b26807f7f 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 dc5c06e4d7..c2f803cd83 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 f9d340e950..b128526bd8 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 50d4a70d35..2bbfe25e2b 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 6bed44824b..ae8b87c821 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 584c146efb..db6bf9ea5f 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 b7963631c7..45ce991170 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 949f61a936..f29d6be493 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 599be1468a..eb704e114a 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 a64198b2f4..953c46759e 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 f259b5fe92..9a914c5ba5 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 fe1997ed53..cbd3c44a38 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 63be8475fe..82e50698e9 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 5880218873..ad129a33cb 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 e81d8b30dd..603fb09406 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 4dcd253f78..7d2b88c394 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 023df02ebf..50b6e81036 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 06917795eb..c1e64a4a57 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 41057ad9e0..bafeeef441 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/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 313858376b..bc908e481f 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 a81699f828..70065a6757 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 b988d63abd..1b80cbbd42 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 fa79bd5dca..de2552eee8 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 fd646f0d32..5cda0c86a0 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,7 +1,8 @@ -package io.quarkus.qe.vertx.sql; +package io.quarkus.ts.vertx.sql; import static com.fasterxml.jackson.annotation.JsonInclude.Include; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.enterprise.inject.Produces; @@ -14,7 +15,6 @@ 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.vertx.core.impl.logging.Logger; 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 95% 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 84ea3040b2..5d0fe44e50 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") 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 96% 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 22be388eaa..235d7ecca8 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,5 +1,6 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -7,7 +8,6 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.Row; 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 95% 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 591a387d67..3c0d568d7e 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; 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 95% 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 9aec0a5c95..23722ce622 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; 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 97% 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 5e30482bfc..f3ab8a3720 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,12 +1,12 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import java.util.ArrayList; import java.util.List; import java.util.Objects; import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.Row; 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 96% 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 77c92b7f94..19dd75cd3d 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,5 +1,6 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -8,7 +9,6 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.SqlClientHelper; 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 97% 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 1b8800fd26..2e1dae912b 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,5 +1,6 @@ -package io.quarkus.qe.vertx.sql.domain; +package io.quarkus.ts.vertx.sql.domain; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -7,7 +8,6 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import io.quarkus.qe.vertx.sql.services.DbPoolService; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.vertx.mutiny.sqlclient.Row; 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 98% 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 363b0c3ad5..80a7f391c6 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; 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 cfb22bfc83..c03da538f6 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 5462c77c67..23abc0d863 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,5 +1,8 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; +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 javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -11,9 +14,6 @@ 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.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 a47830bb4e..4c852dfe93 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,5 +1,8 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; +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 javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -11,9 +14,6 @@ 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.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 ec7c15edbf..2d8386c9ee 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,5 +1,7 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; +import io.quarkus.ts.vertx.sql.domain.Basket; +import io.quarkus.ts.vertx.sql.domain.Record; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -11,9 +13,7 @@ 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.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 3c28eafe12..79ecb05ea1 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 9fa137c7a7..c9a4ba8b5b 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,5 +1,10 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; +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 javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -16,11 +21,6 @@ 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.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 5c8e7abf95..b6ab39a112 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,5 +1,7 @@ -package io.quarkus.qe.vertx.sql.handlers; +package io.quarkus.ts.vertx.sql.handlers; +import io.quarkus.ts.vertx.sql.domain.Record; +import io.quarkus.ts.vertx.sql.services.DbPoolService; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; @@ -11,9 +13,7 @@ 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.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 a2e2644ebe..f79ad0353e 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 2c486f2994..fe1e23e874 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,8 +1,10 @@ -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 io.quarkus.ts.vertx.sql.domain.Airline; +import io.quarkus.ts.vertx.sql.domain.Basket; +import io.quarkus.ts.vertx.sql.domain.QueryFlightSearch; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -12,11 +14,8 @@ 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.ts.vertx.sql.domain.Flight; +import io.quarkus.ts.vertx.sql.domain.PricingRules; import io.quarkus.runtime.StartupEvent; import io.smallrye.mutiny.Uni; @@ -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 15339ebfd2..26f1d013e1 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 f9f007fa9d..b7e4f5bd41 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 ca9eb04204..9f6c2b6344 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 bface649a3..5a5928fe16 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 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 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.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 6d1fd1310d..9ef43fc290 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 d5a768cb38..2a38f62141 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 c51901f454..21fb7aae89 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 de4428a2f4..c4d36a9c61 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 7422964544..f48404e141 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 cba5b47467..28bb93a924 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 de8ae6ada3..9f425a022f 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 542287b201..84f66f1137 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; @@ -7,13 +7,13 @@ import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; import static org.junit.jupiter.api.Assertions.assertEquals; +import io.quarkus.ts.vertx.sql.domain.Basket; import java.util.Arrays; 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.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 284811ae9a..70d560eaee 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/quarkus-websockets/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/quarkus-websockets/src/main/java/io/quarkus/ts/Chat.java rename to websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Chat.java index 758769baa5..017d5ee968 100644 --- a/websockets/quarkus-websockets/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/quarkus-websockets/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/quarkus-websockets/src/main/java/io/quarkus/ts/Pusher.java rename to websockets/quarkus-websockets/src/main/java/io/quarkus/ts/websockets/producer/Pusher.java index 06abfdfdc6..91c3b76fea 100644 --- a/websockets/quarkus-websockets/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; 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 f08a3e4105..0000000000 --- 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/OpenShiftWebSocketsProducerIT.java b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/OpenShiftWebSocketsProducerIT.java new file mode 100644 index 0000000000..b0eeb22b42 --- /dev/null +++ b/websockets/quarkus-websockets/src/test/java/io/quarkus/ts/websockets/producer/OpenShiftWebSocketsProducerIT.java @@ -0,0 +1,7 @@ +package io.quarkus.ts.websockets.producer; + +import io.quarkus.test.scenarios.OpenShiftScenario; + +@OpenShiftScenario +public class OpenShiftWebSocketsProducerIT extends WebSocketsProducerIT { +} 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/WebSocketsProducerIT.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/WebSocketsProducerIT.java index 1b923dd03c..5febe1b75b 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/WebSocketsProducerIT.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 WebSocketsProducerIT { @QuarkusApplication static final RestService server = new RestService(); diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/Chat.java b/websockets/websockets-client/src/main/java/io/quarkus/websockets/client/Chat.java similarity index 98% rename from websockets/websockets-client/src/main/java/io/quarkus/ts/Chat.java rename to websockets/websockets-client/src/main/java/io/quarkus/websockets/client/Chat.java index 758769baa5..524644e56b 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/Chat.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/websockets/client/Chat.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.websockets.client; 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/websockets-client/src/main/java/io/quarkus/websockets/client/Pusher.java similarity index 96% rename from websockets/websockets-client/src/main/java/io/quarkus/ts/Pusher.java rename to websockets/websockets-client/src/main/java/io/quarkus/websockets/client/Pusher.java index 407ebd4b02..6929598a49 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/Pusher.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/websockets/client/Pusher.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.websockets.client; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/websockets/websockets-client/src/main/java/io/quarkus/ts/RemoteClient.java b/websockets/websockets-client/src/main/java/io/quarkus/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/websockets/client/RemoteClient.java index 5c4c09cfc2..e11a48ab0c 100644 --- a/websockets/websockets-client/src/main/java/io/quarkus/ts/RemoteClient.java +++ b/websockets/websockets-client/src/main/java/io/quarkus/websockets/client/RemoteClient.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.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 f32f0a2d92..0000000000 --- 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/websockets/client/OpenShiftWebSocketsClientIT.java b/websockets/websockets-client/src/test/java/io/quarkus/websockets/client/OpenShiftWebSocketsClientIT.java new file mode 100644 index 0000000000..b91789b1ee --- /dev/null +++ b/websockets/websockets-client/src/test/java/io/quarkus/websockets/client/OpenShiftWebSocketsClientIT.java @@ -0,0 +1,7 @@ +package io.quarkus.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/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/websockets/client/WebSocketsClientIT.java index 1f99f518e0..526fad4a2c 100644 --- a/websockets/websockets-client/src/test/java/io/quarkus/ts/ClientIT.java +++ b/websockets/websockets-client/src/test/java/io/quarkus/websockets/client/WebSocketsClientIT.java @@ -1,4 +1,4 @@ -package io.quarkus.ts; +package io.quarkus.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"))