From 78533d4dc79a5567316c1742737ebde8ca8532a7 Mon Sep 17 00:00:00 2001 From: Bipin kumar Date: Sat, 15 Jul 2023 17:02:13 +0530 Subject: [PATCH] =?UTF-8?q?JAVA-23052:=20changes=20made=20for=20adding=20s?= =?UTF-8?q?pring-abstract-routing-data-sour=E2=80=A6=20(#14407)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * JAVA-23052: changes made for adding spring-abstract-routing-data-source in spring-boot-persistence-3 * JAVA-23052: changes made for removing spring-abstract-routing-data-source in spring-boot-persistence --- .../spring-boot-persistence-3/README.md | 1 + .../main/java/com/baeldung/dsrouting/ClientDao.java | 0 .../baeldung/dsrouting/ClientDataSourceRouter.java | 0 .../java/com/baeldung/dsrouting/ClientDatabase.java | 0 .../dsrouting/ClientDatabaseContextHolder.java | 0 .../java/com/baeldung/dsrouting/ClientService.java | 0 .../baeldung/dsrouting/model/ClientADetails.java | 0 .../baeldung/dsrouting/model/ClientBDetails.java | 0 .../dsrouting/DataSourceRoutingIntegrationTest.java | 6 +++++- .../DataSourceRoutingTestConfiguration.java | 7 ++++++- .../SpringBootDataSourceRoutingIntegrationTest.java | 5 ++++- ...pringBootDataSourceRoutingTestConfiguration.java | 6 +++++- .../src/test/resources/application.properties | 13 +++++++++++++ .../src/test/resources/dsrouting-db.sql | 0 .../spring-boot-persistence/README.md | 1 - .../src/test/resources/application.properties | 8 -------- 16 files changed, 34 insertions(+), 13 deletions(-) rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/main/java/com/baeldung/dsrouting/ClientDao.java (100%) rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java (100%) rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/main/java/com/baeldung/dsrouting/ClientDatabase.java (100%) rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java (100%) rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/main/java/com/baeldung/dsrouting/ClientService.java (100%) rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java (100%) rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java (100%) rename persistence-modules/{spring-boot-persistence/src/test/java/com/baeldung => spring-boot-persistence-3/src/test/java/com/baeldung/boot}/dsrouting/DataSourceRoutingIntegrationTest.java (90%) rename persistence-modules/{spring-boot-persistence/src/test/java/com/baeldung => spring-boot-persistence-3/src/test/java/com/baeldung/boot}/dsrouting/DataSourceRoutingTestConfiguration.java (88%) rename persistence-modules/{spring-boot-persistence/src/test/java/com/baeldung => spring-boot-persistence-3/src/test/java/com/baeldung/boot}/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java (92%) rename persistence-modules/{spring-boot-persistence/src/test/java/com/baeldung => spring-boot-persistence-3/src/test/java/com/baeldung/boot}/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java (90%) create mode 100644 persistence-modules/spring-boot-persistence-3/src/test/resources/application.properties rename persistence-modules/{spring-boot-persistence => spring-boot-persistence-3}/src/test/resources/dsrouting-db.sql (100%) diff --git a/persistence-modules/spring-boot-persistence-3/README.md b/persistence-modules/spring-boot-persistence-3/README.md index d8c4ad2b05..34bbe10dc3 100644 --- a/persistence-modules/spring-boot-persistence-3/README.md +++ b/persistence-modules/spring-boot-persistence-3/README.md @@ -1,4 +1,5 @@ ### Relevant Articles: - [Patterns for Iterating Over Large Result Sets With Spring Data JPA](https://www.baeldung.com/spring-data-jpa-iterate-large-result-sets) - [Count the Number of Rows in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-row-count) +- [A Guide to Spring AbstractRoutingDatasource](https://www.baeldung.com/spring-abstract-routing-data-source) - More articles: [[<-- prev]](../spring-boot-persistence-2) diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDao.java b/persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDao.java similarity index 100% rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDao.java rename to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDao.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java b/persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java similarity index 100% rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java rename to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabase.java b/persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDatabase.java similarity index 100% rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabase.java rename to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDatabase.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java b/persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java similarity index 100% rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java rename to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientService.java b/persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientService.java similarity index 100% rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientService.java rename to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientService.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java b/persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java similarity index 100% rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java rename to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java b/persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java similarity index 100% rename from persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java rename to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/DataSourceRoutingIntegrationTest.java similarity index 90% rename from persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java rename to persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/DataSourceRoutingIntegrationTest.java index 0430d9e3af..6359761120 100644 --- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java +++ b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/DataSourceRoutingIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.dsrouting; +package com.baeldung.boot.dsrouting; import static org.junit.Assert.assertEquals; @@ -13,6 +13,10 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; +import com.baeldung.dsrouting.ClientDatabase; +import com.baeldung.dsrouting.ClientDatabaseContextHolder; +import com.baeldung.dsrouting.ClientService; + @RunWith(SpringRunner.class) @ContextConfiguration(classes = DataSourceRoutingTestConfiguration.class) @DirtiesContext diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/DataSourceRoutingTestConfiguration.java similarity index 88% rename from persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java rename to persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/DataSourceRoutingTestConfiguration.java index 957114eba5..e7be8678de 100644 --- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java +++ b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/DataSourceRoutingTestConfiguration.java @@ -1,4 +1,4 @@ -package com.baeldung.dsrouting; +package com.baeldung.boot.dsrouting; import java.util.HashMap; import java.util.Map; @@ -10,6 +10,11 @@ import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import com.baeldung.dsrouting.ClientDao; +import com.baeldung.dsrouting.ClientDataSourceRouter; +import com.baeldung.dsrouting.ClientDatabase; +import com.baeldung.dsrouting.ClientService; + @Configuration public class DataSourceRoutingTestConfiguration { diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java similarity index 92% rename from persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java rename to persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java index 75829c2153..4db411e283 100644 --- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java +++ b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java @@ -1,9 +1,12 @@ -package com.baeldung.dsrouting; +package com.baeldung.boot.dsrouting; import static org.junit.Assert.assertEquals; import javax.sql.DataSource; +import com.baeldung.dsrouting.ClientDatabase; +import com.baeldung.dsrouting.ClientDatabaseContextHolder; +import com.baeldung.dsrouting.ClientService; import com.baeldung.dsrouting.model.ClientADetails; import com.baeldung.dsrouting.model.ClientBDetails; import org.junit.Before; diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java similarity index 90% rename from persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java rename to persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java index 01f157998f..426dbbdb80 100644 --- a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java +++ b/persistence-modules/spring-boot-persistence-3/src/test/java/com/baeldung/boot/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java @@ -1,5 +1,9 @@ -package com.baeldung.dsrouting; +package com.baeldung.boot.dsrouting; +import com.baeldung.dsrouting.ClientDao; +import com.baeldung.dsrouting.ClientDataSourceRouter; +import com.baeldung.dsrouting.ClientDatabase; +import com.baeldung.dsrouting.ClientService; import com.baeldung.dsrouting.model.ClientADetails; import com.baeldung.dsrouting.model.ClientBDetails; import org.springframework.beans.factory.annotation.Autowired; diff --git a/persistence-modules/spring-boot-persistence-3/src/test/resources/application.properties b/persistence-modules/spring-boot-persistence-3/src/test/resources/application.properties new file mode 100644 index 0000000000..10bd344c28 --- /dev/null +++ b/persistence-modules/spring-boot-persistence-3/src/test/resources/application.properties @@ -0,0 +1,13 @@ +# spring.datasource.x +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +spring.datasource.username=sa +spring.datasource.password=sa + +#database details for CLIENT_A +client-a.datasource.name=CLIENT_A +client-a.datasource.script=dsrouting-db.sql + +#database details for CLIENT_B +client-b.datasource.name=CLIENT_B +client-b.datasource.script=dsrouting-db.sql \ No newline at end of file diff --git a/persistence-modules/spring-boot-persistence/src/test/resources/dsrouting-db.sql b/persistence-modules/spring-boot-persistence-3/src/test/resources/dsrouting-db.sql similarity index 100% rename from persistence-modules/spring-boot-persistence/src/test/resources/dsrouting-db.sql rename to persistence-modules/spring-boot-persistence-3/src/test/resources/dsrouting-db.sql diff --git a/persistence-modules/spring-boot-persistence/README.md b/persistence-modules/spring-boot-persistence/README.md index 6bbc2b37ae..88526cdb89 100644 --- a/persistence-modules/spring-boot-persistence/README.md +++ b/persistence-modules/spring-boot-persistence/README.md @@ -7,5 +7,4 @@ - [Resolving “Failed to Configure a DataSource” Error](https://www.baeldung.com/spring-boot-failed-to-configure-data-source) - [Hibernate Field Naming with Spring Boot](https://www.baeldung.com/hibernate-field-naming-spring-boot) - [Spring Boot with Hibernate](https://www.baeldung.com/spring-boot-hibernate) -- [A Guide to Spring AbstractRoutingDatasource](https://www.baeldung.com/spring-abstract-routing-data-source) - More articles: [[more -->]](../spring-boot-persistence-2) diff --git a/persistence-modules/spring-boot-persistence/src/test/resources/application.properties b/persistence-modules/spring-boot-persistence/src/test/resources/application.properties index 9f6f3f60d2..45af449122 100644 --- a/persistence-modules/spring-boot-persistence/src/test/resources/application.properties +++ b/persistence-modules/spring-boot-persistence/src/test/resources/application.properties @@ -4,14 +4,6 @@ spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 spring.datasource.username=sa spring.datasource.password=sa -#database details for CLIENT_A -client-a.datasource.name=CLIENT_A -client-a.datasource.script=dsrouting-db.sql - -#database details for CLIENT_B -client-b.datasource.name=CLIENT_B -client-b.datasource.script=dsrouting-db.sql - # hibernate.X hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.show_sql=true