JAVA-23052: changes made for adding spring-abstract-routing-data-sour… (eugenp#14407)

* 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

Author: Bipinkumar27

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)

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDao.java renamed to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDao.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.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

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java renamed to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.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.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 {
 

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabase.java renamed to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDatabase.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;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java renamed to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.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;

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientService.java renamed to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/ClientService.java

@@ -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

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java renamed to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java

@@ -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)

persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java renamed to persistence-modules/spring-boot-persistence-3/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java

@@ -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