From c1b933a3ee6a893d64956e55cdb8dbc38507c71c Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Tue, 28 Apr 2015 16:26:54 +0200
Subject: [PATCH] DATAGRAPH-617 - Adapt to changes in Spring Data Commons.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tweaked method signatures in Neo4jRepositoryFactory after some signature changes in Spring Data Commons. Use newly introduced getTragetRepositoryViaReflection(…) to obtain the repository instance via the super class.

Added repositoryBaseClass() attribute to @EnableNeo4jRepositories.

Related tickets: DATACMNS-542.
---
 .../neo4j/config/EnableNeo4jRepositories.java | 11 +++++++-
 .../repository/GraphRepositoryFactory.java    | 28 ++++++-------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java
index 2fefac0b7..067c7914a 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/EnableNeo4jRepositories.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.neo4j.repository.GraphRepositoryFactoryBean;
 import org.springframework.data.neo4j.support.Neo4jTemplate;
+import org.springframework.data.repository.config.DefaultRepositoryBaseClass;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 
@@ -98,6 +99,14 @@ public @interface EnableNeo4jRepositories {
 	 * {@link GraphRepositoryFactoryBean}.
 	 */
 	Class<?> repositoryFactoryBeanClass() default GraphRepositoryFactoryBean.class;
+	
+	/**
+	 * Configure the repository base class to be used to create repository proxies for this particular configuration.
+	 * 
+	 * @return
+	 * @since 3.4
+	 */
+	Class<?> repositoryBaseClass() default DefaultRepositoryBaseClass.class;
 
 	/**
 	 * Returns the name of the {@link Neo4jTemplate} bean to be used with the repository factory. Defaults to
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactory.java
index 44362f541..103958f32 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactory.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import org.springframework.data.neo4j.support.Neo4jTemplate;
 import org.springframework.data.neo4j.support.mapping.Neo4jMappingContext;
 import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.core.NamedQueries;
+import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.data.repository.query.*;
@@ -32,6 +33,7 @@ import java.lang.reflect.Method;
 
 /**
  * @author mh
+ * @author Oliver Gierke
  * @since 28.03.11
  */
 public class GraphRepositoryFactory extends RepositoryFactorySupport {
@@ -58,27 +60,15 @@ public class GraphRepositoryFactory extends RepositoryFactorySupport {
 
     /*
      * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.data.repository.support.RepositoryFactorySupport#
-     * getTargetRepository(java.lang.Class)
-     */
+     * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation)
+     */	
     @Override
-    protected Object getTargetRepository(RepositoryMetadata metadata) {
-        return getTargetRepository(metadata, template);
+    protected Object getTargetRepository(RepositoryInformation information) {
+    		return getTargetRepository(information, template);
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    protected Object getTargetRepository(RepositoryMetadata metadata, Neo4jTemplate template) {
-
-        Class<?> type = metadata.getDomainType();
-        GraphEntityInformation entityInformation = (GraphEntityInformation)getEntityInformation(type);
-        // todo entityInformation.isGraphBacked();
-        if (entityInformation.isNodeEntity()) {
-            return new NodeGraphRepositoryImpl(type, template);
-        } else {
-            return new RelationshipGraphRepository(type, template);
-        }
+    protected Object getTargetRepository(RepositoryInformation metadata, Neo4jTemplate template) {
+    		return getTargetRepositoryViaReflection(metadata, template);
     }
 
     @Override