From 036ccde5ce224c2a1fcc0f131d3de3f46695b846 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 5 Feb 2018 16:54:19 +0100
Subject: [PATCH] DATACMNS-1255 - Polishing.

Add default QueryLookupStrategy key lookup method to CdiRepositoryConfiguration to not break existing modules by forcing these to implement a new method.

Original pull request: #272.
---
 .../data/repository/cdi/CdiRepositoryBean.java      |  7 -------
 .../repository/cdi/CdiRepositoryConfiguration.java  | 13 ++++++++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java
index 10f1b777b..9342d144b 100644
--- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java
+++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java
@@ -44,7 +44,6 @@ import org.springframework.data.repository.config.CustomRepositoryImplementation
 import org.springframework.data.repository.config.DefaultRepositoryConfiguration;
 import org.springframework.data.repository.config.RepositoryBeanNameGenerator;
 import org.springframework.data.repository.config.SpringDataAnnotationBeanNameGenerator;
-import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -430,11 +429,5 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
 		public String getRepositoryImplementationPostfix() {
 			return DefaultRepositoryConfiguration.DEFAULT_REPOSITORY_IMPLEMENTATION_POSTFIX;
 		}
-
-		@Override
-		public QueryLookupStrategy.Key getQueryLookupStrategy() {
-			return DefaultRepositoryConfiguration.DEFAULT_QUERY_LOOKUP_STRATEGY;
-		}
-
 	}
 }
diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryConfiguration.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryConfiguration.java
index 1fff25a5a..30ba10065 100644
--- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryConfiguration.java
+++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryConfiguration.java
@@ -16,12 +16,14 @@
 
 package org.springframework.data.repository.cdi;
 
+import org.springframework.data.repository.config.DefaultRepositoryConfiguration;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 
 /**
  * Interface containing the configurable options for the Spring Data repository subsystem using CDI.
  *
  * @author Mark Paluch
+ * @author Fabian Henniges
  */
 public interface CdiRepositoryConfiguration {
 
@@ -32,12 +34,13 @@ public interface CdiRepositoryConfiguration {
 	 */
 	String getRepositoryImplementationPostfix();
 
-
 	/**
-	 * Return the strategy to lookup queries
+	 * Return the strategy to lookup queries.
 	 *
-	 * @return the lookup strategy to use
+	 * @return the lookup strategy to use.
+	 * @since 2.1
 	 */
-	QueryLookupStrategy.Key getQueryLookupStrategy();
-
+	default QueryLookupStrategy.Key getQueryLookupStrategy() {
+		return DefaultRepositoryConfiguration.DEFAULT_QUERY_LOOKUP_STRATEGY;
+	}
 }