We're now able to use Spring Data there

see: https://jira.springsource.org/browse/DATAJPA-292

src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaOwnerRepositoryImpl.java → src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java

@@ -17,54 +17,25 @@ package org.springframework.samples.petclinic.repository.springdatajpa;
 
 import java.util.Collection;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
 import org.springframework.samples.petclinic.model.Owner;
 import org.springframework.samples.petclinic.repository.OwnerRepository;
-import org.springframework.stereotype.Repository;
 
 /**
- * Using native JPA instead of Spring Data JPA here because of this query: "SELECT owner FROM Owner owner left join
- * fetch owner.pets WHERE owner.lastName LIKE :lastName" See https://jira.springsource.org/browse/DATAJPA-292 for more
- * details.
- * This issue has been fixed already in the latest Spring Data JPA Snapshot. So we will wait for the next version of Spring 
- * Data JPA to be available and update the Spring Petclinic application consequently.
+ * Spring Data JPA specialization of the {@link OwnerRepository} interface
  *
  * @author Michael Isvy
+ * @since 15.1.2013
  */
-@Repository
-public class JpaOwnerRepositoryImpl implements OwnerRepository {
-
-    @PersistenceContext
-    private EntityManager em;
-
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Collection<Owner> findByLastName(String lastName) {
-        // using 'join fetch' because a single query should load both owners and pets
-        // using 'left join fetch' because it might happen that an owner does not have pets yet
-        Query query = this.em.createQuery("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName");
-        query.setParameter("lastName", lastName + "%");
-        return query.getResultList();
-    }
-
-    @Override
-    public Owner findById(int id) {
-        // using 'join fetch' because a single query should load both owners and pets
-        // using 'left join fetch' because it might happen that an owner does not have pets yet
-        Query query = this.em.createQuery("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id");
-        query.setParameter("id", id);
-        return (Owner) query.getSingleResult();
-    }
-
-
-    @Override
-    public void save(Owner owner) {
-        this.em.merge(owner);
-
-    }
-
+public interface SpringDataOwnerRepository extends OwnerRepository, Repository<Owner, Integer> {
+		
+		@Override
+	    @Query("SELECT DISTINCT owner FROM Owner owner left join fetch owner.pets WHERE owner.lastName LIKE :lastName%")
+	    public Collection<Owner> findByLastName(@Param("lastName") String lastName);
+		
+		@Override
+		@Query("SELECT owner FROM Owner owner left join fetch owner.pets WHERE owner.id =:id")
+	    public Owner findById(@Param("id") int id);
 }

src/main/resources/logback.xml

@@ -14,6 +14,7 @@
         </encoder>
     </appender>
 
+	<!--<logger name="org.hibernate" level="debug"/> -->
     <logger name="org.springframework.samples.petclinic" level="debug"/>
          
     <root level="info">

src/main/resources/spring/business-config.xml

@@ -80,9 +80,5 @@
 
     <beans profile="spring-data-jpa">
         <jpa:repositories base-package="org.springframework.samples.petclinic.repository.springdatajpa"/>
-
-        <!-- Custom configuration for the custom implementation based on JPA -->
-        <bean id="ownerRepository"
-              class="org.springframework.samples.petclinic.repository.springdatajpa.JpaOwnerRepositoryImpl"/>
     </beans>
 </beans>
\ No newline at end of file

src/test/resources/logback-test.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="true">
-
-    <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
-        <resetJUL>true</resetJUL>
-    </contextListener>
-
-    <!-- To enable JMX Management -->
-    <jmxConfigurator/>
-
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%-5level %logger{0} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.springframework.samples.petclinic" level="debug"/>
-    <logger name="org.springframework.test.web" level="trace"/>
-
-    <root level="warn">
-        <appender-ref ref="console"/>
-    </root>
-</configuration>