Merge branch 'master' into JAVA-8204

persistence-modules/apache-derby/README.md

@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Getting Started With Apache Derby](https://www.baeldung.com/java-apache-derby)

persistence-modules/java-jpa-3/pom.xml

@@ -69,9 +69,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>1.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

persistence-modules/java-jpa-3/src/main/java/com/baeldung/jpa/postgresql_schema/Product.java

@@ -0,0 +1,30 @@
+package com.baeldung.jpa.postgresql_schema;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "product", schema = "store")
+public class Product {
+
+    @Id
+    private int id;
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

persistence-modules/java-jpa-3/src/main/resources/META-INF/persistence.xml

@@ -149,4 +149,15 @@
             <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
         </properties>
     </persistence-unit>
+    <persistence-unit name="postgresql_schema_unit">
+        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+        <class>com.baeldung.jpa.postgresql_schema.Product</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+        <properties>
+            <property name="hibernate.connection.driver" value="org.postgresql.Driver"/>
+            <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL10Dialect"/>
+            <property name="hibernate.format_sql" value="true"/>
+            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
+        </properties>
+    </persistence-unit>
 </persistence>

persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlSchemaLiveTest.java

@@ -0,0 +1,85 @@
+package com.baeldung.jpa.postgresql_schema;
+
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.postgresql.ds.PGSimpleDataSource;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class PostgresqlSchemaLiveTest {
+    //This tests require running Docker application with working internet connection to fetch
+    //Postgres image if the image is not available locally.
+
+    @ClassRule
+    public static PostgresqlTestContainer container = PostgresqlTestContainer.getInstance();
+
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("user", container.getUsername());
+        properties.setProperty("password", container.getPassword());
+        Connection connection = DriverManager.getConnection(container.getJdbcUrl(), properties);
+        connection.createStatement().execute("CREATE SCHEMA store");
+        connection.createStatement().execute("CREATE TABLE store.product(id SERIAL PRIMARY KEY, name VARCHAR(20))");
+        connection.createStatement().execute("INSERT INTO store.product VALUES(1, 'test product')");
+    }
+
+    @Test
+    public void settingUpSchemaUsingJdbcURL() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("user", container.getUsername());
+        properties.setProperty("password", container.getPassword());
+        Connection connection = DriverManager.getConnection(container.getJdbcUrl().concat("&currentSchema=store"), properties);
+
+        ResultSet resultSet = connection.createStatement().executeQuery("SELECT * FROM product");
+        resultSet.next();
+
+        assertThat(resultSet.getInt(1), equalTo(1));
+        assertThat(resultSet.getString(2), equalTo("test product"));
+    }
+
+    @Test
+    public void settingUpSchemaUsingPGSimpleDataSource() throws Exception {
+        int port = Integer.parseInt(container.getJdbcUrl().substring(container.getJdbcUrl().lastIndexOf(":") + 1, container.getJdbcUrl().lastIndexOf("/")));
+        PGSimpleDataSource ds = new PGSimpleDataSource();
+        ds.setServerNames(new String[]{container.getHost()});
+        ds.setPortNumbers(new int[]{port});
+        ds.setUser(container.getUsername());
+        ds.setPassword(container.getPassword());
+        ds.setDatabaseName("test");
+        ds.setCurrentSchema("store");
+
+        ResultSet resultSet = ds.getConnection().createStatement().executeQuery("SELECT * FROM product");
+        resultSet.next();
+
+        assertThat(resultSet.getInt(1), equalTo(1));
+        assertThat(resultSet.getString(2), equalTo("test product"));
+    }
+
+    @Test
+    public void settingUpSchemaUsingTableAnnotation() {
+        Map<String, String> props = new HashMap<>();
+        props.put("hibernate.connection.url", container.getJdbcUrl());
+        props.put("hibernate.connection.user", container.getUsername());
+        props.put("hibernate.connection.password", container.getPassword());
+        EntityManagerFactory emf = Persistence.createEntityManagerFactory("postgresql_schema_unit", props);
+        EntityManager entityManager = emf.createEntityManager();
+
+        Product product = entityManager.find(Product.class, 1);
+
+        assertThat(product.getName(), equalTo("test product"));
+    }
+}

persistence-modules/java-jpa-3/src/test/java/com/baeldung/jpa/postgresql_schema/PostgresqlTestContainer.java

@@ -0,0 +1,22 @@
+package com.baeldung.jpa.postgresql_schema;
+
+import org.testcontainers.containers.PostgreSQLContainer;
+
+public class PostgresqlTestContainer  extends PostgreSQLContainer<PostgresqlTestContainer> {
+
+    private static final String IMAGE_VERSION = "postgres";
+
+    private static PostgresqlTestContainer container;
+
+
+    private PostgresqlTestContainer() {
+        super(IMAGE_VERSION);
+    }
+
+    public static PostgresqlTestContainer getInstance() {
+        if (container == null) {
+            container = new PostgresqlTestContainer();
+        }
+        return container;
+    }
+}

persistence-modules/pom.xml

@@ -99,9 +99,6 @@
         <hibernate.version>5.2.17.Final</hibernate.version>
 
         <postgresql.version>42.2.20</postgresql.version>
-
-        <!-- testing -->
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 
 </project>

persistence-modules/spring-boot-persistence/src/test/resources/dsrouting-db.sql

@@ -1,3 +1,5 @@
+drop table if exists client;
+
 create table client (
   id numeric,
   name  varchar(50),

persistence-modules/spring-data-redis/pom.xml

@@ -42,10 +42,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-runner</artifactId>
@@ -78,7 +74,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <verbose>true</verbose>
                     <fork>false</fork>

persistence-modules/spring-jooq/pom.xml

@@ -76,7 +76,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <forkCount>0</forkCount>
                 </configuration>

persistence-modules/spring-jpa/README.md

@@ -7,6 +7,7 @@
 - [Self-Contained Testing Using an In-Memory Database](https://www.baeldung.com/spring-jpa-test-in-memory-database)
 - [Obtaining Auto-generated Keys in Spring JDBC](https://www.baeldung.com/spring-jdbc-autogenerated-keys)
 - [Spring Data Annotations](http://www.baeldung.com/spring-data-annotations)
+- [A Guide to Spring AbstractRoutingDatasource](https://www.baeldung.com/spring-abstract-routing-data-source)
 - More articles: [[next -->]](/spring-jpa-2)
 
 ### Eclipse Config