From 2959881df575421d5c26989146ea48bee0f842d0 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Tue, 5 Apr 2011 08:04:44 +0200
Subject: [PATCH] DATACMNS-24 - Adapted refactorings in Spring Data Commons
 Core.

---
 .../data/jpa/repository/support/JpaRepositoryFactory.java     | 4 ++--
 .../repository/custom/CustomGenericJpaRepositoryFactory.java  | 2 +-
 .../jpa/repository/support/JpaRepositoryFactoryUnitTests.java | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
index 7b1ad8de4..176731b51 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
@@ -107,9 +107,9 @@ public class JpaRepositoryFactory extends RepositoryFactorySupport {
      * getRepositoryBaseClass()
      */
     @Override
-    protected Class<?> getRepositoryBaseClass(Class<?> repositoryInterface) {
+    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 
-        if (isQueryDslExecutor(repositoryInterface)) {
+        if (isQueryDslExecutor(metadata.getRepositoryInterface())) {
             return QueryDslJpaRepository.class;
         } else {
             return SimpleJpaRepository.class;
diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java
index ae26bb2b6..c9b583c4b 100644
--- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java
+++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericJpaRepositoryFactory.java
@@ -72,7 +72,7 @@ public class CustomGenericJpaRepositoryFactory extends JpaRepositoryFactory {
      * getRepositoryBaseClass()
      */
     @Override
-    protected Class<?> getRepositoryBaseClass(Class<?> repositoryInterface) {
+    protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 
         return CustomGenericJpaRepository.class;
     }
diff --git a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java
index ebd956815..167d45b70 100644
--- a/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactoryUnitTests.java
@@ -34,6 +34,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.QueryDslPredicateExecutor;
 import org.springframework.data.jpa.repository.custom.CustomGenericJpaRepositoryFactory;
 import org.springframework.data.jpa.repository.custom.UserCustomExtendedRepository;
+import org.springframework.data.repository.support.DefaultRepositoryMetadata;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -154,7 +155,8 @@ public class JpaRepositoryFactoryUnitTests {
 
         when(metadata.getJavaType()).thenReturn(User.class);
         assertEquals(QueryDslJpaRepository.class,
-                factory.getRepositoryBaseClass(QueryDslSampleRepository.class));
+                factory.getRepositoryBaseClass(new DefaultRepositoryMetadata(
+                        QueryDslSampleRepository.class)));
 
         QueryDslSampleRepository repository =
                 factory.getRepository(QueryDslSampleRepository.class);