Adapted latest changes in Spring Data Commons.

Extend CrudRepository instead of JpaRepository. Use QueryDslPredicateExecutor from Spring Data Commons.

Author: odrotbohm

spring-data-jpa-showcase/src/main/java/org/springframework/data/jpa/showcase/after/CustomerRepository.java

@@ -2,25 +2,23 @@
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.showcase.core.Customer;
-
+import org.springframework.data.repository.CrudRepository;
 
 /**
  * Repository to manage {@link Customer} instances.
  * 
  * @author Oliver Gierke
  */
-public interface CustomerRepository extends JpaRepository<Customer, Long>,
-        JpaSpecificationExecutor<Customer> {
+public interface CustomerRepository extends CrudRepository<Customer, Long>, JpaSpecificationExecutor<Customer> {
 
-    /**
-     * Returns a page of {@link Customer}s with the given lastname.
-     * 
-     * @param lastname
-     * @param pageable
-     * @return
-     */
-    Page<Customer> findByLastname(String lastname, Pageable pageable);
+	/**
+	 * Returns a page of {@link Customer}s with the given lastname.
+	 * 
+	 * @param lastname
+	 * @param pageable
+	 * @return
+	 */
+	Page<Customer> findByLastname(String lastname, Pageable pageable);
 }

spring-data-jpa-showcase/src/test/java/org/springframework/data/jpa/showcase/after/CustomerRepositoryIntegrationTest.java

@@ -3,8 +3,6 @@
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-import java.util.List;
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -13,44 +11,39 @@
 import org.springframework.data.jpa.showcase.core.Customer;
 import org.springframework.test.context.ContextConfiguration;
 
-
 /**
  * @author Oliver Gierke
  */
 @ContextConfiguration("classpath:application-context-after.xml")
 public class CustomerRepositoryIntegrationTest extends AbstractShowcaseTest {
 
-    @Autowired
-    CustomerRepository repository;
-
-
-    @Test
-    public void findsAllCustomers() throws Exception {
-
-        List<Customer> result = repository.findAll();
+	@Autowired
+	CustomerRepository repository;
 
-        assertThat(result, is(notNullValue()));
-        assertFalse(result.isEmpty());
-    }
+	@Test
+	public void findsAllCustomers() throws Exception {
 
+		Iterable<Customer> result = repository.findAll();
 
-    @Test
-    public void findsFirstPageOfMatthews() throws Exception {
+		assertThat(result, is(notNullValue()));
+		assertTrue(result.iterator().hasNext());
+	}
 
-        Page<Customer> customers =
-                repository.findByLastname("Matthews", new PageRequest(0, 2));
+	@Test
+	public void findsFirstPageOfMatthews() throws Exception {
 
-        assertThat(customers.getContent().size(), is(2));
-        assertFalse(customers.hasPreviousPage());
-    }
+		Page<Customer> customers = repository.findByLastname("Matthews", new PageRequest(0, 2));
 
+		assertThat(customers.getContent().size(), is(2));
+		assertFalse(customers.hasPreviousPage());
+	}
 
-    @Test
-    public void findsCustomerById() throws Exception {
+	@Test
+	public void findsCustomerById() throws Exception {
 
-        Customer customer = repository.findOne(2L);
+		Customer customer = repository.findOne(2L);
 
-        assertThat(customer.getFirstname(), is("Carter"));
-        assertThat(customer.getLastname(), is("Beauford"));
-    }
+		assertThat(customer.getFirstname(), is("Carter"));
+		assertThat(customer.getLastname(), is("Beauford"));
+	}
 }