This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c2c5e781b6e0a3f203f8123fc03b67f0e75f35b6 Author: James Netherton <[email protected]> AuthorDate: Mon Mar 23 12:58:50 2026 +0000 Upgrade Quarkus to 3.35.0.CR1 --- .../storage/blob/it/AzureStorageBlobTest.java | 9 +++----- .../common/it/mongodb/DebeziumMongodbTest.java | 5 +---- .../common/it/sqlserv/DebeziumSqlserverTest.java | 7 ++---- .../common/it/mysql/DebeziumMysqlTest.java | 4 +--- .../common/it/postgres/DebeziumOracleTest.java | 4 +--- .../common/it/postgres/DebeziumPostgresTest.java | 4 +--- .../quarkus/component/http/http/it/HttpTest.java | 5 ++--- .../quarkus/component/mongodb/it/MongoDbTest.java | 6 +++--- .../test/support/mongodb/MongoDbTestResource.java | 24 +++++++++++++++++---- .../component/arangodb/it/ArangodbTest.java | 8 +++---- .../camel/quarkus/component/jira/it/JiraTest.java | 9 +++----- .../component/jms/artemis/it/JmsArtemisXATest.java | 6 +++--- .../quarkus/component/jpa/it/JpaTestBase.java | 7 ++---- .../camel/quarkus/component/kudu/it/KuduTest.java | 6 +++--- .../camel/quarkus/component/mail/MailTest.java | 7 ++---- .../quarkus/component/olingo4/it/Olingo4Test.java | 25 +++++++++++----------- .../replication/slot/it/PgReplicationSlotTest.java | 12 +++++------ .../component/pinecone/it/PineconeResource.java | 10 ++++----- .../component/pinecone/it/PineconeTest.java | 5 +++-- pom.xml | 2 +- 20 files changed, 78 insertions(+), 87 deletions(-) diff --git a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java index ec7f2f59a9..215144ae0e 100644 --- a/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java +++ b/integration-test-groups/azure/azure-storage-blob/src/test/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobTest.java @@ -61,11 +61,9 @@ class AzureStorageBlobTest { private static final String BLOB_CONTENT = "Hello Camel Quarkus Azure Blob"; @BeforeAll - static void beforeAll() { - final Config config = ConfigProvider.getConfig(); + static void beforeAll(Config config) { String containerName = config.getValue("azure.blob.container.name", String.class); - int port = config.getValue("quarkus.http.test-port", int.class); - RestAssured.port = port; + RestAssured.port = config.getValue("quarkus.http.test-port", int.class); RestAssured.given() .queryParam("containerName", containerName) .post("/azure-storage-blob/blob/container") @@ -74,8 +72,7 @@ class AzureStorageBlobTest { } @AfterAll - static void afterAll() { - final Config config = ConfigProvider.getConfig(); + static void afterAll(Config config) { String containerName = config.getValue("azure.blob.container.name", String.class); RestAssured.given() .queryParam("containerName", containerName) diff --git a/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java b/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java index 7ff47a7def..3c12c42681 100644 --- a/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java +++ b/integration-test-groups/debezium/mongodb/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mongodb/DebeziumMongodbTest.java @@ -31,7 +31,6 @@ import org.apache.camel.quarkus.test.support.debezium.AbstractDebeziumTest; import org.apache.camel.quarkus.test.support.debezium.Type; import org.bson.Document; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -60,9 +59,7 @@ class DebeziumMongodbTest extends AbstractDebeziumTest { } @BeforeAll - public static void setUp() throws SQLException { - Config config = ConfigProvider.getConfig(); - + public static void setUp(Config config) { final Optional<String> mongoUrl = config.getOptionalValue(Type.mongodb.getPropertyJdbc(), String.class); if (mongoUrl.isPresent()) { diff --git a/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverTest.java b/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverTest.java index cfaa095698..f7b7f2b53d 100644 --- a/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverTest.java +++ b/integration-test-groups/debezium/mssql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/sqlserv/DebeziumSqlserverTest.java @@ -28,7 +28,6 @@ import org.apache.camel.quarkus.test.support.debezium.AbstractDebeziumTest; import org.apache.camel.quarkus.test.support.debezium.Record; import org.apache.camel.quarkus.test.support.debezium.Type; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -54,8 +53,7 @@ class DebeziumSqlserverTest extends AbstractDebeziumTest { } @BeforeAll - public static void setUp() throws SQLException { - Config config = ConfigProvider.getConfig(); + public static void setUp(Config config) throws SQLException { final Optional<String> jdbcUrl = config.getOptionalValue(Type.sqlserver.getPropertyJdbc(), String.class); assumeTrue(jdbcUrl.isPresent(), @@ -92,8 +90,7 @@ class DebeziumSqlserverTest extends AbstractDebeziumTest { @Test @Order(0) - public void testReceiveInitCompany() { - Config config = ConfigProvider.getConfig(); + public void testReceiveInitCompany(Config config) { assumeTrue(config.getOptionalValue(Type.sqlserver.getPropertyJdbc(), String.class).isPresent()); int i = 0; diff --git a/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java b/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java index e555e27e80..8c8c212c64 100644 --- a/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java +++ b/integration-test-groups/debezium/mysql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/mysql/DebeziumMysqlTest.java @@ -26,7 +26,6 @@ import io.quarkus.test.junit.QuarkusTest; import org.apache.camel.quarkus.test.support.debezium.AbstractDebeziumTest; import org.apache.camel.quarkus.test.support.debezium.Type; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; @@ -46,8 +45,7 @@ class DebeziumMysqlTest extends AbstractDebeziumTest { } @BeforeAll - public static void setUp() throws SQLException { - Config config = ConfigProvider.getConfig(); + public static void setUp(Config config) throws SQLException { Optional<String> jdbcUrl = config.getOptionalValue(Type.mysql.getPropertyJdbc(), String.class); try { diff --git a/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleTest.java b/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleTest.java index 5275ff037a..58578ae664 100644 --- a/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleTest.java +++ b/integration-test-groups/debezium/oracle/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumOracleTest.java @@ -25,7 +25,6 @@ import io.quarkus.test.junit.QuarkusTest; import org.apache.camel.quarkus.test.support.debezium.AbstractDebeziumTest; import org.apache.camel.quarkus.test.support.debezium.Type; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; @@ -46,8 +45,7 @@ class DebeziumOracleTest extends AbstractDebeziumTest { } @BeforeAll - public static void setUp() throws SQLException { - Config config = ConfigProvider.getConfig(); + public static void setUp(Config config) throws SQLException { final String jdbcUrl = config.getValue(Type.oracle.getPropertyJdbc(), String.class); connection = DriverManager.getConnection(jdbcUrl, DebeziumOracleTestResource.DB_USERNAME, DebeziumOracleTestResource.DB_PASSWORD); diff --git a/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java b/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java index 402c201b0d..dd92f423bc 100644 --- a/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java +++ b/integration-test-groups/debezium/postgresql/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java @@ -26,7 +26,6 @@ import io.restassured.RestAssured; import org.apache.camel.quarkus.test.support.debezium.AbstractDebeziumTest; import org.apache.camel.quarkus.test.support.debezium.Type; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.MethodOrderer; @@ -47,8 +46,7 @@ class DebeziumPostgresTest extends AbstractDebeziumTest { } @BeforeAll - public static void setUp() throws SQLException { - Config config = ConfigProvider.getConfig(); + public static void setUp(Config config) throws SQLException { final String jdbcUrl = config.getValue(Type.postgres.getPropertyJdbc(), String.class); connection = DriverManager.getConnection(jdbcUrl); } diff --git a/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java b/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java index f03f59571a..41912995d1 100644 --- a/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java +++ b/integration-test-groups/http/http/src/test/java/org/apache/camel/quarkus/component/http/http/it/HttpTest.java @@ -27,7 +27,7 @@ import io.smallrye.certs.junit5.Certificate; import org.apache.camel.quarkus.component.http.common.AbstractHttpTest; import org.apache.camel.quarkus.component.http.common.HttpTestResource; import org.apache.camel.quarkus.test.support.certificate.TestCertificates; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -125,8 +125,7 @@ public class HttpTest extends AbstractHttpTest { } } - static Stream<Arguments> proxyProviders() { - var config = ConfigProvider.getConfig(); + static Stream<Arguments> proxyProviders(Config config) { String host = config.getValue("proxy.host", String.class); int actualPort = config.getValue("proxy.port", Integer.class); int fakePort = RestAssured.port; diff --git a/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java b/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java index 3dbc48b506..d714c79c21 100644 --- a/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java +++ b/integration-test-groups/mongodb/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java @@ -35,7 +35,7 @@ import org.apache.camel.quarkus.test.support.mongodb.MongoDbConstants; import org.apache.camel.quarkus.test.support.mongodb.MongoDbTestResource; import org.apache.camel.util.CollectionHelper; import org.bson.Document; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.jboss.logging.Logger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -65,8 +65,8 @@ class MongoDbTest { private static MongoDatabase db; @BeforeAll - public static void setUp() throws SQLException { - final String mongoUrl = "mongodb://" + ConfigProvider.getConfig().getValue("quarkus.mongodb.hosts", String.class); + public static void setUp(Config config) throws SQLException { + final String mongoUrl = "mongodb://" + config.getValue("quarkus.mongodb.hosts", String.class); mongoClient = MongoClients.create(mongoUrl); db = mongoClient.getDatabase("test"); diff --git a/integration-tests-support/mongodb/src/main/java/org/apache/camel/quarkus/test/support/mongodb/MongoDbTestResource.java b/integration-tests-support/mongodb/src/main/java/org/apache/camel/quarkus/test/support/mongodb/MongoDbTestResource.java index 375343dad3..8382a68873 100644 --- a/integration-tests-support/mongodb/src/main/java/org/apache/camel/quarkus/test/support/mongodb/MongoDbTestResource.java +++ b/integration-tests-support/mongodb/src/main/java/org/apache/camel/quarkus/test/support/mongodb/MongoDbTestResource.java @@ -45,6 +45,8 @@ public class MongoDbTestResource implements QuarkusTestResourceLifecycleManager private static final String PRIVATE_HOST = "mongodb_private"; private GenericContainer container; + private MongoClient client; + private MongoDatabase db; @Override public Map<String, String> start() { @@ -62,18 +64,28 @@ public class MongoDbTestResource implements QuarkusTestResourceLifecycleManager setUpDb(); - String host = container.getHost() + ":" + container.getMappedPort(MONGODB_PORT).toString(); + String containerHost = container.getHost() + ":" + container.getMappedPort(MONGODB_PORT).toString(); + String mongoHost = "mongodb://" + containerHost; Map<String, String> config = new HashMap<>(); - config.put("quarkus.mongodb.hosts", host); - config.put("quarkus.mongodb." + MongoDbConstants.NAMED_MONGO_CLIENT_NAME + ".connection-string", - "mongodb://" + host); + config.put("quarkus.mongodb.hosts", containerHost); + config.put("quarkus.mongodb." + MongoDbConstants.NAMED_MONGO_CLIENT_NAME + ".connection-string", mongoHost); + + client = MongoClients.create(mongoHost); + db = client.getDatabase("test"); + return config; } catch (Exception e) { throw new RuntimeException(e); } } + @Override + public void inject(TestInjector testInjector) { + testInjector.injectIntoFields(client, new TestInjector.MatchesType(MongoClient.class)); + testInjector.injectIntoFields(db, new TestInjector.MatchesType(MongoDatabase.class)); + } + void setUpDb() { final String mongoUrl = "mongodb://" + container.getHost() + ":" + container.getMappedPort(MONGODB_PORT).toString(); @@ -113,6 +125,10 @@ public class MongoDbTestResource implements QuarkusTestResourceLifecycleManager @Override public void stop() { try { + if (client != null) { + client.close(); + } + if (container != null) { container.stop(); } diff --git a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java index aab9c737e8..b04b5c3ba9 100644 --- a/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java +++ b/integration-tests/arangodb/src/test/java/org/apache/camel/quarkus/component/arangodb/it/ArangodbTest.java @@ -24,7 +24,7 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -118,9 +118,9 @@ class ArangodbTest { } @BeforeAll - public static void setup() { - String host = ConfigProvider.getConfig().getValue("camel.arangodb.host", String.class); - Integer port = ConfigProvider.getConfig().getValue("camel.arangodb.port", Integer.class); + public static void setup(Config config) { + String host = config.getValue("camel.arangodb.host", String.class); + Integer port = config.getValue("camel.arangodb.port", Integer.class); arangoDb = new ArangoDB.Builder().host(host, port).build(); arangoDb.createDatabase(DATABASE_NAME); ArangoDatabase arangoDatabase = arangoDb.db(DATABASE_NAME); diff --git a/integration-tests/jira/src/test/java/org/apache/camel/quarkus/component/jira/it/JiraTest.java b/integration-tests/jira/src/test/java/org/apache/camel/quarkus/component/jira/it/JiraTest.java index f8c84045ed..9a9fa5881f 100644 --- a/integration-tests/jira/src/test/java/org/apache/camel/quarkus/component/jira/it/JiraTest.java +++ b/integration-tests/jira/src/test/java/org/apache/camel/quarkus/component/jira/it/JiraTest.java @@ -38,7 +38,6 @@ import io.restassured.path.json.JsonPath; import org.apache.camel.component.jira.oauth.JiraOAuthAuthenticationHandler; import org.apache.camel.component.jira.oauth.OAuthAsynchronousJiraRestClientFactory; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -52,7 +51,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @QuarkusTest @QuarkusTestResource(JiraTestResource.class) public class JiraTest { - private static final String ISSUE_ATTACHMENT = "Camel Quarkus Test Issue Attachment"; private static final String ISSUE_COMMENT = "Camel Quarkus Test Issue Comment"; private static final String ISSUE_DESCRIPTION = "Camel Quarkus Test Issue Description"; @@ -60,10 +58,10 @@ public class JiraTest { private static final String ISSUE_TYPE = "Task"; private static final String UPDATED_ISSUE_SUMMARY = "Updated summary"; private static JiraRestClient REST_CLIENT; + Config config; @BeforeAll - public static void beforeAll() { - Config config = ConfigProvider.getConfig(); + public static void beforeAll(Config config) { String jiraUrl = config.getValue("camel.component.jira.jira-url", String.class); Optional<String> username = config.getOptionalValue("camel.component.jira.username", String.class); Optional<String> password = config.getOptionalValue("camel.component.jira.password", String.class); @@ -459,9 +457,8 @@ public class JiraTest { } } - private static JiraRestClient getClient() { + private JiraRestClient getClient() { if (REST_CLIENT == null) { - Config config = ConfigProvider.getConfig(); String jiraUrl = config.getValue("camel.component.jira.jira-url", String.class); Optional<String> username = config.getOptionalValue("camel.component.jira.username", String.class); Optional<String> password = config.getOptionalValue("camel.component.jira.password", String.class); diff --git a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisXATest.java b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisXATest.java index 2c7cc28148..13e03213db 100644 --- a/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisXATest.java +++ b/integration-tests/jms-artemis-client/src/test/java/org/apache/camel/quarkus/component/jms/artemis/it/JmsArtemisXATest.java @@ -19,7 +19,7 @@ package org.apache.camel.quarkus.component.jms.artemis.it; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import io.restassured.RestAssured; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -29,10 +29,10 @@ import static org.hamcrest.core.Is.is; @TestProfile(JmsArtemisXAEnabled.class) public class JmsArtemisXATest { @BeforeAll - public static void startRoutes() { + public static void startRoutes(Config config) { RestAssured.given() // see AbstractMessagingTest#beforeAll - .port(ConfigProvider.getConfig().getValue("quarkus.http.test-port", Integer.class)) + .port(config.getValue("quarkus.http.test-port", Integer.class)) .get("/messaging/jms/artemis/routes/start"); } diff --git a/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaTestBase.java b/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaTestBase.java index 461b47e697..19bc6b190f 100644 --- a/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaTestBase.java +++ b/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaTestBase.java @@ -25,7 +25,6 @@ import jakarta.json.bind.Jsonb; import jakarta.json.bind.JsonbBuilder; import org.apache.camel.quarkus.component.jpa.it.model.Fruit; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -42,10 +41,8 @@ public class JpaTestBase { static final String[] FRUITS = new String[] { "Orange", "Lemon", "Plum" }; @BeforeAll - public static void storeFruits() { - final Config config = ConfigProvider.getConfig(); - int port = config.getValue("quarkus.http.test-port", int.class); - RestAssured.port = port; + public static void storeFruits(Config config) { + RestAssured.port = config.getValue("quarkus.http.test-port", int.class); for (String fruit : FRUITS) { RestAssured.given() .contentType(ContentType.JSON) diff --git a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java index 4e0aad2f14..958b969615 100644 --- a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java +++ b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java @@ -25,7 +25,7 @@ import io.restassured.http.ContentType; import org.apache.camel.quarkus.test.DisabledIfFipsMode; import org.apache.kudu.client.KuduClient; import org.apache.kudu.client.KuduException; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.jboss.logging.Logger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; @@ -47,8 +47,8 @@ class KuduTest { static KuduClient client; @BeforeAll - static void setup() { - String authority = ConfigProvider.getConfig().getValue(KUDU_AUTHORITY_CONFIG_KEY, String.class); + static void setup(Config config) { + String authority = config.getValue(KUDU_AUTHORITY_CONFIG_KEY, String.class); client = new KuduClient.KuduClientBuilder(authority).build(); } diff --git a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java index 24dd1a484f..3ff79a5559 100644 --- a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java +++ b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java @@ -44,7 +44,6 @@ import org.apache.camel.quarkus.test.support.certificate.TestCertificates; import org.awaitility.Awaitility; import org.eclipse.angus.mail.util.MailConnectException; import org.eclipse.microprofile.config.Config; -import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -82,9 +81,8 @@ public class MailTest { + "${delimiter}--\r\n"; @BeforeAll - public static void beforeAll() { + public static void beforeAll(Config config) { // Configure users - Config config = ConfigProvider.getConfig(); String userJson = String.format("{ \"email\": \"%s\", \"login\": \"%s\", \"password\": \"%s\"}", EMAIL_ADDRESS, USERNAME, PASSWORD); @@ -96,9 +94,8 @@ public class MailTest { } @AfterEach - public void afterEach() { + public void afterEach(Config config) { // Clear mailboxes - Config config = ConfigProvider.getConfig(); RestAssured.given() .post("http://"; + config.getValue("mail.host", String.class) + ":" + config.getValue("mail.api.port", Integer.class) + "/api/mail/purge") diff --git a/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java b/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java index 0ed89fc9e8..2e4d56807c 100644 --- a/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java +++ b/integration-tests/olingo4/src/test/java/org/apache/camel/quarkus/component/olingo4/it/Olingo4Test.java @@ -29,7 +29,7 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpCoreContext; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -38,15 +38,13 @@ import static org.hamcrest.core.Is.is; @QuarkusTest @QuarkusTestResource(OdataTestResource.class) class Olingo4Test { - - public static final String TEST_SERVICE_BASE_URL = ConfigProvider.getConfig().getValue("olingo4.test.url", String.class); - private static String sessionId; @BeforeAll - public static void beforeAll() throws IOException { + public static void beforeAll(Config config) throws IOException { // Use the same session id for each request to the demo Olingo4 Service - sessionId = getSession(); + String testServiceBaseUrl = config.getValue("olingo4.test.url", String.class); + sessionId = getSession(testServiceBaseUrl); } @Test @@ -113,12 +111,13 @@ class Olingo4Test { .statusCode(404); } - private static String getSession() throws IOException { - CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpGet httpGet = new HttpGet(TEST_SERVICE_BASE_URL); - HttpContext httpContext = new BasicHttpContext(); - httpClient.execute(httpGet, httpContext); - HttpUriRequest currentReq = (HttpUriRequest) httpContext.getAttribute(HttpCoreContext.HTTP_REQUEST); - return currentReq.getURI().getPath().split("/")[2]; + private static String getSession(String testServiceBaseUrl) throws IOException { + try (CloseableHttpClient httpClient = HttpClients.createDefault()) { + HttpGet httpGet = new HttpGet(testServiceBaseUrl); + HttpContext httpContext = new BasicHttpContext(); + httpClient.execute(httpGet, httpContext); + HttpUriRequest currentReq = (HttpUriRequest) httpContext.getAttribute(HttpCoreContext.HTTP_REQUEST); + return currentReq.getURI().getPath().split("/")[2]; + } } } diff --git a/integration-tests/pg-replication-slot/src/test/java/org/apache/camel/quarkus/component/pg/replication/slot/it/PgReplicationSlotTest.java b/integration-tests/pg-replication-slot/src/test/java/org/apache/camel/quarkus/component/pg/replication/slot/it/PgReplicationSlotTest.java index 331ceaec7c..9e91ad29a0 100644 --- a/integration-tests/pg-replication-slot/src/test/java/org/apache/camel/quarkus/component/pg/replication/slot/it/PgReplicationSlotTest.java +++ b/integration-tests/pg-replication-slot/src/test/java/org/apache/camel/quarkus/component/pg/replication/slot/it/PgReplicationSlotTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -46,11 +46,11 @@ class PgReplicationSlotTest { private static Connection connection; @BeforeAll - public static void setUp() throws SQLException { - String authority = ConfigProvider.getConfig().getValue(PG_AUTHORITY_CFG_KEY, String.class); - String dbName = ConfigProvider.getConfig().getValue(PG_DBNAME_CFG_KEY, String.class); - String user = ConfigProvider.getConfig().getValue(PG_USER_CFG_KEY, String.class); - String password = ConfigProvider.getConfig().getValue(PG_PASSRD_CFG_KEY, String.class); + public static void setUp(Config config) throws SQLException { + String authority = config.getValue(PG_AUTHORITY_CFG_KEY, String.class); + String dbName = config.getValue(PG_DBNAME_CFG_KEY, String.class); + String user = config.getValue(PG_USER_CFG_KEY, String.class); + String password = config.getValue(PG_PASSRD_CFG_KEY, String.class); String url = String.format("jdbc:postgresql://%s/%s", authority, dbName); Properties props = new Properties(); diff --git a/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java b/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java index bf937ea3c4..a9dae2d25a 100644 --- a/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java +++ b/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java @@ -36,7 +36,7 @@ import jakarta.ws.rs.core.MediaType; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.pinecone.PineconeVectorDbComponent; import org.apache.camel.component.pinecone.PineconeVectorDbConfiguration; -import org.eclipse.microprofile.config.ConfigProvider; +import org.eclipse.microprofile.config.Config; import org.openapitools.db_control.client.model.IndexModel; @Path("/pinecone") @@ -83,8 +83,8 @@ public class PineconeResource { } @Named("pinecone") - PineconeVectorDbComponent pineconeVectorDbComponent() { - Pinecone client = createPineconeClient(); + PineconeVectorDbComponent pineconeVectorDbComponent(Config config) { + Pinecone client = createPineconeClient(config); PineconeVectorDbComponent component = new PineconeVectorDbComponent(); PineconeVectorDbConfiguration configuration = new PineconeVectorDbConfiguration(); configuration.setClient(client); @@ -92,8 +92,8 @@ public class PineconeResource { return component; } - static Pinecone createPineconeClient() { - String endpoint = ConfigProvider.getConfig().getValue("pinecone.emulator.endpoint", String.class); + static Pinecone createPineconeClient(Config config) { + String endpoint = config.getValue("pinecone.emulator.endpoint", String.class); Pinecone.Builder builder = new Pinecone.Builder("pclocal") .withHost(endpoint) .withTlsEnabled(false); diff --git a/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java b/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java index 2884e1be44..cf9d808adf 100644 --- a/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java +++ b/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java @@ -24,6 +24,7 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import org.eclipse.microprofile.config.Config; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.openapitools.db_control.client.model.IndexModel; @@ -42,8 +43,8 @@ class PineconeTest { private static Pinecone pinecone; @BeforeAll - public static void beforeAll() { - pinecone = createPineconeClient(); + public static void beforeAll(Config config) { + pinecone = createPineconeClient(config); } @Test diff --git a/pom.xml b/pom.xml index 6cc92e8fef..7da21cc6e2 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ <quarkiverse-minio.version>3.8.6</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>2.4.2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.11.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> - <quarkus.version>3.34.1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-hazelcast-client.version>4.1.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>2.12.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
