fix conflicts

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

@@ -5,7 +5,7 @@
 ### Relevant Articles: 
 - [Spring JPA – Multiple Databases](http://www.baeldung.com/spring-data-jpa-multiple-databases)
 - [Spring Data JPA – Adding a Method in All Repositories](http://www.baeldung.com/spring-data-jpa-method-in-all-repositories)
-- [Advanced Tagging Implementation with JPA](http://www.baeldung.com/jpa-tagging-advanced)
+- [An Advanced Tagging Implementation with JPA](http://www.baeldung.com/jpa-tagging-advanced)
 - [Spring Data JPA @Query](http://www.baeldung.com/spring-data-jpa-query)
 - [Spring Data Annotations](http://www.baeldung.com/spring-data-annotations)
 - [Spring Data Java 8 Support](http://www.baeldung.com/spring-data-java-8)
@@ -20,6 +20,9 @@
 - [INSERT Statement in JPA](https://www.baeldung.com/jpa-insert)
 - [Pagination and Sorting using Spring Data JPA](https://www.baeldung.com/spring-data-jpa-pagination-sorting)
 - [Spring Data JPA Query by Example](https://www.baeldung.com/spring-data-query-by-example)
+- [DB Integration Tests with Spring Boot and Testcontainers](https://www.baeldung.com/spring-boot-testcontainers-integration-test)
+- [Spring Data JPA @Modifying Annotation](https://www.baeldung.com/spring-data-jpa-modifying-annotation)
+- [Spring Data JPA Batch Inserts](https://www.baeldung.com/spring-data-jpa-batch-inserts)
 
 ### Eclipse Config 
 After importing the project into Eclipse, you may see the following error:  

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

@@ -53,6 +53,15 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+        <groupId>org.springframework.boot</groupId>
+           <artifactId>spring-boot-starter-test</artifactId>
+           <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>

persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/CustomerController.java

@@ -0,0 +1,43 @@
+package com.baeldung.batchinserts;
+
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.batchinserts.model.Customer;
+import com.baeldung.batchinserts.repository.CustomerRepository;
+
+/**
+ * A simple controller to test the JPA CrudRepository operations
+ * controllers
+ * 
+ * @author ysharma2512
+ *
+ */
+@RestController
+public class CustomerController {
+
+    @Autowired
+    CustomerRepository customerRepository;
+
+    public CustomerController(CustomerRepository customerRepository2) {
+        this.customerRepository = customerRepository2;
+    }
+
+    @PostMapping("/customers")
+    public ResponseEntity<List<Customer>> insertCustomers() throws URISyntaxException {
+        Customer c1 = new Customer("James", "Gosling");
+        Customer c2 = new Customer("Doug", "Lea");
+        Customer c3 = new Customer("Martin", "Fowler");
+        Customer c4 = new Customer("Brian", "Goetz");
+        List<Customer> customers = Arrays.asList(c1, c2, c3, c4);
+        customerRepository.saveAll(customers);
+        return ResponseEntity.ok(customers);
+    }
+
+}

persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/model/Customer.java

@@ -0,0 +1,56 @@
+package com.baeldung.batchinserts.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * Customer Entity class
+ * @author ysharma2512
+ *
+ */
+@Entity
+public class Customer {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    private String firstName;
+    private String lastName;
+
+    public Customer(String firstName, String lastName) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
+    }
+
+}

persistence-modules/spring-data-jpa/src/main/java/com/baeldung/batchinserts/repository/CustomerRepository.java

@@ -0,0 +1,15 @@
+package com.baeldung.batchinserts.repository;
+
+import org.springframework.data.repository.CrudRepository;
+
+import com.baeldung.batchinserts.model.Customer;
+
+/**
+ * JPA CrudRepository interface
+ * 
+ * @author ysharma2512
+ *
+ */
+public interface CustomerRepository extends CrudRepository<Customer, Long>{
+
+}

persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/CustomItemRepository.java

@@ -12,4 +12,5 @@ public interface CustomItemRepository {
     Item findItemById(Long id);
 
     void findThenDelete(Long id);
+
 }

persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/daos/impl/CustomItemRepositoryImpl.java

@@ -29,4 +29,5 @@ public class CustomItemRepositoryImpl implements CustomItemRepository {
         final Item item = entityManager.find(Item.class, id);
         entityManager.remove(item);
     }
+
 }

persistence-modules/spring-data-jpa/src/main/java/com/baeldung/boot/passenger/PassengerRepository.java

@@ -9,9 +9,14 @@ interface PassengerRepository extends JpaRepository<Passenger, Long>, CustomPass
 
     Passenger findFirstByOrderBySeatNumberAsc();
 
+    Passenger findTopByOrderBySeatNumberAsc();
+
     List<Passenger> findByOrderBySeatNumberAsc();
     
     List<Passenger> findByLastNameOrderBySeatNumberAsc(String lastName);
     
     List<Passenger> findByLastName(String lastName, Sort sort);
+
+    List<Passenger> findByFirstNameIgnoreCase(String firstName);
+
 }

persistence-modules/spring-data-jpa/src/main/resources/application.properties

@@ -1,9 +1,10 @@
-#spring.datasource.data=import_entities.sql
-#spring.jpa.properties.hibernate.hbm2ddl.import_files=import_entities.sql
-
 spring.main.allow-bean-definition-overriding=true
 
-
 # envers.X
 #spring.jpa.properties.hibernate.hbm2ddl.import_files=import_entities.sql
-spring.datasource.data=classpath:import_entities.sql
+spring.datasource.data=classpath:import_entities.sql
+
+spring.jpa.properties.hibernate.jdbc.batch_size=4
+spring.jpa.properties.hibernate.order_inserts=true
+spring.jpa.properties.hibernate.order_updates=true
+spring.jpa.properties.hibernate.generate_statistics=true

persistence-modules/spring-data-jpa/src/test/java/com/baeldung/batchinserts/BatchInsertIntegrationTest.java

@@ -0,0 +1,44 @@
+package com.baeldung.batchinserts;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+import com.baeldung.batchinserts.CustomerController;
+import com.baeldung.batchinserts.repository.CustomerRepository;
+import com.baeldung.config.PersistenceConfiguration;
+import com.baeldung.config.PersistenceProductConfiguration;
+import com.baeldung.config.PersistenceUserConfiguration;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@AutoConfigureMockMvc
+@ContextConfiguration(classes = { PersistenceConfiguration.class, PersistenceProductConfiguration.class, PersistenceUserConfiguration.class })
+public class BatchInsertIntegrationTest {
+
+    @Autowired
+    private CustomerRepository customerRepository;
+    private MockMvc mockMvc;
+    @Before
+    public void setUp() throws Exception {
+        mockMvc = MockMvcBuilders.standaloneSetup( new CustomerController(customerRepository))
+            .build();
+    }
+
+    @Test
+    public void whenInsertingCustomers_thenCustomersAreCreated() throws Exception {
+        this.mockMvc.perform(post("/customers"))
+            .andExpect(status().isOk());
+    }    
+   
+}

persistence-modules/spring-data-jpa/src/test/java/com/baeldung/boot/passenger/PassengerRepositoryIntegrationTest.java

@@ -1,17 +1,5 @@
 package com.baeldung.boot.passenger;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-import java.util.Optional;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,6 +15,18 @@ import org.springframework.test.context.junit4.SpringRunner;
 import com.baeldung.boot.passenger.Passenger;
 import com.baeldung.boot.passenger.PassengerRepository;
 
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import java.util.List;
+import java.util.Optional;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+
 @DataJpaTest
 @RunWith(SpringRunner.class)
 public class PassengerRepositoryIntegrationTest {
@@ -155,18 +155,36 @@ public class PassengerRepositoryIntegrationTest {
         Passenger fred = Passenger.from("Fred", "Bloggs", 22);
         Passenger siya = Passenger.from("Siya", "Kolisi", 85);
         Passenger ricki = Passenger.from("Ricki", "Bobbie", 36);
-    
+
         ExampleMatcher ignoringExampleMatcher = ExampleMatcher.matchingAny().withMatcher("lastName",
-          ExampleMatcher.GenericPropertyMatchers.startsWith().ignoreCase()).withIgnorePaths("firstName", "seatNumber");
-    
+            ExampleMatcher.GenericPropertyMatchers.startsWith().ignoreCase()).withIgnorePaths("firstName", "seatNumber");
+
         Example<Passenger> example = Example.of(Passenger.from(null, "b", null),
-          ignoringExampleMatcher);
-    
+            ignoringExampleMatcher);
+
         List<Passenger> passengers = repository.findAll(example);
-    
+
         assertThat(passengers, contains(fred, ricki));
         assertThat(passengers, not(contains(jill)));
         assertThat(passengers, not(contains(eve)));
         assertThat(passengers, not(contains(siya)));
     }
+
+    @Test
+    public void givenPassengers_whenMatchingIgnoreCase_thenExpectedReturned() {
+        Passenger jill = Passenger.from("Jill", "Smith", 50);
+        Passenger eve = Passenger.from("Eve", "Jackson", 95);
+        Passenger fred = Passenger.from("Fred", "Bloggs", 22);
+        Passenger siya = Passenger.from("Siya", "Kolisi", 85);
+        Passenger ricki = Passenger.from("Ricki", "Bobbie", 36);
+
+        List<Passenger> passengers = repository.findByFirstNameIgnoreCase("FRED");
+
+        assertThat(passengers, contains(fred));
+        assertThat(passengers, not(contains(eve)));
+        assertThat(passengers, not(contains(siya)));
+        assertThat(passengers, not(contains(jill)));
+        assertThat(passengers, not(contains(ricki)));
+
+    }
 }