Merge remote-tracking branch 'upstream/master' into BAEL-2899

apache-geode/src/test/java/com/baeldung/geode/GeodeSamplesLiveTest.java

@@ -21,7 +21,7 @@ import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
 
-public class GeodeSamplesIntegrationTest {
+public class GeodeSamplesLiveTest {
 
     ClientCache cache = null;
     Region<String, String> region = null;

apache-olingo/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [OData Protocol Guide](https://www.baeldung.com/odata)

core-java-modules/core-java-9/README.md

@@ -28,6 +28,6 @@
 - [Java 9 Convenience Factory Methods for Collections](https://www.baeldung.com/java-9-collections-factory-methods)
 - [Java 9 Stream API Improvements](https://www.baeldung.com/java-9-stream-api)
 - [A Guide to Java 9 Modularity](https://www.baeldung.com/java-9-modularity)
-- [Java 9 Platform Module API](https://www.baeldung.com/java-9-module-api)
+- [Java 9 java.lang.Module API](https://www.baeldung.com/java-9-module-api)
 - [Java 9 Platform Logging API](https://www.baeldung.com/java-9-logging-api)
 - [Filtering a Stream of Optionals in Java](https://www.baeldung.com/java-filter-stream-of-optional)

core-java-modules/core-java-lambdas/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Why Do Local Variables Used in Lambdas Have to Be Final or Effectively Final?](https://www.baeldung.com/java-lambda-effectively-final-local-variables)

core-java-modules/core-java/src/main/java/com/baeldung/README.md

@@ -1 +0,0 @@
-### Relevant Articles:

core-java-modules/core-java/src/main/java/com/baeldung/graph/Graph.java

@@ -19,7 +19,7 @@ public class Graph {
 
     void removeVertex(String label) {
         Vertex v = new Vertex(label);
-        adjVertices.values().stream().map(e -> e.remove(v)).collect(Collectors.toList());
+        adjVertices.values().stream().forEach(e -> e.remove(v));
         adjVertices.remove(new Vertex(label));
     }
 

core-java-modules/core-java/src/test/java/com/baeldung/graph/GraphUnitTest.java

@@ -1,20 +1,31 @@
 package com.baeldung.graph;
 
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
-public class GraphTraversalUnitTest {
+public class GraphUnitTest {
     @Test
     public void givenAGraph_whenTraversingDepthFirst_thenExpectedResult() {
         Graph graph = createGraph();
-        Assert.assertEquals("[Bob, Rob, Maria, Alice, Mark]", 
+        assertEquals("[Bob, Rob, Maria, Alice, Mark]", 
             GraphTraversal.depthFirstTraversal(graph, "Bob").toString());
     }
     
     @Test
     public void givenAGraph_whenTraversingBreadthFirst_thenExpectedResult() {
         Graph graph = createGraph();
-        Assert.assertEquals("[Bob, Alice, Rob, Mark, Maria]", 
+       assertEquals("[Bob, Alice, Rob, Mark, Maria]", 
+            GraphTraversal.breadthFirstTraversal(graph, "Bob").toString());
+    }
+    
+    @Test
+    public void givenAGraph_whenRemoveVertex_thenVertedNotFound() {
+        Graph graph = createGraph();
+        assertEquals("[Bob, Alice, Rob, Mark, Maria]", 
+            GraphTraversal.breadthFirstTraversal(graph, "Bob").toString());
+        
+        graph.removeVertex("Maria");
+        assertEquals("[Bob, Alice, Rob, Mark]", 
             GraphTraversal.breadthFirstTraversal(graph, "Bob").toString());
     }
     

core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/Document.kt

@@ -9,19 +9,3 @@ interface Document {
 
     fun getType() = "document"
 }
-
-class TextDocument : Document {
-    override fun getType() = "text"
-
-    fun transformList(list : List<Number>) : List<Number> {
-        return list.filter { n -> n.toInt() > 1 }
-    }
-
-    fun transformListInverseWildcards(list : List<@JvmSuppressWildcards Number>) : List<@JvmWildcard Number> {
-        return list.filter { n -> n.toInt() > 1 }
-    }
-
-    var list : List<@JvmWildcard Any> = ArrayList()
-}
-
-class XmlDocument(d : Document) : Document by d

core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/TextDocument.kt

@@ -0,0 +1,16 @@
+package com.baeldung.jvmannotations
+
+import java.util.*
+class TextDocument : Document {
+    override fun getType() = "text"
+
+    fun transformList(list : List<Number>) : List<Number> {
+        return list.filter { n -> n.toInt() > 1 }
+    }
+
+    fun transformListInverseWildcards(list : List<@JvmSuppressWildcards Number>) : List<@JvmWildcard Number> {
+        return list.filter { n -> n.toInt() > 1 }
+    }
+
+    var list : List<@JvmWildcard Any> = ArrayList()
+}

core-kotlin-2/src/main/kotlin/com/baeldung/jvmannotations/XmlDocument.kt

@@ -0,0 +1,5 @@
+package com.baeldung.jvmannotations
+
+import java.util.*
+
+class XmlDocument(d : Document) : Document by d

core-kotlin-2/src/test/kotlin/com/baeldung/range/DocumentTest.kt

@@ -3,6 +3,8 @@ package com.baeldung.range
 import org.junit.Test
 import kotlin.test.assertEquals
 
+import com.baeldung.jvmannotations.*;
+
 class DocumentTest {
 
     @Test

java-collections-conversions/src/main/java/com/baeldung/convertToMap/Book.java

@@ -0,0 +1,48 @@
+package com.baeldung.convertToMap;
+
+public class Book {
+    private String name;
+    private int releaseYear;
+    private String isbn;
+
+
+    @Override
+    public String toString() {
+        return "Book{" +
+                "name='" + name + '\'' +
+                ", releaseYear=" + releaseYear +
+                ", isbn='" + isbn + '\'' +
+                '}';
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getReleaseYear() {
+        return releaseYear;
+    }
+
+    public void setReleaseYear(int releaseYear) {
+        this.releaseYear = releaseYear;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public Book(String name, int releaseYear, String isbn) {
+        this.name = name;
+        this.releaseYear = releaseYear;
+        this.isbn = isbn;
+    }
+}
+

java-collections-conversions/src/main/java/com/baeldung/convertToMap/ConvertToMap.java

@@ -0,0 +1,34 @@
+package com.baeldung.convertToMap;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class ConvertToMap {
+    public Map<String, String> listToMap(List<Book> books) {
+        return books.stream().collect(Collectors.toMap(Book::getIsbn, Book::getName));
+    }
+
+    public Map<Integer, Book> listToMapWithDupKeyError(List<Book> books) {
+        return books.stream().collect(Collectors.toMap(Book::getReleaseYear, Function.identity()));
+    }
+
+    public Map<Integer, Book> listToMapWithDupKey(List<Book> books) {
+        return books.stream().collect(Collectors.toMap(Book::getReleaseYear, Function.identity(),
+                (o1, o2) -> o1));
+    }
+
+    public Map<Integer, Book> listToConcurrentMap(List<Book> books) {
+        return books.stream().collect(Collectors.toMap(Book::getReleaseYear, Function.identity(), (o1, o2) -> o1, ConcurrentHashMap::new));
+    }
+
+    public TreeMap<String, Book> listToSortedMap(List<Book> books) {
+        return books.stream()
+                .sorted(Comparator.comparing(Book::getName))
+                .collect(Collectors.toMap(Book::getName, Function.identity(), (o1, o2) -> o1, TreeMap::new));
+    }
+
+
+}
+

java-collections-conversions/src/test/java/com/baeldung/convertToMap/ConvertToMapUnitTest.java

@@ -0,0 +1,50 @@
+package com.baeldung.convertToMap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class ConvertToMapUnitTest {
+
+    private List<Book> bookList;
+    private ConvertToMap convertToMap = new ConvertToMap();
+
+    @Before
+    public void init() {
+        bookList = new ArrayList<>();
+        bookList.add(new Book("The Fellowship of the Ring", 1954, "0395489318"));
+        bookList.add(new Book("The Two Towers", 1954, "0345339711"));
+        bookList.add(new Book("The Return of the King", 1955, "0618129111"));
+    }
+
+    @Test
+    public void whenConvertFromListToMap() {
+        assertTrue(convertToMap.listToMap(bookList).size() == 3);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void whenMapHasDuplicateKey_without_merge_function_then_runtime_exception() {
+        convertToMap.listToMapWithDupKeyError(bookList);
+    }
+
+    @Test
+    public void whenMapHasDuplicateKey_with_merge_function() {
+        assertTrue(convertToMap.listToMapWithDupKey(bookList).size() == 2);
+    }
+
+    @Test
+    public void whenCreateConcurrentHashMap() {
+        assertTrue(convertToMap.listToConcurrentMap(bookList) instanceof ConcurrentHashMap);
+    }
+
+    @Test
+    public void whenMapisSorted() {
+        assertTrue(convertToMap.listToSortedMap(bookList).firstKey().equals("The Fellowship of the Ring"));
+    }
+}

maven/README.md

@@ -16,3 +16,4 @@
 - [Multi-Module Project with Maven](https://www.baeldung.com/maven-multi-module)
 - [Maven Enforcer Plugin](https://www.baeldung.com/maven-enforcer-plugin)
 - [Eclipse Error: web.xml is missing and failOnMissingWebXml is set to true](https://www.baeldung.com/eclipse-error-web-xml-missing)
+- [Guide to Maven Profiles](https://www.baeldung.com/maven-profiles)

persistence-modules/java-jpa/README.md

@@ -8,3 +8,6 @@
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)
 - [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)
 - [Types of JPA Queries](https://www.baeldung.com/jpa-queries)
+- [Defining JPA Entities](https://www.baeldung.com/jpa-entities)
+- [JPA @Basic Annotation](https://www.baeldung.com/jpa-basic-annotation)
+- [Default Column Values in JPA](https://www.baeldung.com/jpa-default-column-values)

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Account.java

@@ -0,0 +1,43 @@
+package com.baeldung.jpa.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+@Entity
+@IdClass(AccountId.class)
+public class Account {
+
+    @Id
+    private String accountNumber;
+
+    @Id
+    private String accountType;
+
+    private String description;
+
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    public void setAccountNumber(String accountNumber) {
+        this.accountNumber = accountNumber;
+    }
+
+    public String getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(String accountType) {
+        this.accountType = accountType;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+}

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/AccountId.java

@@ -0,0 +1,52 @@
+package com.baeldung.jpa.entity;
+
+import java.io.Serializable;
+
+public class AccountId implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String accountNumber;
+    private String accountType;
+
+    public AccountId() {
+
+    }
+
+    public AccountId(String accountNumber, String accountType) {
+        this.accountNumber = accountNumber;
+        this.accountType = accountType;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((accountNumber == null) ? 0 : accountNumber.hashCode());
+        result = prime * result + ((accountType == null) ? 0 : accountType.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        AccountId other = (AccountId) obj;
+        if (accountNumber == null) {
+            if (other.accountNumber != null)
+                return false;
+        } else if (!accountNumber.equals(other.accountNumber))
+            return false;
+        if (accountType == null) {
+            if (other.accountType != null)
+                return false;
+        } else if (!accountType.equals(other.accountType))
+            return false;
+        return true;
+    }
+
+}

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/Book.java

@@ -0,0 +1,34 @@
+package com.baeldung.jpa.entity;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+
+@Entity
+public class Book {
+
+    @EmbeddedId
+    private BookId bookId;
+
+    private String description;
+
+    public Book() {
+
+    }
+
+    public Book(BookId bookId) {
+        this.bookId = bookId;
+    }
+
+    public BookId getBookId() {
+        return bookId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+}

persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/entity/BookId.java

@@ -0,0 +1,62 @@
+package com.baeldung.jpa.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class BookId implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private String title;
+    private String language;
+
+    public BookId() {
+
+    }
+
+    public BookId(String title, String language) {
+        this.title = title;
+        this.language = language;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((language == null) ? 0 : language.hashCode());
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        BookId other = (BookId) obj;
+        if (language == null) {
+            if (other.language != null)
+                return false;
+        } else if (!language.equals(other.language))
+            return false;
+        if (title == null) {
+            if (other.title != null)
+                return false;
+        } else if (!title.equals(other.title))
+            return false;
+        return true;
+    }
+
+}

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

@@ -1,183 +1,226 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence xmlns="http://xmlns.jcp.org/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
              http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd"
-             version="2.2">
+	version="2.2">
 
-    <persistence-unit name="java-jpa-scheduled-day">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.sqlresultsetmapping.ScheduledDay</class>
-        <class>com.baeldung.sqlresultsetmapping.Employee</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test;INIT=RUNSCRIPT FROM 'classpath:database.sql'"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <!--<property name="hibernate.hbm2ddl.auto" value="create-drop" />-->
-            <property name="show_sql" value="true"/>
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
-        </properties>
-    </persistence-unit>
+	<persistence-unit name="java-jpa-scheduled-day">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.sqlresultsetmapping.ScheduledDay</class>
+		<class>com.baeldung.sqlresultsetmapping.Employee</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:test;INIT=RUNSCRIPT FROM 'classpath:database.sql'" />
+			<property name="javax.persistence.jdbc.user" value="sa" />
+			<property name="javax.persistence.jdbc.password" value="" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.H2Dialect" />
+			<!--<property name="hibernate.hbm2ddl.auto" value="create-drop" /> -->
+			<property name="show_sql" value="true" />
+			<property name="hibernate.temp.use_jdbc_metadata_defaults"
+				value="false" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="jpa-h2">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.stringcast.Message</class>
-        <class>com.baeldung.jpa.enums.Article</class>
-        <class>com.baeldung.jpa.enums.CategoryConverter</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-            <property name="show_sql" value="true"/>
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
-        </properties>
-    </persistence-unit>
+	<persistence-unit name="jpa-h2">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.stringcast.Message</class>
+		<class>com.baeldung.jpa.enums.Article</class>
+		<class>com.baeldung.jpa.enums.CategoryConverter</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:test" />
+			<property name="javax.persistence.jdbc.user" value="sa" />
+			<property name="javax.persistence.jdbc.password" value="" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.H2Dialect" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="show_sql" value="true" />
+			<property name="hibernate.temp.use_jdbc_metadata_defaults"
+				value="false" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="jpa-db">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.model.Car</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/baeldung"/>
-            <property name="javax.persistence.jdbc.user" value="baeldung"/>
-            <property name="javax.persistence.jdbc.password" value="YourPassword"/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
-            <property name="hibernate.show_sql" value="true"/>
-        </properties>
-    </persistence-unit>
+	<persistence-unit name="jpa-db">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.model.Car</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="com.mysql.jdbc.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:mysql://127.0.0.1:3306/baeldung" />
+			<property name="javax.persistence.jdbc.user"
+				value="baeldung" />
+			<property name="javax.persistence.jdbc.password"
+				value="YourPassword" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.MySQLDialect" />
+			<property name="hibernate.show_sql" value="true" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="entity-graph-pu" transaction-type="RESOURCE_LOCAL">
-        <class>com.baeldung.jpa.entitygraph.model.Post</class>
-        <class>com.baeldung.jpa.entitygraph.model.User</class>
-        <class>com.baeldung.jpa.entitygraph.model.Comment</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
+	<persistence-unit name="entity-graph-pu"
+		transaction-type="RESOURCE_LOCAL">
+		<class>com.baeldung.jpa.entitygraph.model.Post</class>
+		<class>com.baeldung.jpa.entitygraph.model.User</class>
+		<class>com.baeldung.jpa.entitygraph.model.Comment</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
 
-            <!--H2-->
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:entitygraphdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE"/>
+			<!--H2 -->
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:entitygraphdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE" />
 
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
-            <property name="javax.persistence.sql-load-script-source" value="data-init.sql"/>
-        </properties>
-    </persistence-unit>
+			<property
+				name="javax.persistence.schema-generation.database.action"
+				value="drop-and-create" />
+			<property name="javax.persistence.sql-load-script-source"
+				value="data-init.sql" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="java8-datetime-postgresql" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <class>com.baeldung.jpa.datetime.JPA22DateTimeEntity</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://localhost:5432/java8-datetime2"/>
-            <property name="javax.persistence.jdbc.user" value="postgres"/>
-            <property name="javax.persistence.jdbc.password" value="postgres"/>
-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+	<persistence-unit name="java8-datetime-postgresql"
+		transaction-type="RESOURCE_LOCAL">
+		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+		<class>com.baeldung.jpa.datetime.JPA22DateTimeEntity</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.postgresql.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:postgresql://localhost:5432/java8-datetime2" />
+			<property name="javax.persistence.jdbc.user"
+				value="postgres" />
+			<property name="javax.persistence.jdbc.password"
+				value="postgres" />
+			<property
+				name="javax.persistence.schema-generation.database.action"
+				value="drop-and-create" />
 
-            <!-- configure logging -->
-            <property name="eclipselink.logging.level" value="INFO"/>
-            <property name="eclipselink.logging.level.sql" value="FINE"/>
-            <property name="eclipselink.logging.parameters" value="true"/>
-        </properties>
-    </persistence-unit>
+			<!-- configure logging -->
+			<property name="eclipselink.logging.level" value="INFO" />
+			<property name="eclipselink.logging.level.sql" value="FINE" />
+			<property name="eclipselink.logging.parameters" value="true" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="jpa-h2-criteria">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.criteria.entity.Item</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver"
-                      value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="javax.persistence.jdbc.password" value="" />
-            <property name="hibernate.dialect"
-                      value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-            <property name="show_sql" value="true" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults"
-                      value="false" />
-            <property name="javax.persistence.sql-load-script-source" value="item.sql"/>
-        </properties>
-    </persistence-unit>
+	<persistence-unit name="jpa-h2-criteria">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.criteria.entity.Item</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:test" />
+			<property name="javax.persistence.jdbc.user" value="sa" />
+			<property name="javax.persistence.jdbc.password" value="" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.H2Dialect" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="show_sql" value="true" />
+			<property name="hibernate.temp.use_jdbc_metadata_defaults"
+				value="false" />
+			<property name="javax.persistence.sql-load-script-source"
+				value="item.sql" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="jpa-query-types">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.querytypes.UserEntity</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver"
-                      value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="javax.persistence.jdbc.password" value="" />
-            <property name="hibernate.dialect"
-                      value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-            <property name="show_sql" value="true" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults"
-                      value="false" />
-            <property name="javax.persistence.sql-load-script-source" value="users.sql"/>
-        </properties>
-    </persistence-unit>
+	<persistence-unit name="jpa-query-types">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.querytypes.UserEntity</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:test" />
+			<property name="javax.persistence.jdbc.user" value="sa" />
+			<property name="javax.persistence.jdbc.password" value="" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.H2Dialect" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="show_sql" value="true" />
+			<property name="hibernate.temp.use_jdbc_metadata_defaults"
+				value="false" />
+			<property name="javax.persistence.sql-load-script-source"
+				value="users.sql" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="entity-default-values">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.defaultvalues.User</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="javax.persistence.jdbc.password" value="" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-            <property name="show_sql" value="true" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
-        </properties>
-    </persistence-unit>
-  
-    <persistence-unit name="jpa-entity-definition">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.entity.Student</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="javax.persistence.jdbc.password" value="" />
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
-            <property name="hibernate.hbm2ddl.auto" value="create-drop" />
-            <property name="show_sql" value="true" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
-        </properties>
-    </persistence-unit>
+	<persistence-unit name="entity-default-values">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.defaultvalues.User</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:test" />
+			<property name="javax.persistence.jdbc.user" value="sa" />
+			<property name="javax.persistence.jdbc.password" value="" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.H2Dialect" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="show_sql" value="true" />
+			<property name="hibernate.temp.use_jdbc_metadata_defaults"
+				value="false" />
+		</properties>
+	</persistence-unit>
 
-    <persistence-unit name="jpa-projections">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-        <class>com.baeldung.jpa.projections.Product</class>
-        <exclude-unlisted-classes>true</exclude-unlisted-classes>
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
-            <property name="javax.persistence.jdbc.user" value="sa"/>
-            <property name="javax.persistence.jdbc.password" value=""/>
-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-            <property name="show_sql" value="true"/>
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false"/>
-            <property name="javax.persistence.sql-load-script-source" value="products_jpa.sql"/>
-        </properties>
-    </persistence-unit>
+	<persistence-unit name="jpa-entity-definition">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.entity.Student</class>
+		<class>com.baeldung.jpa.entity.Book</class>
+		<class>com.baeldung.jpa.entity.BookId</class>
+		<class>com.baeldung.jpa.entity.Account</class>
+		<class>com.baeldung.jpa.entity.AccountId</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:test" />
+			<property name="javax.persistence.jdbc.user" value="sa" />
+			<property name="javax.persistence.jdbc.password" value="" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.H2Dialect" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="show_sql" value="true" />
+			<property name="hibernate.temp.use_jdbc_metadata_defaults"
+				value="false" />
+		</properties>
+	</persistence-unit>
+
+	<persistence-unit name="jpa-projections">
+		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+		<class>com.baeldung.jpa.projections.Product</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="javax.persistence.jdbc.driver"
+				value="org.h2.Driver" />
+			<property name="javax.persistence.jdbc.url"
+				value="jdbc:h2:mem:test" />
+			<property name="javax.persistence.jdbc.user" value="sa" />
+			<property name="javax.persistence.jdbc.password" value="" />
+			<property name="hibernate.dialect"
+				value="org.hibernate.dialect.H2Dialect" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="show_sql" value="true" />
+			<property name="hibernate.temp.use_jdbc_metadata_defaults"
+				value="false" />
+			<property name="javax.persistence.sql-load-script-source"
+				value="products_jpa.sql" />
+		</properties>
+	</persistence-unit>
 </persistence>

persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/entity/CompositeKeysIntegrationTest.java

@@ -0,0 +1,114 @@
+package com.baeldung.jpa.entity;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class CompositeKeysIntegrationTest {
+
+    private static final String SAVINGS_ACCOUNT = "Savings";
+    private static final String ACCOUNT_NUMBER = "JXSDF324234";
+    private static final String ENGLISH = "English";
+    private static final String WAR_AND_PEACE = "War and Peace";
+
+    private static EntityManagerFactory emf;
+    private static EntityManager em;
+
+    @BeforeClass
+    public static void setup() {
+        emf = Persistence.createEntityManagerFactory("jpa-entity-definition");
+        em = emf.createEntityManager();
+    }
+
+    @Test
+    public void persistBookWithCompositeKeyThenRetrieveDetails() {
+        Book warAndPeace = createBook();
+        persist(warAndPeace);
+        clearThePersistenceContext();
+        Book book = findBookByBookId();
+        verifyAssertionsWith(book);
+    }
+
+    @Test
+    public void persistAccountWithCompositeKeyThenRetrieveDetails() {
+        Account savingsAccount = createAccount();
+        persist(savingsAccount);
+        clearThePersistenceContext();
+        Account account = findAccountByAccountId();
+        verifyAssertionsWith(account);
+    }
+
+    @AfterClass
+    public static void destroy() {
+        if (em != null) {
+            em.close();
+        }
+        if (emf != null) {
+            emf.close();
+        }
+    }
+
+    private Account createAccount() {
+        Account savingsAccount = new Account();
+        savingsAccount.setAccountNumber(ACCOUNT_NUMBER);
+        savingsAccount.setAccountType(SAVINGS_ACCOUNT);
+        savingsAccount.setDescription("Savings account");
+        return savingsAccount;
+    }
+
+    private void verifyAssertionsWith(Account account) {
+        assertEquals(ACCOUNT_NUMBER, account.getAccountNumber());
+        assertEquals(SAVINGS_ACCOUNT, account.getAccountType());
+    }
+
+    private Account findAccountByAccountId() {
+        return em.find(Account.class, new AccountId(ACCOUNT_NUMBER, SAVINGS_ACCOUNT));
+    }
+
+    private void persist(Account account) {
+        em.getTransaction()
+            .begin();
+        em.persist(account);
+        em.getTransaction()
+            .commit();
+    }
+
+    private Book findBookByBookId() {
+        return em.find(Book.class, new BookId(WAR_AND_PEACE, ENGLISH));
+    }
+
+    private Book createBook() {
+        BookId bookId = new BookId(WAR_AND_PEACE, ENGLISH);
+        Book warAndPeace = new Book(bookId);
+        warAndPeace.setDescription("Novel and Historical Fiction");
+        return warAndPeace;
+    }
+
+    private void verifyAssertionsWith(Book book) {
+        assertNotNull(book);
+        assertNotNull(book.getBookId());
+        assertEquals(WAR_AND_PEACE, book.getBookId()
+            .getTitle());
+        assertEquals(ENGLISH, book.getBookId()
+            .getLanguage());
+    }
+
+    private void persist(Book book) {
+        em.getTransaction()
+            .begin();
+        em.persist(book);
+        em.getTransaction()
+            .commit();
+    }
+
+    private void clearThePersistenceContext() {
+        em.clear();
+    }
+}

persistence-modules/java-mongodb/src/test/java/com/baeldung/AppLiveTest.java

@@ -19,7 +19,7 @@ import de.flapdoodle.embedmongo.config.MongodConfig;
 import de.flapdoodle.embedmongo.distribution.Version;
 import de.flapdoodle.embedmongo.runtime.Network;
 
-public class AppIntegrationTest {
+public class AppLiveTest {
 
     private static final String DB_NAME = "myMongoDb";
     private MongodExecutable mongodExe;

persistence-modules/java-mongodb/src/test/java/com/baeldung/geo/MongoGeospatialLiveTest.java

@@ -0,0 +1,110 @@
+package com.baeldung.geo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bson.Document;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.mongodb.MongoClient;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Indexes;
+import com.mongodb.client.model.geojson.Point;
+import com.mongodb.client.model.geojson.Polygon;
+import com.mongodb.client.model.geojson.Position;
+
+public class MongoGeospatialLiveTest {
+
+    private MongoClient mongoClient;
+    private MongoDatabase db;
+    private MongoCollection<Document> collection;
+
+    @Before
+    public void setup() {
+        if (mongoClient == null) {
+            mongoClient = new MongoClient();
+            db = mongoClient.getDatabase("myMongoDb");
+            collection = db.getCollection("places");
+            collection.deleteMany(new Document());
+            collection.createIndex(Indexes.geo2dsphere("location"));
+            collection.insertOne(Document.parse("{'name':'Big Ben','location': {'coordinates':[-0.1268194,51.5007292],'type':'Point'}}"));
+            collection.insertOne(Document.parse("{'name':'Hyde Park','location': {'coordinates': [[[-0.159381,51.513126],[-0.189615,51.509928],[-0.187373,51.502442], [-0.153019,51.503464],[-0.159381,51.513126]]],'type':'Polygon'}}"));
+        }
+    }
+
+    @Test
+    public void givenNearbyLocation_whenSearchNearby_thenFound() {
+        Point currentLoc = new Point(new Position(-0.126821, 51.495885));
+        FindIterable<Document> result = collection.find(Filters.near("location", currentLoc, 1000.0, 10.0));
+
+        assertNotNull(result.first());
+        assertEquals("Big Ben", result.first().get("name"));
+    }
+
+    @Test
+    public void givenFarLocation_whenSearchNearby_thenNotFound() {
+        Point currentLoc = new Point(new Position(-0.5243333, 51.4700223));
+        FindIterable<Document> result = collection.find(Filters.near("location", currentLoc, 5000.0, 10.0));
+
+        assertNull(result.first());
+    }
+
+    @Test
+    public void givenNearbyLocation_whenSearchWithinCircleSphere_thenFound() {
+        double distanceInRad = 5.0 / 6371;
+        FindIterable<Document> result = collection.find(Filters.geoWithinCenterSphere("location", -0.1435083, 51.4990956, distanceInRad));
+
+        assertNotNull(result.first());
+        assertEquals("Big Ben", result.first().get("name"));
+    }
+
+    @Test
+    public void givenNearbyLocation_whenSearchWithinBox_thenFound() {
+        double lowerLeftX = -0.1427638;
+        double lowerLeftY = 51.4991288;
+        double upperRightX = -0.1256209;
+        double upperRightY = 51.5030272;
+
+        FindIterable<Document> result = collection.find(Filters.geoWithinBox("location", lowerLeftX, lowerLeftY, upperRightX, upperRightY));
+
+        assertNotNull(result.first());
+        assertEquals("Big Ben", result.first().get("name"));
+    }
+
+    @Test
+    public void givenNearbyLocation_whenSearchWithinPolygon_thenFound() {
+        ArrayList<List<Double>> points = new ArrayList<List<Double>>();
+        points.add(Arrays.asList(-0.1439, 51.4952)); // victoria station
+        points.add(Arrays.asList(-0.1121, 51.4989));// Lambeth North
+        points.add(Arrays.asList(-0.13, 51.5163));// Tottenham Court Road
+        points.add(Arrays.asList(-0.1439, 51.4952)); // victoria station
+        FindIterable<Document> result = collection.find(Filters.geoWithinPolygon("location", points));
+
+        assertNotNull(result.first());
+        assertEquals("Big Ben", result.first().get("name"));
+    }
+
+    @Test
+    public void givenNearbyLocation_whenSearchUsingIntersect_thenFound() {
+        ArrayList<Position> positions = new ArrayList<Position>();
+        positions.add(new Position(-0.1439, 51.4952));
+        positions.add(new Position(-0.1346, 51.4978));
+        positions.add(new Position(-0.2177, 51.5135));
+        positions.add(new Position(-0.1439, 51.4952));
+        Polygon geometry = new Polygon(positions);
+        FindIterable<Document> result = collection.find(Filters.geoIntersects("location", geometry));
+
+        assertNotNull(result.first());
+        assertEquals("Hyde Park", result.first().get("name"));
+    }
+
+}

persistence-modules/java-mongodb/src/test/java/com/baeldung/tagging/TaggingLiveTest.java

@@ -16,7 +16,7 @@ import org.junit.Test;
  * @author Donato Rimenti
  *
  */
-public class TaggingIntegrationTest {
+public class TaggingLiveTest {
 
 	/**
 	 * Object to test.

persistence-modules/spring-data-jpa-2/README.md

@@ -12,4 +12,6 @@
 - [Spring Data JPA Projections](https://www.baeldung.com/spring-data-jpa-projections)
 - [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)
 - [Spring Data JPA Delete and Relationships](https://www.baeldung.com/spring-data-jpa-delete)
+- [Spring Data JPA and Named Entity Graphs](https://www.baeldung.com/spring-data-jpa-named-entity-graphs)
+- [Batch Insert/Update with Hibernate/JPA](https://www.baeldung.com/jpa-hibernate-batch-insert-update)
 - [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)

persistence-modules/spring-persistence-simple/README.md

@@ -7,13 +7,12 @@
 - [A Guide to JPA with Spring](https://www.baeldung.com/the-persistence-layer-with-spring-and-jpa)
 - [Bootstrapping Hibernate 5 with Spring](http://www.baeldung.com/hibernate-5-spring)
 - [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
-- [DAO with Spring and Generics](https://www.baeldung.com/simplifying-the-data-access-layer-with-spring-and-java-generics)
+- [Simplify the DAO with Spring and Java Generics](https://www.baeldung.com/simplifying-the-data-access-layer-with-spring-and-java-generics)
 - [Transactions with Spring and JPA](https://www.baeldung.com/transaction-configuration-with-jpa-and-spring)
 - [Introduction to Spring Data JPA](http://www.baeldung.com/the-persistence-layer-with-spring-data-jpa)
 - [Spring Data JPA @Query](http://www.baeldung.com/spring-data-jpa-query)
 - [Spring JDBC](https://www.baeldung.com/spring-jdbc-jdbctemplate)
 
-
 ### Eclipse Config 
 After importing the project into Eclipse, you may see the following error:  
 "No persistence xml file found in project"

quarkus/README.md

@@ -0,0 +1,3 @@
+## Relevant articles:
+
+- [Guide to QuarkusIO](hhttps://www.baeldung.com/quarkus-io)