fix conflicts

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)));
+
+    }
 }