Fixed conflicts

persistence-modules/hibernate5-2/README.md

@@ -1,3 +1,3 @@
 ### Relevant Articles:
 - [Hibernate Error “Not all named parameters have been set”](https://www.baeldung.com/hibernate-error-named-parameters-not-set)
-
+- [FetchMode in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-fetchmode)

persistence-modules/spring-boot-persistence-h2/pom.xml

@@ -22,6 +22,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/daos/ItemRepository.java

@@ -0,0 +1,9 @@
+package com.baeldung.h2db.springboot.daos;
+
+import com.baeldung.h2db.springboot.models.Item;
+import org.springframework.data.repository.CrudRepository;
+
+import java.math.BigDecimal;
+
+public interface ItemRepository extends CrudRepository<Item, BigDecimal> {
+}

persistence-modules/spring-boot-persistence-h2/src/main/java/com/baeldung/h2db/springboot/models/Item.java

@@ -0,0 +1,18 @@
+package com.baeldung.h2db.springboot.models;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Entity
+public class Item {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotNull
+    private BigDecimal price;
+}

persistence-modules/spring-boot-persistence-h2/src/main/resources/application.properties

@@ -3,6 +3,10 @@ spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
 spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.validator.apply_to_ddl=false
+#spring.jpa.properties.hibernate.check_nullability=true
 spring.h2.console.enabled=true
 spring.h2.console.path=/h2-console
 debug=true

persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/ItemIntegrationTest.java

@@ -0,0 +1,29 @@
+package com.baeldung;
+
+import com.baeldung.h2db.springboot.SpringBootH2Application;
+import com.baeldung.h2db.springboot.daos.ItemRepository;
+import com.baeldung.h2db.springboot.models.Item;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.validation.ConstraintViolationException;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootH2Application.class)
+public class ItemIntegrationTest {
+
+    @Autowired
+    private ItemRepository itemRepository;
+
+    @Test
+    public void shouldNotAllowToPersistNullItemsPrice() {
+        assertThatThrownBy(() -> itemRepository.save(new Item()))
+                .hasRootCauseInstanceOf(ConstraintViolationException.class)
+                .hasStackTraceContaining("must not be null");
+    }
+}

persistence-modules/spring-data-geode/README.md

@@ -0,0 +1,3 @@
+### Relevant Articles:
+
+- [Intro to Spring Data Geode](https://www.baeldung.com/spring-data-geode)

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

@@ -9,3 +9,4 @@
 - [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)
+- [Customizing the Result of JPA Queries with Aggregation Functions](https://www.baeldung.com/jpa-queries-custom-result-with-aggregation-functions)

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

@@ -10,6 +10,7 @@
 - [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)
 - [Programmatic Transaction Management in Spring](https://www.baeldung.com/spring-programmatic-transaction-management)
+- [A Guide to Spring’s Open Session In View](https://www.baeldung.com/spring-open-session-in-view)
 
 ### Eclipse Config 
 After importing the project into Eclipse, you may see the following error: