Updated examples and showcase to latest API changes.

Author: odrotbohm

pom.xml

@@ -73,7 +73,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
-			<version>1.0.0.M1</version>
+			<version>1.0.0.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/UserRepositoryImpl.java

@@ -6,6 +6,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.criteria.CriteriaQuery;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.example.domain.User;
 
 
@@ -41,6 +42,9 @@ class UserRepositoryImpl implements UserRepositoryCustom {
     @PersistenceContext
     private EntityManager em;
 
+    @Autowired
+    private UserRepository repo;
+
 
     /**
      * Configure the entity manager to be used.

spring-data-jpa-example/src/main/java/org/springframework/data/jpa/example/repository/UserRepositoryJdbcImpl.java

@@ -4,6 +4,7 @@
 import java.sql.SQLException;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.example.domain.User;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
@@ -37,6 +38,8 @@ class UserRepositoryJdbcImpl extends JdbcDaoSupport implements
 
     private static final String COMPLICATED_SQL = "SELECT * FROM User";
 
+    @Autowired
+    private UserRepository repo;
 
     /*
      * (non-Javadoc)

spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/BasicSample.java

@@ -35,7 +35,7 @@ public void setUp() {
             Persistence.createEntityManagerFactory("jpa.sample.plain");
         em = factory.createEntityManager();
 
-        userRepository = SimpleJpaRepository.create(User.class, em);
+        userRepository = new SimpleJpaRepository<User, Long>(User.class, em);
 
         em.getTransaction().begin();
     }
@@ -61,6 +61,6 @@ public void savingUsers() {
 
         user = userRepository.save(user);
 
-        assertEquals(user, userRepository.findById(user.getId()));
+        assertEquals(user, userRepository.findOne(user.getId()));
     }
 }

spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/SimpleUserRepositorySample.java

@@ -48,7 +48,7 @@ public void testInsert() {
 
         user = repository.save(user);
 
-        assertEquals(user, repository.findById(user.getId()));
+        assertEquals(user, repository.findOne(user.getId()));
     }
 
 

spring-data-jpa-example/src/test/java/org/springframework/data/jpa/example/repository/UserRepositorySample.java

@@ -8,7 +8,6 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.example.domain.User;
-import org.springframework.data.jpa.example.repository.UserRepository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,7 +38,7 @@ public void testInsert() {
 
         user = repository.save(user);
 
-        assertEquals(user, repository.findById(user.getId()));
+        assertEquals(user, repository.findOne(user.getId()));
     }
 
 

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

@@ -3,6 +3,7 @@
 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;
 
 
@@ -11,7 +12,8 @@
  * 
  * @author Oliver Gierke
  */
-public interface CustomerRepository extends JpaRepository<Customer, Long> {
+public interface CustomerRepository extends JpaRepository<Customer, Long>,
+        JpaSpecificationExecutor<Customer> {
 
     /**
      * Returns a page of {@link Customer}s with the given lastname.

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

@@ -25,12 +25,11 @@ public class CustomerRepositoryIntegrationTest {
 
     public void findsCustomersBySpecification() throws Exception {
 
-        Customer dave = repository.findById(1L);
+        Customer dave = repository.findOne(1L);
 
         LocalDate expiryLimit = new LocalDate(2011, 3, 1);
         List<Customer> result =
-                repository
-                        .findAll(where(accountExpiresBefore(expiryLimit)));
+                repository.findAll(where(accountExpiresBefore(expiryLimit)));
 
         assertThat(result.size(), is(1));
         assertThat(result, hasItems(dave));

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

@@ -29,7 +29,7 @@ public class AccountRepositoryIntegrationTest extends AbstractShowcaseTest {
     @Test
     public void findsCustomersAccounts() throws Exception {
 
-        Customer customer = customerRepository.findById(1L);
+        Customer customer = customerRepository.findOne(1L);
         List<Account> accounts = accountRepository.findByCustomer(customer);
 
         assertFalse(accounts.isEmpty());

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

@@ -48,7 +48,7 @@ public void findsFirstPageOfMatthews() throws Exception {
     @Test
     public void findsCustomerById() throws Exception {
 
-        Customer customer = repository.findById(2L);
+        Customer customer = repository.findOne(2L);
 
         assertThat(customer.getFirstname(), is("Carter"));
         assertThat(customer.getLastname(), is("Beauford"));