This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.27.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.27.x by this push:
new bda08b1b85 [3.27.x] Backport datasource config rationalization for JPA
& SQL tests
bda08b1b85 is described below
commit bda08b1b85d7bcb772b1a55369663792182aba4d
Author: Lukas Lowinger <[email protected]>
AuthorDate: Tue May 19 14:30:56 2026 +0200
[3.27.x] Backport datasource config rationalization for JPA & SQL tests
* Use dynamic db-kind for all configuration profiles in JPA & SQL tests
* Use unique names for JPA DataSource config
---------
Co-authored-by: James Netherton <[email protected]>
---
.../jpa/src/main/resources/application.properties | 24 +++++++++++-----------
...DefaultAndExplicitEntityManagerFactoryTest.java | 4 ++--
.../JpaSingleNamedResourceWithNoDefaultTest.java | 2 +-
.../sql/src/main/resources/application.properties | 10 ++++-----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/integration-tests/jpa/src/main/resources/application.properties
b/integration-tests/jpa/src/main/resources/application.properties
index b8a35ef880..74ec8b7de8 100644
--- a/integration-tests/jpa/src/main/resources/application.properties
+++ b/integration-tests/jpa/src/main/resources/application.properties
@@ -28,18 +28,18 @@
jpa.model.packages=org.apache.camel.quarkus.component.jpa.it.model,org.apache.ca
# single-resource-no-default profile to test single named DataSource /
EntityManagerFactory beans without defaults
%single-resource-no-default.quarkus.camel.routes-discovery.exclude-patterns=**/*
-%single-resource-no-default.quarkus.datasource.testA.db-kind=h2
-%single-resource-no-default.quarkus.hibernate-orm.testA.packages=${jpa.model.packages}
-%single-resource-no-default.quarkus.hibernate-orm.testA.datasource=testA
-%single-resource-no-default.quarkus.hibernate-orm.testA.database.generation=drop-and-create
+%single-resource-no-default.quarkus.datasource.singleA.db-kind=${cq.sqlJdbcKind:h2}
+%single-resource-no-default.quarkus.hibernate-orm.singleA.packages=${jpa.model.packages}
+%single-resource-no-default.quarkus.hibernate-orm.singleA.datasource=singleA
+%single-resource-no-default.quarkus.hibernate-orm.singleA.database.generation=drop-and-create
# multi-resource-no-default profile to test multiple named DataSource /
EntityManagerFactory beans without defaults
%multi-resource-no-default.quarkus.camel.routes-discovery.exclude-patterns=**/*
-%multi-resource-no-default.quarkus.datasource.testA.db-kind=h2
-%multi-resource-no-default.quarkus.hibernate-orm.testA.packages=${jpa.model.packages}
-%multi-resource-no-default.quarkus.hibernate-orm.testA.datasource=testA
-%multi-resource-no-default.quarkus.hibernate-orm.testA.database.generation=drop-and-create
-%multi-resource-no-default.quarkus.datasource.testB.db-kind=h2
-%multi-resource-no-default.quarkus.hibernate-orm.testB.packages=${jpa.model.packages}
-%multi-resource-no-default.quarkus.hibernate-orm.testB.datasource=testB
-%multi-resource-no-default.quarkus.hibernate-orm.testB.database.generation=drop-and-create
+%multi-resource-no-default.quarkus.datasource.multiA.db-kind=${cq.sqlJdbcKind:h2}
+%multi-resource-no-default.quarkus.hibernate-orm.multiA.packages=${jpa.model.packages}
+%multi-resource-no-default.quarkus.hibernate-orm.multiA.datasource=multiA
+%multi-resource-no-default.quarkus.hibernate-orm.multiA.database.generation=drop-and-create
+%multi-resource-no-default.quarkus.datasource.multiB.db-kind=${cq.sqlJdbcKind:h2}
+%multi-resource-no-default.quarkus.hibernate-orm.multiB.packages=${jpa.model.packages}
+%multi-resource-no-default.quarkus.hibernate-orm.multiB.datasource=multiB
+%multi-resource-no-default.quarkus.hibernate-orm.multiB.database.generation=drop-and-create
diff --git
a/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaMultipleNamedResourcesWithNoDefaultAndExplicitEntityManagerFactoryTest.java
b/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaMultipleNamedResourcesWithNoDefaultAndExplicitEntityManagerFactoryTest.java
index 4e801a4388..c8e9c87b5f 100644
---
a/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaMultipleNamedResourcesWithNoDefaultAndExplicitEntityManagerFactoryTest.java
+++
b/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaMultipleNamedResourcesWithNoDefaultAndExplicitEntityManagerFactoryTest.java
@@ -36,7 +36,7 @@ public class
JpaMultipleNamedResourcesWithNoDefaultAndExplicitEntityManagerFacto
.then()
.statusCode(200)
.body(
- "name", is("testB"),
+ "name", is("multiB"),
"default", is(false));
}
@@ -47,6 +47,6 @@ public class
JpaMultipleNamedResourcesWithNoDefaultAndExplicitEntityManagerFacto
@Override
public Map<String, String> getConfigOverrides() {
- return Map.of("camel.component.jpa.entity-managerFactory", "#testB");
+ return Map.of("camel.component.jpa.entity-managerFactory", "#multiB");
}
}
diff --git
a/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaSingleNamedResourceWithNoDefaultTest.java
b/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaSingleNamedResourceWithNoDefaultTest.java
index c1ee3d8d36..5fa6c46149 100644
---
a/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaSingleNamedResourceWithNoDefaultTest.java
+++
b/integration-tests/jpa/src/test/java/org/apache/camel/quarkus/component/jpa/it/JpaSingleNamedResourceWithNoDefaultTest.java
@@ -34,7 +34,7 @@ public class JpaSingleNamedResourceWithNoDefaultTest
implements QuarkusTestProfi
.then()
.statusCode(200)
.body(
- "name", is("testA"),
+ "name", is("singleA"),
"default", is(false));
}
diff --git a/integration-tests/sql/src/main/resources/application.properties
b/integration-tests/sql/src/main/resources/application.properties
index a2364e4000..bafd5dbfbd 100644
--- a/integration-tests/sql/src/main/resources/application.properties
+++ b/integration-tests/sql/src/main/resources/application.properties
@@ -20,18 +20,18 @@
# multi-ds-with-default profile to test multiple named DataSource beans with
the default DataSource
%multi-ds-with-default.quarkus.camel.routes-discovery.exclude-patterns=**/*
-%multi-ds-with-default.quarkus.datasource.db-kind=h2
+%multi-ds-with-default.quarkus.datasource.db-kind=${cq.sqlJdbcKind:h2}
%multi-ds-with-default.quarkus.datasource.devservices.enabled=false
-%multi-ds-with-default.quarkus.datasource.testA.db-kind=h2
+%multi-ds-with-default.quarkus.datasource.testA.db-kind=${cq.sqlJdbcKind:h2}
%multi-ds-with-default.quarkus.datasource.testA.devservices.enabled=false
-%multi-ds-with-default.quarkus.datasource.testB.db-kind=h2
+%multi-ds-with-default.quarkus.datasource.testB.db-kind=${cq.sqlJdbcKind:h2}
%multi-ds-with-default.quarkus.datasource.testB.devservices.enabled=false
# multi-ds-no-default profile to test multiple named DataSource beans without
a default DataSource
%multi-ds-no-default.quarkus.camel.routes-discovery.exclude-patterns=**/*
-%multi-ds-no-default.quarkus.datasource.testA.db-kind=h2
+%multi-ds-no-default.quarkus.datasource.testA.db-kind=${cq.sqlJdbcKind:h2}
%multi-ds-no-default.quarkus.datasource.testA.devservices.enabled=false
-%multi-ds-no-default.quarkus.datasource.testB.db-kind=h2
+%multi-ds-no-default.quarkus.datasource.testB.db-kind=${cq.sqlJdbcKind:h2}
%multi-ds-no-default.quarkus.datasource.testB.devservices.enabled=false
#
