diff --git a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceConsumer.java b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceConsumer.java index 96ac6bf34..3b7e944ff 100644 --- a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceConsumer.java +++ b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceConsumer.java @@ -20,15 +20,12 @@ public class PriceConsumer { public String getLastPrice() { try (JMSContext context = connectionFactory.createContext(Session.AUTO_ACKNOWLEDGE); JMSConsumer consumer = context.createConsumer(context.createQueue("prices"))) { - while (true) { - Message message = consumer.receive(); - if (message == null) { - // receive returns `null` if the JMSConsumer is closed - return ""; - } - - return message.getBody(String.class); + Message message = consumer.receive(); + if (message == null) { + // receive returns `null` if the JMSConsumer is closed + return ""; } + return message.getBody(String.class); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java index c10679828..c0c5349ee 100644 --- a/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java +++ b/examples/amq-tcp/src/main/java/io/quarkus/qe/tcp/PriceProducer.java @@ -11,6 +11,7 @@ import jakarta.jms.JMSContext; import jakarta.jms.Session; +import io.quarkus.logging.Log; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -41,7 +42,7 @@ public void run() { try (JMSContext context = connectionFactory.createContext(Session.AUTO_ACKNOWLEDGE)) { context.createProducer().send(context.createQueue("prices"), Integer.toString(random.nextInt(PRICES_MAX))); } catch (Exception e) { - e.printStackTrace(); + Log.error("Failed to send message to queue 'prices'", e); } } } diff --git a/examples/consul/src/test/java/io/quarkus/qe/BaseGreetingResourceIT.java b/examples/consul/src/test/java/io/quarkus/qe/BaseGreetingResourceIT.java index 4b2d0975f..b5e0e22ae 100644 --- a/examples/consul/src/test/java/io/quarkus/qe/BaseGreetingResourceIT.java +++ b/examples/consul/src/test/java/io/quarkus/qe/BaseGreetingResourceIT.java @@ -22,7 +22,7 @@ public abstract class BaseGreetingResourceIT { static ConsulService consul; @QuarkusApplication - static RestService app = new RestService().withProperty("quarkus.consul-config.agent.host-port", + static final RestService app = new RestService().withProperty("quarkus.consul-config.agent.host-port", () -> consul.getConsulEndpoint()); @Test diff --git a/examples/consul/src/test/java/io/quarkus/qe/BuildTimeGreetingResourceIT.java b/examples/consul/src/test/java/io/quarkus/qe/BuildTimeGreetingResourceIT.java index b12d14e3f..d58c85c54 100644 --- a/examples/consul/src/test/java/io/quarkus/qe/BuildTimeGreetingResourceIT.java +++ b/examples/consul/src/test/java/io/quarkus/qe/BuildTimeGreetingResourceIT.java @@ -13,7 +13,7 @@ public class BuildTimeGreetingResourceIT { @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.consul-config.enabled", "false") .withProperty("quarkus.http.root-path", "/root"); // property to force build app at test time. diff --git a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/AbstractMysqlReusableInstance.java b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/AbstractMysqlReusableInstance.java index 6d6a8836e..3a25bd538 100644 --- a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/AbstractMysqlReusableInstance.java +++ b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/AbstractMysqlReusableInstance.java @@ -15,7 +15,7 @@ public abstract class AbstractMysqlReusableInstance extends AbstractSqlDatabaseI **/ @Container(image = "${mysql.image}", port = 3306, expectedLog = "port: 3306 MySQL Community Server") - public static MySqlService database = new MySqlService(); + public static final MySqlService database = new MySqlService(); static Integer containerPort; @@ -33,6 +33,5 @@ private boolean isFirstInstance() { private void setContainerPort() { containerPort = database.getURI().getPort(); - ; } } diff --git a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDatabaseIT.java b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDatabaseIT.java index 06130fc08..790f68207 100644 --- a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDatabaseIT.java +++ b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDatabaseIT.java @@ -18,7 +18,7 @@ public class DevModeMySqlDatabaseIT extends AbstractSqlDatabaseIT { static final int MYSQL_PORT = 3306; @Container(image = "${mysql.image}", port = MYSQL_PORT, expectedLog = "ready for connections") - static DefaultService database = new DefaultService() + static final DefaultService database = new DefaultService() .withProperty("MYSQL_ROOT_USER", MYSQL_USER) .withProperty("MYSQL_ROOT_PASSWORD", MYSQL_PASSWORD) .withProperty("MYSQL_USER", MYSQL_USER) @@ -26,7 +26,7 @@ public class DevModeMySqlDatabaseIT extends AbstractSqlDatabaseIT { .withProperty("MYSQL_DATABASE", MYSQL_DATABASE); @DevModeQuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.hibernate-orm.sql-load-script", "import-in-test.sql") .withProperty("quarkus.datasource.username", MYSQL_USER) .withProperty("quarkus.datasource.password", MYSQL_PASSWORD) diff --git a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDevServicesDatabaseIT.java b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDevServicesDatabaseIT.java index d4f8d61ac..32b03aac2 100644 --- a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDevServicesDatabaseIT.java +++ b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/DevModeMySqlDevServicesDatabaseIT.java @@ -13,7 +13,7 @@ public class DevModeMySqlDevServicesDatabaseIT extends AbstractSqlDatabaseIT { @DevModeQuarkusApplication - static RestService app = new RestService(); + static final RestService app = new RestService(); @Override protected RestService getApp() { diff --git a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlDatabaseIT.java b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlDatabaseIT.java index 1ad2813a8..dac013a0c 100644 --- a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlDatabaseIT.java +++ b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlDatabaseIT.java @@ -10,7 +10,7 @@ public class MySqlDatabaseIT extends AbstractMysqlReusableInstance { @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlReusableDatabaseIT.java b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlReusableDatabaseIT.java index d3da27d7d..31311fb21 100644 --- a/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlReusableDatabaseIT.java +++ b/examples/database-mysql/src/test/java/io/quarkus/qe/database/mysql/MySqlReusableDatabaseIT.java @@ -10,7 +10,7 @@ public class MySqlReusableDatabaseIT extends AbstractMysqlReusableInstance { @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDatabaseIT.java b/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDatabaseIT.java index a5f76bd03..fda5a0f50 100644 --- a/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDatabaseIT.java +++ b/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDatabaseIT.java @@ -18,14 +18,14 @@ public class DevModeOracleDatabaseIT extends AbstractSqlDatabaseIT { static final int ORACLE_PORT = 1521; @Container(image = "${oracle.image}", port = ORACLE_PORT, expectedLog = "DATABASE IS READY TO USE!") - static DefaultService database = new DefaultService() + static final DefaultService database = new DefaultService() .withProperty("APP_USER", ORACLE_USER) .withProperty("APP_USER_PASSWORD", ORACLE_PASSWORD) .withProperty("ORACLE_PASSWORD", ORACLE_PASSWORD) .withProperty("ORACLE_DATABASE", ORACLE_DATABASE); @DevModeQuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.hibernate-orm.sql-load-script", "import-in-test.sql") .withProperty("quarkus.datasource.username", ORACLE_USER) .withProperty("quarkus.datasource.password", ORACLE_PASSWORD) diff --git a/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDevServiceDatabaseIT.java b/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDevServiceDatabaseIT.java index 31be0d29a..89214be43 100644 --- a/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDevServiceDatabaseIT.java +++ b/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/DevModeOracleDevServiceDatabaseIT.java @@ -13,7 +13,7 @@ public class DevModeOracleDevServiceDatabaseIT extends AbstractSqlDatabaseIT { @DevModeQuarkusApplication - static RestService app = new RestService(); + static final RestService app = new RestService(); @Override protected RestService getApp() { diff --git a/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/OracleDatabaseIT.java b/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/OracleDatabaseIT.java index bc9410c46..f0d020a8b 100644 --- a/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/OracleDatabaseIT.java +++ b/examples/database-oracle/src/test/java/io/quarkus/qe/database/oracle/OracleDatabaseIT.java @@ -12,10 +12,10 @@ public class OracleDatabaseIT extends AbstractSqlDatabaseIT { @Container(image = "${oracle.image}", port = ORACLE_PORT, expectedLog = "DATABASE IS READY TO USE!") - static OracleService database = new OracleService(); + static final OracleService database = new OracleService(); @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/DuplicatedPostgresqlDatabaseIT.java b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/DuplicatedPostgresqlDatabaseIT.java index c5562f4c7..01668ca9b 100644 --- a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/DuplicatedPostgresqlDatabaseIT.java +++ b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/DuplicatedPostgresqlDatabaseIT.java @@ -15,7 +15,7 @@ public class DuplicatedPostgresqlDatabaseIT { private static final int POSTGRESQL_PORT = 5432; @Container(image = "${postgresql.image}", port = POSTGRESQL_PORT, expectedLog = "is ready") - static PostgresqlService database = new PostgresqlService(); + static final PostgresqlService database = new PostgresqlService(); @QuarkusApplication static RestService app = new RestService() diff --git a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/KubernetesPostgresqlIT.java b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/KubernetesPostgresqlIT.java index e5e9cdc0c..ef44fc648 100644 --- a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/KubernetesPostgresqlIT.java +++ b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/KubernetesPostgresqlIT.java @@ -17,11 +17,11 @@ public class KubernetesPostgresqlIT extends AbstractSqlDatabaseIT { private static final int POSTGRESQL_PORT = 5432; @Container(image = "${postgresql.image}", port = POSTGRESQL_PORT, expectedLog = "is ready") - static PostgresqlService database = new PostgresqlService() + static final PostgresqlService database = new PostgresqlService() .withProperty("PGDATA", "/tmp/psql"); @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/OpenShiftPostgresqlIT.java b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/OpenShiftPostgresqlIT.java index 0d73dc2dc..13a3f3b82 100644 --- a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/OpenShiftPostgresqlIT.java +++ b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/OpenShiftPostgresqlIT.java @@ -12,11 +12,11 @@ public class OpenShiftPostgresqlIT extends AbstractSqlDatabaseIT { private static final int POSTGRESQL_PORT = 5432; @Container(image = "${postgresql.image}", port = POSTGRESQL_PORT, expectedLog = "is ready") - static PostgresqlService database = new PostgresqlService() + static final PostgresqlService database = new PostgresqlService() .withProperty("PGDATA", "/tmp/psql"); @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/PostgresqlDatabaseIT.java b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/PostgresqlDatabaseIT.java index 7a3b42efb..d73039969 100644 --- a/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/PostgresqlDatabaseIT.java +++ b/examples/database-postgresql/src/test/java/io/quarkus/qe/database/postgresql/PostgresqlDatabaseIT.java @@ -12,10 +12,10 @@ public class PostgresqlDatabaseIT extends AbstractSqlDatabaseIT { private static final int POSTGRESQL_PORT = 5432; @Container(image = "${postgresql.image}", port = POSTGRESQL_PORT, expectedLog = "is ready") - static PostgresqlService database = new PostgresqlService(); + static final PostgresqlService database = new PostgresqlService(); @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.datasource.username", database.getUser()) .withProperty("quarkus.datasource.password", database.getPassword()) .withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl); diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java index 6ca391a96..97ff861b9 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/QuickstartUsingUsingUberJarIT.java @@ -19,7 +19,7 @@ public class QuickstartUsingUsingUberJarIT { static final RestService app = new RestService(); @Test - public void test() throws InterruptedException { + public void test() { app.given() .get("/hello") .then() diff --git a/examples/external-applications/src/test/java/io/quarkus/qe/TodoDemoIT.java b/examples/external-applications/src/test/java/io/quarkus/qe/TodoDemoIT.java index 399353ea4..a6d831652 100644 --- a/examples/external-applications/src/test/java/io/quarkus/qe/TodoDemoIT.java +++ b/examples/external-applications/src/test/java/io/quarkus/qe/TodoDemoIT.java @@ -26,7 +26,7 @@ public class TodoDemoIT { private static final String NO_SUFFIX = "-Dquarkus.package.jar.add-runner-suffix=false"; @Container(image = "${postgresql.image}", port = 5432, expectedLog = "is ready") - static PostgresqlService database = new PostgresqlService() + static final PostgresqlService database = new PostgresqlService() // store data in /tmp/psql as in OpenShift we don't have permissions to /var/lib/postgresql/data .withProperty("PGDATA", "/tmp/psql"); diff --git a/examples/funqy-knative-events/src/test/java/io/quarkus/qe/funqy/knativeevents/OpenShiftUsingExtensionAndServerlessFunqyKnEventsIT.java b/examples/funqy-knative-events/src/test/java/io/quarkus/qe/funqy/knativeevents/OpenShiftUsingExtensionAndServerlessFunqyKnEventsIT.java index bcda3cc8b..9418511e7 100644 --- a/examples/funqy-knative-events/src/test/java/io/quarkus/qe/funqy/knativeevents/OpenShiftUsingExtensionAndServerlessFunqyKnEventsIT.java +++ b/examples/funqy-knative-events/src/test/java/io/quarkus/qe/funqy/knativeevents/OpenShiftUsingExtensionAndServerlessFunqyKnEventsIT.java @@ -22,7 +22,7 @@ public class OpenShiftUsingExtensionAndServerlessFunqyKnEventsIT { "Start::defaultChain::configChain::annotatedChain::lastChainLink"); @QuarkusApplication - static FunqyKnativeEventsService service = new OpenShiftExtensionFunqyKnativeEventsService() + static final FunqyKnativeEventsService service = new OpenShiftExtensionFunqyKnativeEventsService() .withDefaultBroker() .withTrigger().name("annotatedchain").defaultBroker().filterCloudEventType("annotated").endTrigger() .withTrigger().name("configChain").defaultBroker().filterCloudEventType("defaultChain.output").endTrigger() diff --git a/examples/greetings/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java b/examples/greetings/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java index c177c2579..3002f5227 100644 --- a/examples/greetings/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java +++ b/examples/greetings/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java @@ -23,7 +23,7 @@ public class DevModeGreetingResourceIT { static final String HELLO_IN_SPANISH = "Hola"; @DevModeQuarkusApplication - static DevModeQuarkusService app = new DevModeQuarkusService(); + static final DevModeQuarkusService app = new DevModeQuarkusService(); @Test @Order(1) diff --git a/examples/greetings/src/test/java/io/quarkus/qe/GreetingResourceUsingRuntimePropertiesIT.java b/examples/greetings/src/test/java/io/quarkus/qe/GreetingResourceUsingRuntimePropertiesIT.java index 139c0d215..22bada0f6 100644 --- a/examples/greetings/src/test/java/io/quarkus/qe/GreetingResourceUsingRuntimePropertiesIT.java +++ b/examples/greetings/src/test/java/io/quarkus/qe/GreetingResourceUsingRuntimePropertiesIT.java @@ -17,9 +17,9 @@ public class GreetingResourceUsingRuntimePropertiesIT { static final String MANUEL_NAME = "manuel"; @QuarkusApplication - static RestService joseApp = new RestService().withProperty(ValidateCustomProperty.CUSTOM_PROPERTY, JOSE_NAME); + static final RestService joseApp = new RestService().withProperty(ValidateCustomProperty.CUSTOM_PROPERTY, JOSE_NAME); @QuarkusApplication - static RestService manuelApp = new RestService().withProperty(ValidateCustomProperty.CUSTOM_PROPERTY, MANUEL_NAME); + static final RestService manuelApp = new RestService().withProperty(ValidateCustomProperty.CUSTOM_PROPERTY, MANUEL_NAME); @Test public void shouldSayJose() { diff --git a/examples/greetings/src/test/java/io/quarkus/qe/ReactiveGreetingResourceIT.java b/examples/greetings/src/test/java/io/quarkus/qe/ReactiveGreetingResourceIT.java index d8161059e..521975704 100644 --- a/examples/greetings/src/test/java/io/quarkus/qe/ReactiveGreetingResourceIT.java +++ b/examples/greetings/src/test/java/io/quarkus/qe/ReactiveGreetingResourceIT.java @@ -9,8 +9,6 @@ import io.quarkus.test.bootstrap.RestService; import io.quarkus.test.scenarios.QuarkusScenario; import io.quarkus.test.services.QuarkusApplication; -import io.vertx.mutiny.ext.web.client.HttpResponse; -import io.vertx.mutiny.ext.web.client.predicate.ResponsePredicate; @QuarkusScenario public class ReactiveGreetingResourceIT { @@ -21,9 +19,11 @@ public class ReactiveGreetingResourceIT { @Test public void shouldSayDefaultGreeting() { String response = app.mutiny().get("/reactive-greeting") - .expect(ResponsePredicate.status(HttpURLConnection.HTTP_OK)) .send() - .map(HttpResponse::bodyAsString) + .map(resp -> { + assertEquals(HttpURLConnection.HTTP_OK, resp.statusCode(), "Expected HTTP OK status"); + return resp.bodyAsString(); + }) .await().indefinitely(); assertEquals("Hello, I'm victor", response); diff --git a/examples/greetings/src/test/java/io/quarkus/qe/RemoteDevModeGreetingResourceIT.java b/examples/greetings/src/test/java/io/quarkus/qe/RemoteDevModeGreetingResourceIT.java index 277263b26..f339fb3a5 100644 --- a/examples/greetings/src/test/java/io/quarkus/qe/RemoteDevModeGreetingResourceIT.java +++ b/examples/greetings/src/test/java/io/quarkus/qe/RemoteDevModeGreetingResourceIT.java @@ -19,7 +19,7 @@ public class RemoteDevModeGreetingResourceIT { static final String HELLO_IN_SPANISH = "Hola"; @RemoteDevModeQuarkusApplication - static DevModeQuarkusService app = new DevModeQuarkusService(); + static final DevModeQuarkusService app = new DevModeQuarkusService(); @Test public void shouldUpdateResourcesAndSources() { diff --git a/examples/https/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java b/examples/https/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java index 85f70ddea..33e5f6fb1 100644 --- a/examples/https/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java +++ b/examples/https/src/test/java/io/quarkus/qe/DevModeGreetingResourceIT.java @@ -11,7 +11,7 @@ @QuarkusScenario public class DevModeGreetingResourceIT { @DevModeQuarkusApplication(ssl = true, certificates = @Certificate(configureKeystore = true, configureHttpServer = true, useTlsRegistry = false)) - static DevModeQuarkusService app = new DevModeQuarkusService(); + static final DevModeQuarkusService app = new DevModeQuarkusService(); @Test public void shouldOpenDevUi() { diff --git a/examples/https/src/test/java/io/quarkus/qe/TlsRegistryCertificateReloadingIT.java b/examples/https/src/test/java/io/quarkus/qe/TlsRegistryCertificateReloadingIT.java index be4042018..1a756238c 100644 --- a/examples/https/src/test/java/io/quarkus/qe/TlsRegistryCertificateReloadingIT.java +++ b/examples/https/src/test/java/io/quarkus/qe/TlsRegistryCertificateReloadingIT.java @@ -23,7 +23,7 @@ public class TlsRegistryCertificateReloadingIT { @QuarkusApplication(ssl = true, certificates = @Certificate(clientCertificates = { @Certificate.ClientCertificate(cnAttribute = CLIENT_CN_1) }, configureTruststore = true, configureHttpServer = true, configureKeystore = true, prefix = CERT_PREFIX)) - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.http.ssl.client-auth", "request") .withProperty("quarkus.http.insecure-requests", "DISABLED") .withProperty("quarkus.tls.reload-period", "2s"); diff --git a/examples/infinispan/src/main/java/io/quarkus/qe/books/BookResource.java b/examples/infinispan/src/main/java/io/quarkus/qe/books/BookResource.java index 724953908..3fbaf209a 100644 --- a/examples/infinispan/src/main/java/io/quarkus/qe/books/BookResource.java +++ b/examples/infinispan/src/main/java/io/quarkus/qe/books/BookResource.java @@ -25,8 +25,7 @@ public class BookResource { @Path("/{title}") @Produces(MediaType.APPLICATION_JSON) public Book getBook(@PathParam("title") String title) { - Book found = cache.get(title); - return found; + return cache.get(title); } @POST diff --git a/examples/jaeger/src/test/java/io/quarkus/qe/ClientResourceIT.java b/examples/jaeger/src/test/java/io/quarkus/qe/ClientResourceIT.java index 6860d6222..f65f3457b 100644 --- a/examples/jaeger/src/test/java/io/quarkus/qe/ClientResourceIT.java +++ b/examples/jaeger/src/test/java/io/quarkus/qe/ClientResourceIT.java @@ -25,10 +25,10 @@ public class ClientResourceIT { private static final String OPERATION = "GET " + CLIENT_ENDPOINT; @JaegerContainer() - static JaegerService jaeger = new JaegerService(); + static final JaegerService jaeger = new JaegerService(); @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.otel.exporter.otlp.traces.endpoint", jaeger::getCollectorUrl); @Test diff --git a/examples/jaeger/src/test/java/io/quarkus/qe/OpenTelemetryJaegerTlsIT.java b/examples/jaeger/src/test/java/io/quarkus/qe/OpenTelemetryJaegerTlsIT.java index e7360f42b..98ae62b0e 100644 --- a/examples/jaeger/src/test/java/io/quarkus/qe/OpenTelemetryJaegerTlsIT.java +++ b/examples/jaeger/src/test/java/io/quarkus/qe/OpenTelemetryJaegerTlsIT.java @@ -30,10 +30,10 @@ public class OpenTelemetryJaegerTlsIT { private static final String OPERATION = "GET " + CLIENT_ENDPOINT; @JaegerContainer(tls = true) - static JaegerService jaeger = new JaegerService(); + static final JaegerService jaeger = new JaegerService(); @QuarkusApplication - static RestService app = new RestService() + static final RestService app = new RestService() .withProperty("quarkus.otel.exporter.otlp.traces.tls-configuration-name", "jaeger") .withProperty("quarkus.otel.exporter.otlp.traces.endpoint", () -> jaeger.getCollectorUrl(Protocol.HTTPS)) .withProperty("quarkus.tls.jaeger.key-store.pem.0.cert", () -> getClientCert().certPath()) diff --git a/examples/kafka-streams/src/main/java/io/quarkus/qe/kafka/streams/WindowedLoginDeniedStream.java b/examples/kafka-streams/src/main/java/io/quarkus/qe/kafka/streams/WindowedLoginDeniedStream.java index 6c52c9fe3..7c3018ee9 100644 --- a/examples/kafka-streams/src/main/java/io/quarkus/qe/kafka/streams/WindowedLoginDeniedStream.java +++ b/examples/kafka-streams/src/main/java/io/quarkus/qe/kafka/streams/WindowedLoginDeniedStream.java @@ -45,7 +45,7 @@ public Topology buildTopology() { builder.stream(LOGIN_ATTEMPTS_TOPIC, Consumed.with(Serdes.String(), loginAttemptSerde)) .groupByKey() - .windowedBy(TimeWindows.of(Duration.ofSeconds(windowsLoginSec))) + .windowedBy(TimeWindows.ofSizeWithNoGrace(Duration.ofSeconds(windowsLoginSec))) .aggregate(LoginAggregation::new, (id, value, aggregation) -> aggregation.updateFrom(value), Materialized.> as(LOGIN_AGGREGATION_STORE) diff --git a/examples/keycloak/src/test/java/io/quarkus/qe/BaseSecurityResourceIT.java b/examples/keycloak/src/test/java/io/quarkus/qe/BaseSecurityResourceIT.java index f7eda0542..263cc9f89 100644 --- a/examples/keycloak/src/test/java/io/quarkus/qe/BaseSecurityResourceIT.java +++ b/examples/keycloak/src/test/java/io/quarkus/qe/BaseSecurityResourceIT.java @@ -20,7 +20,7 @@ public abstract class BaseSecurityResourceIT { static final String NORMAL_USER = "test-normal-user"; @KeycloakContainer(command = { "start-dev", "--import-realm" }) - static KeycloakService keycloak = new KeycloakService(DEFAULT_REALM_FILE, DEFAULT_REALM, DEFAULT_REALM_BASE_PATH); + static final KeycloakService keycloak = new KeycloakService(DEFAULT_REALM_FILE, DEFAULT_REALM, DEFAULT_REALM_BASE_PATH); private AuthzClient authzClient; diff --git a/examples/keycloak/src/test/java/io/quarkus/qe/DevModeSecurityResourceIT.java b/examples/keycloak/src/test/java/io/quarkus/qe/DevModeSecurityResourceIT.java index 4833ecab0..b950d2e7c 100644 --- a/examples/keycloak/src/test/java/io/quarkus/qe/DevModeSecurityResourceIT.java +++ b/examples/keycloak/src/test/java/io/quarkus/qe/DevModeSecurityResourceIT.java @@ -8,7 +8,7 @@ public class DevModeSecurityResourceIT extends BaseSecurityResourceIT { @DevModeQuarkusApplication static final RestService app = new RestService() - .withProperty("quarkus.oidc.auth-server-url", () -> keycloak.getRealmUrl()) + .withProperty("quarkus.oidc.auth-server-url", keycloak::getRealmUrl) .withProperty("quarkus.oidc.client-id", CLIENT_ID_DEFAULT) .withProperty("quarkus.oidc.credentials.secret", CLIENT_SECRET_DEFAULT); diff --git a/examples/keycloak/src/test/java/io/quarkus/qe/SecurityResourceIT.java b/examples/keycloak/src/test/java/io/quarkus/qe/SecurityResourceIT.java index fdb8a7f93..3b6e6e8fa 100644 --- a/examples/keycloak/src/test/java/io/quarkus/qe/SecurityResourceIT.java +++ b/examples/keycloak/src/test/java/io/quarkus/qe/SecurityResourceIT.java @@ -9,7 +9,7 @@ public class SecurityResourceIT extends BaseSecurityResourceIT { @QuarkusApplication static final RestService app = new RestService() - .withProperty("quarkus.oidc.auth-server-url", () -> keycloak.getRealmUrl()) + .withProperty("quarkus.oidc.auth-server-url", keycloak::getRealmUrl) .withProperty("quarkus.oidc.client-id", CLIENT_ID_DEFAULT) .withProperty("quarkus.oidc.credentials.secret", CLIENT_SECRET_DEFAULT); diff --git a/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesPingPongResourceIT.java b/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesPingPongResourceIT.java index 147662e49..c9ca31c06 100644 --- a/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesPingPongResourceIT.java +++ b/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesPingPongResourceIT.java @@ -18,8 +18,8 @@ public class ComputedValuesPingPongResourceIT { @Test public void shouldGetComputedValues() { assertFalse(pingpong.getProperty("property.not.exists").isPresent()); - assertEquals("A", pingpong.getProperty("property.without.profile").get()); - assertEquals("B", pingpong.getProperty("property.with.profile").get()); + assertEquals("A", pingpong.getProperty("property.without.profile").orElseThrow()); + assertEquals("B", pingpong.getProperty("property.with.profile").orElseThrow()); } } diff --git a/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesUsingCustomPropertiesPingPongResourceIT.java b/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesUsingCustomPropertiesPingPongResourceIT.java index 957c0d085..136d201bb 100644 --- a/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesUsingCustomPropertiesPingPongResourceIT.java +++ b/examples/pingpong/src/test/java/io/quarkus/qe/ComputedValuesUsingCustomPropertiesPingPongResourceIT.java @@ -16,7 +16,7 @@ public class ComputedValuesUsingCustomPropertiesPingPongResourceIT { @Test public void shouldGetComputedValuesFromCustomPropertiesFile() { - assertEquals("C", pingpong.getProperty("property.exists.only.in.custom.properties").get()); + assertEquals("C", pingpong.getProperty("property.exists.only.in.custom.properties").orElseThrow()); } } diff --git a/examples/pingpong/src/test/java/io/quarkus/qe/DevModeComputedValuesUsingCustomPropertiesPingPongResourceIT.java b/examples/pingpong/src/test/java/io/quarkus/qe/DevModeComputedValuesUsingCustomPropertiesPingPongResourceIT.java index a1473d0fc..b748562bb 100644 --- a/examples/pingpong/src/test/java/io/quarkus/qe/DevModeComputedValuesUsingCustomPropertiesPingPongResourceIT.java +++ b/examples/pingpong/src/test/java/io/quarkus/qe/DevModeComputedValuesUsingCustomPropertiesPingPongResourceIT.java @@ -16,7 +16,7 @@ public class DevModeComputedValuesUsingCustomPropertiesPingPongResourceIT { @Test public void shouldGetComputedValuesFromCustomPropertiesFile() { - assertEquals("C", pingpong.getProperty("property.exists.only.in.custom.properties").get()); + assertEquals("C", pingpong.getProperty("property.exists.only.in.custom.properties").orElseThrow()); } } diff --git a/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/QuarkusCliClient.java b/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/QuarkusCliClient.java index d90058210..0fb10f65a 100644 --- a/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/QuarkusCliClient.java +++ b/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/QuarkusCliClient.java @@ -12,8 +12,6 @@ import java.util.Map; import java.util.Objects; import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; import io.quarkus.test.configuration.PropertyLookup; import io.quarkus.test.logging.FileLoggingHandler; @@ -53,7 +51,7 @@ public Result buildApplicationOnJvm(Path serviceFolder, String... extraArgs) { List args = new ArrayList<>(); args.add(BUILD); args.addAll(Arrays.asList(extraArgs)); - return runCliAndWait(serviceFolder, args.toArray(new String[args.size()])); + return runCliAndWait(serviceFolder, args.toArray(new String[0])); } public Result buildApplicationOnNative(Path serviceFolder, String... extraArgs) { @@ -61,7 +59,7 @@ public Result buildApplicationOnNative(Path serviceFolder, String... extraArgs) args.add(BUILD); args.add("--native"); args.addAll(Arrays.asList(extraArgs)); - return runCliAndWait(serviceFolder, args.toArray(new String[args.size()])); + return runCliAndWait(serviceFolder, args.toArray(new String[0])); } public Process runOnDev(Path servicePath, File logOutput, Map arguments) { @@ -70,7 +68,7 @@ public Process runOnDev(Path servicePath, File logOutput, Map ar cmd.addAll(arguments.entrySet().stream() .map(e -> "-D" + e.getKey() + "=" + e.getValue()) .toList()); - return runCli(servicePath, logOutput, cmd.toArray(new String[cmd.size()])); + return runCli(servicePath, logOutput, cmd.toArray(new String[0])); } public QuarkusCliRestService createApplicationAt(String name, String targetFolderName) { @@ -108,14 +106,14 @@ public QuarkusCliRestService createApplication(String name, CreateApplicationReq } // Extensions if (request.extensions != null && request.extensions.length > 0) { - args.add("-x=" + Stream.of(request.extensions).collect(Collectors.joining(","))); + args.add("-x=" + String.join(",", request.extensions)); } // Extra args if (request.extraArgs != null && request.extraArgs.length > 0) { args.addAll(Arrays.asList(request.extraArgs)); } - Result result = runCliAndWait(serviceContext.getServiceFolder().getParent(), args.toArray(new String[args.size()])); + Result result = runCliAndWait(serviceContext.getServiceFolder().getParent(), args.toArray(new String[0])); assertTrue(result.isSuccessful(), "The application was not created. Output: " + result.getOutput()); return service; @@ -193,7 +191,7 @@ public QuarkusCliDefaultService createExtension(String name, CreateExtensionRequ args.addAll(Arrays.asList(request.extraArgs)); } - Result result = runCliAndWait(serviceContext.getServiceFolder().getParent(), args.toArray(new String[args.size()])); + Result result = runCliAndWait(serviceContext.getServiceFolder().getParent(), args.toArray(new String[0])); assertTrue(result.isSuccessful(), "The extension was not created. Output: " + result.getOutput()); return service; diff --git a/quarkus-test-containers/src/main/java/io/quarkus/test/services/containers/DockerContainerManagedResource.java b/quarkus-test-containers/src/main/java/io/quarkus/test/services/containers/DockerContainerManagedResource.java index 735cdd0ab..3c56173a8 100644 --- a/quarkus-test-containers/src/main/java/io/quarkus/test/services/containers/DockerContainerManagedResource.java +++ b/quarkus-test-containers/src/main/java/io/quarkus/test/services/containers/DockerContainerManagedResource.java @@ -160,13 +160,14 @@ private Map resolveProperties() { return properties; } - private void addFileToContainer(String filePath) { - if (Files.exists(Path.of(TARGET, filePath))) { + private void addFileToContainer(String path) { + Path filePath = Path.of(TARGET, path); + if (Files.exists(filePath)) { // Mount file if it's a file - innerContainer.withCopyFileToContainer(MountableFile.forHostPath(Path.of(TARGET, filePath)), filePath); + innerContainer.withCopyFileToContainer(MountableFile.forHostPath(filePath), path); } else { // then file is in the classpath - innerContainer.withClasspathResourceMapping(filePath, filePath, BindMode.READ_ONLY); + innerContainer.withClasspathResourceMapping(path, path, BindMode.READ_ONLY); } } diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/debug/SureFireCommunicationHelper.java b/quarkus-test-core/src/main/java/io/quarkus/test/debug/SureFireCommunicationHelper.java index 177dc90e3..449dee9dd 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/debug/SureFireCommunicationHelper.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/debug/SureFireCommunicationHelper.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.stream.Collectors; public final class SureFireCommunicationHelper { @@ -56,7 +55,7 @@ private static Path findExitTmpDir() { var exitTmpDirs = tmpFiles .filter(Files::isDirectory) .filter(SureFireCommunicationHelper::isExitTmpDir) - .collect(Collectors.toList()); + .toList(); if (exitTmpDirs.isEmpty()) { throw new IllegalStateException("Exit directory is missing"); } diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/security/certificate/InterchangeableCertificate.java b/quarkus-test-core/src/main/java/io/quarkus/test/security/certificate/InterchangeableCertificate.java index 39ea0f232..7f5e82103 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/security/certificate/InterchangeableCertificate.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/security/certificate/InterchangeableCertificate.java @@ -5,7 +5,7 @@ public final class InterchangeableCertificate implements Certificate.PemCertificate { - private volatile CertificateOptions certRequestOptions; + private final CertificateOptions certRequestOptions; private volatile Certificate.PemCertificate delegate; private InterchangeableCertificate(PemCertificate delegate, CertificateOptions certRequestOptions) { diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/utils/AwaitilityUtils.java b/quarkus-test-core/src/main/java/io/quarkus/test/utils/AwaitilityUtils.java index 802a19405..e88d898fa 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/utils/AwaitilityUtils.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/utils/AwaitilityUtils.java @@ -92,7 +92,7 @@ public static T untilIsNotNull(Supplier supplier) { */ @SuppressWarnings("unchecked") public static T untilIsNotNull(Supplier supplier, AwaitilitySettings settings) { - return until(supplier, (Matcher) Matchers. notNullValue(), settings); + return until(supplier, (Matcher) Matchers.notNullValue(), settings); } /** diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/utils/ClassPathUtils.java b/quarkus-test-core/src/main/java/io/quarkus/test/utils/ClassPathUtils.java index 7f9aceb32..e118818b8 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/utils/ClassPathUtils.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/utils/ClassPathUtils.java @@ -44,7 +44,7 @@ public static Class[] findAllClassesFromSource() { fail("Can't load source classes location. Caused by " + ex.getMessage()); } - return classes.toArray(new Class[classes.size()]); + return classes.toArray(new Class[0]); } private static String normalizeClassName(String path) { diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/utils/PropertiesUtils.java b/quarkus-test-core/src/main/java/io/quarkus/test/utils/PropertiesUtils.java index d86751afd..facad2bed 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/utils/PropertiesUtils.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/utils/PropertiesUtils.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.fail; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -24,7 +25,7 @@ public final class PropertiesUtils { public static final String RESOURCE_WITH_DESTINATION_PREFIX_MATCHER = ".*" + RESOURCE_WITH_DESTINATION_SPLIT_CHAR + ".*"; public static final String SECRET_PREFIX = "secret::/"; public static final Path TARGET = Path.of("target"); - public static final String SLASH = System.getProperty("file.separator"); + public static final String SLASH = File.separator; private static final String AUTOGENERATED_COMMENT = "# This properties file has been auto generated " + "by Quarkus QE Test Framework"; diff --git a/quarkus-test-core/src/main/java/io/quarkus/test/utils/ReflectionUtils.java b/quarkus-test-core/src/main/java/io/quarkus/test/utils/ReflectionUtils.java index d5a93fae1..371c1ac55 100644 --- a/quarkus-test-core/src/main/java/io/quarkus/test/utils/ReflectionUtils.java +++ b/quarkus-test-core/src/main/java/io/quarkus/test/utils/ReflectionUtils.java @@ -17,6 +17,7 @@ private ReflectionUtils() { } + @SuppressWarnings("unchecked") public static T getStaticFieldValue(Field field) { try { field.setAccessible(true); @@ -53,6 +54,7 @@ public static List findAllFields(Class clazz) { return fields; } + @SuppressWarnings("unchecked") public static T createInstance(Class clazz, Object... args) { for (Constructor constructor : clazz.getDeclaredConstructors()) { if (constructor.getParameterCount() == args.length) { diff --git a/quarkus-test-images/src/main/java/io/quarkus/test/utils/DockerUtils.java b/quarkus-test-images/src/main/java/io/quarkus/test/utils/DockerUtils.java index a64ffbaba..444f901fb 100644 --- a/quarkus-test-images/src/main/java/io/quarkus/test/utils/DockerUtils.java +++ b/quarkus-test-images/src/main/java/io/quarkus/test/utils/DockerUtils.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.fail; import java.nio.file.Path; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -121,7 +121,8 @@ public static void pullImageById(String imageId) { * @param imageId docker image ID. */ public static void stopContainersByImage(String imageId) { - List containers = dockerClient().listContainersCmd().withAncestorFilter(Arrays.asList(imageId)).exec(); + List containers = dockerClient().listContainersCmd() + .withAncestorFilter(Collections.singletonList(imageId)).exec(); for (Container container : containers) { dockerClient().stopContainerCmd(container.getId()).exec(); } @@ -183,7 +184,7 @@ private static void buildService(ServiceContext service, Path dockerFile) { try { new Command(DOCKER, "build", "-f", dockerFile.toString(), "-t", getUniqueName(service), ".").runAndWait(); } catch (Exception e) { - fail("Failed to build image " + service.getServiceFolder().toAbsolutePath().toString() + " . Caused by " + fail("Failed to build image " + service.getServiceFolder().toAbsolutePath() + " . Caused by " + e.getMessage()); } } diff --git a/quarkus-test-knative-events/root/src/main/java/io/quarkus/test/services/knative/eventing/FunqyKnativeEventsService.java b/quarkus-test-knative-events/root/src/main/java/io/quarkus/test/services/knative/eventing/FunqyKnativeEventsService.java index 891bef674..43568e1fb 100644 --- a/quarkus-test-knative-events/root/src/main/java/io/quarkus/test/services/knative/eventing/FunqyKnativeEventsService.java +++ b/quarkus-test-knative-events/root/src/main/java/io/quarkus/test/services/knative/eventing/FunqyKnativeEventsService.java @@ -296,7 +296,7 @@ private ForwardResponseValidator validate(Response response) { throw new IllegalStateException("Cluster endpoint is missing. Please expose Funqy function 'clusterEntrypoint'" + " that forwards messages to the broker."); } - return new ForwardResponseValidator() { + return new ForwardResponseValidator<>() { @Override public ForwardResponseValidator assertBody(Matcher matcher) { assertTrue(matcher.matches(response.as(ForwardResponseDTO.class).getResponse())); diff --git a/quarkus-test-knative-events/spi/src/main/java/io/quarkus/test/services/knative/eventing/spi/CompoundResponse.java b/quarkus-test-knative-events/spi/src/main/java/io/quarkus/test/services/knative/eventing/spi/CompoundResponse.java index 937983379..aa6c191c3 100644 --- a/quarkus-test-knative-events/spi/src/main/java/io/quarkus/test/services/knative/eventing/spi/CompoundResponse.java +++ b/quarkus-test-knative-events/spi/src/main/java/io/quarkus/test/services/knative/eventing/spi/CompoundResponse.java @@ -31,7 +31,7 @@ public final CompoundResponse waitForResponses() { } public final ForwardResponseDTO join() { - return new ForwardResponseDTO(getJoinedResponse()); + return new ForwardResponseDTO<>(getJoinedResponse()); } protected abstract void addResponse(T response); diff --git a/quarkus-test-kubernetes/src/main/java/io/quarkus/test/bootstrap/inject/KubectlClient.java b/quarkus-test-kubernetes/src/main/java/io/quarkus/test/bootstrap/inject/KubectlClient.java index d45e04a52..c23697e0b 100644 --- a/quarkus-test-kubernetes/src/main/java/io/quarkus/test/bootstrap/inject/KubectlClient.java +++ b/quarkus-test-kubernetes/src/main/java/io/quarkus/test/bootstrap/inject/KubectlClient.java @@ -114,7 +114,7 @@ public void apply(Service service, Path file) { new Command(KUBECTL, "apply", "-f", file.toAbsolutePath().toString(), "-n", currentNamespace) .runAndWait(); } catch (Exception e) { - fail("Failed to apply resource " + file.toAbsolutePath().toString() + " for " + service.getName() + ". Caused by " + fail("Failed to apply resource " + file.toAbsolutePath() + " for " + service.getName() + ". Caused by " + e.getMessage()); } } @@ -271,7 +271,7 @@ public void deleteNamespace() { client.close(); } } else { - deleteResourcesByLabel(LABEL_SCENARIO_ID, getScenarioId()); + deleteResources(getScenarioId()); } } @@ -282,9 +282,9 @@ public String getScenarioId() { /** * Delete test resources. */ - private void deleteResourcesByLabel(String labelName, String labelValue) { + private void deleteResources(String labelValue) { try { - String label = String.format("%s=%s", labelName, labelValue); + String label = String.format("%s=%s", KubectlClient.LABEL_SCENARIO_ID, labelValue); new Command(KUBECTL, "delete", "-n", currentNamespace, "all", "-l", label).runAndWait(); } catch (Exception e) { fail("Project failed to be deleted. Caused by " + e.getMessage()); @@ -560,17 +560,12 @@ private String generateRandomNamespaceName() { .toString(); } - private boolean setCurrentSessionNamespace(String namespaceName) { - boolean done = false; + private void setCurrentSessionNamespace(String namespaceName) { try { new Command(KUBECTL, "config", "set-context", "--current", "--namespace=" + namespaceName).runAndWait(); - done = true; } catch (Exception e) { Log.warn("Namespace " + namespaceName + " failed to be set as current session namespace. Caused by: " + e.getMessage() + ". Trying again."); } - - return done; } - } diff --git a/quarkus-test-kubernetes/src/main/java/io/quarkus/test/services/quarkus/KubernetesQuarkusApplicationManagedResource.java b/quarkus-test-kubernetes/src/main/java/io/quarkus/test/services/quarkus/KubernetesQuarkusApplicationManagedResource.java index 0f250fdcd..709fb9d3c 100644 --- a/quarkus-test-kubernetes/src/main/java/io/quarkus/test/services/quarkus/KubernetesQuarkusApplicationManagedResource.java +++ b/quarkus-test-kubernetes/src/main/java/io/quarkus/test/services/quarkus/KubernetesQuarkusApplicationManagedResource.java @@ -83,7 +83,7 @@ public boolean isRunning() { return false; } - return super.isRunning() && routeIsReachable(Protocol.HTTP); + return super.isRunning() && routeIsReachable(); } @Override @@ -115,8 +115,8 @@ private void validateProtocol(Protocol protocol) { } } - private boolean routeIsReachable(Protocol protocol) { - var uri = getURI(protocol); + private boolean routeIsReachable() { + var uri = getURI(Protocol.HTTP); return given().baseUri(uri.getRestAssuredStyleUri()) .basePath("/") diff --git a/quarkus-test-openshift/pom.xml b/quarkus-test-openshift/pom.xml index 07baa6922..841840476 100644 --- a/quarkus-test-openshift/pom.xml +++ b/quarkus-test-openshift/pom.xml @@ -20,6 +20,13 @@ io.fabric8 openshift-client + + + + com.squareup.okhttp3 + okhttp + + io.fabric8 diff --git a/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java b/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java index 0c32c91ac..d72ac231c 100644 --- a/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java +++ b/quarkus-test-openshift/src/main/java/io/quarkus/test/bootstrap/inject/OpenShiftClient.java @@ -172,7 +172,7 @@ public void applyInProject(Path file, String project) { try { new Command(OC, "apply", "-f", file.toAbsolutePath().toString(), "-n", project).runAndWait(); } catch (Exception e) { - fail("Failed to apply resource " + file.toAbsolutePath().toString() + " . Caused by " + e.getMessage()); + fail("Failed to apply resource " + file.toAbsolutePath() + " . Caused by " + e.getMessage()); } } @@ -195,7 +195,7 @@ public void deleteInProject(Path file, String project) { try { new Command(OC, "delete", "-f", file.toAbsolutePath().toString(), "-n", project).runAndWait(); } catch (Exception e) { - fail("Failed to apply resource " + file.toAbsolutePath().toString() + " . Caused by " + e.getMessage()); + fail("Failed to apply resource " + file.toAbsolutePath() + " . Caused by " + e.getMessage()); } } @@ -536,7 +536,7 @@ public void installOperator(Service service, String name, String channel, String groupModel.setMetadata(new ObjectMeta()); groupModel.getMetadata().setName(service.getName()); groupModel.setSpec(new OperatorGroupSpec()); - groupModel.getSpec().setTargetNamespaces(Arrays.asList(currentNamespace)); + groupModel.getSpec().setTargetNamespaces(Collections.singletonList(currentNamespace)); // call createOr and if it exists the update will be done client.resource(groupModel).unlock().createOr(NonDeletingOperation::update); @@ -718,7 +718,7 @@ public void deleteProject() { isClientReady = false; } } else { - deleteResourcesByLabel(LABEL_SCENARIO_ID, getScenarioId()); + deleteResources(getScenarioId()); } } @@ -757,9 +757,9 @@ private void addAnnotatedConfigMap(String configMapName, String annotationName, /** * Delete test resources. */ - private void deleteResourcesByLabel(String labelName, String labelValue) { + private void deleteResources(String labelValue) { try { - String label = String.format("%s=%s", labelName, labelValue); + String label = String.format("%s=%s", OpenShiftClient.LABEL_SCENARIO_ID, labelValue); new Command(OC, "delete", "-n", currentNamespace, "all", "-l", label).runAndWait(); } catch (Exception e) { fail("Project failed to be deleted. Caused by " + e.getMessage()); diff --git a/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/OperatorManagedResource.java b/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/OperatorManagedResource.java index e9bacab14..fc2e8a84c 100644 --- a/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/OperatorManagedResource.java +++ b/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/OperatorManagedResource.java @@ -74,8 +74,8 @@ private void applyCRDs() { private void applyCRD(CustomResourceDefinition crd) { ServiceContext serviceContext = model.getContext(); - Path crdFileDefinition = serviceContext.getServiceFolder().resolve(crd.getName()); - String content = FileUtils.loadFile(crd.getFile()); + Path crdFileDefinition = serviceContext.getServiceFolder().resolve(crd.name()); + String content = FileUtils.loadFile(crd.file()); FileUtils.copyContentTo(content, crdFileDefinition); client.apply(crdFileDefinition); @@ -83,7 +83,7 @@ private void applyCRD(CustomResourceDefinition crd) { } private boolean customResourcesAreReady() { - return crdsToWatch.stream().allMatch(crd -> client.isCustomResourceReady(crd.getName(), crd.getType())); + return crdsToWatch.stream().allMatch(crd -> client.isCustomResourceReady(crd.name(), crd.type())); } private void installOperator() { diff --git a/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/model/CustomResourceDefinition.java b/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/model/CustomResourceDefinition.java index bb4f701b6..5e40a3ba9 100644 --- a/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/model/CustomResourceDefinition.java +++ b/quarkus-test-openshift/src/main/java/io/quarkus/test/services/operator/model/CustomResourceDefinition.java @@ -2,27 +2,6 @@ import io.fabric8.kubernetes.client.CustomResource; -public class CustomResourceDefinition { - private final String name; - private final String file; - private final Class> type; - - public CustomResourceDefinition(String name, String file, - Class> type) { - this.name = name; - this.file = file; - this.type = type; - } - - public String getName() { - return name; - } - - public String getFile() { - return file; - } - - public Class> getType() { - return type; - } +public record CustomResourceDefinition(String name, String file, + Class> type) { } diff --git a/quarkus-test-service-database/src/main/java/io/quarkus/test/services/containers/SqlServerContainerAnnotationBinding.java b/quarkus-test-service-database/src/main/java/io/quarkus/test/services/containers/SqlServerContainerAnnotationBinding.java index 52d39e53a..c5fd1d338 100644 --- a/quarkus-test-service-database/src/main/java/io/quarkus/test/services/containers/SqlServerContainerAnnotationBinding.java +++ b/quarkus-test-service-database/src/main/java/io/quarkus/test/services/containers/SqlServerContainerAnnotationBinding.java @@ -14,7 +14,7 @@ public boolean isFor(Field field) { } @Override - public ManagedResourceBuilder createBuilder(Field field) throws Exception { + public ManagedResourceBuilder createBuilder(Field field) { SqlServerContainer metadata = field.getAnnotation(SqlServerContainer.class); ManagedResourceBuilder builder = new SqlServerManagedResourceBuilder(); builder.init(metadata); diff --git a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java index b4457ef94..2e4be2f45 100644 --- a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java +++ b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/BaseKafkaContainerManagedResource.java @@ -152,7 +152,7 @@ private boolean isRegistryRunning() { private String getSchemaRegistryUrl() { String path = StringUtils.defaultIfBlank(model.getRegistryPath(), model.getVendor().getRegistry().getPath()); - String containerIp = schemaRegistry.getContainerIpAddress(); + String containerIp = schemaRegistry.getHost(); return String.format("http://%s:%s%s", containerIp, schemaRegistry.getMappedPort(getKafkaRegistryPort()), path); } diff --git a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java index a17384b17..03f7ff8c5 100644 --- a/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java +++ b/quarkus-test-service-kafka/src/main/java/io/quarkus/test/services/containers/StrimziKafkaContainerManagedResource.java @@ -163,7 +163,7 @@ protected String[] getKafkaConfigResources() { model.getContext().put(KafkaService.KAFKA_SSL_PROPERTIES, Map.copyOf(configPropertyIterator)); } - return effectiveUserKafkaConfigResources.toArray(new String[effectiveUserKafkaConfigResources.size()]); + return effectiveUserKafkaConfigResources.toArray(new String[0]); } private boolean useDefaultTrustStore() {