DATACMNS-1255 - Polishing.

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

Author: mp911de

src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java

@@ -44,15 +44,14 @@
 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;
 import org.springframework.util.StringUtils;
 
 /**
  * Base class for {@link Bean} wrappers.
- * 
+ *
  * @author Dirk Mahler
  * @author Oliver Gierke
  * @author Mark Paluch
@@ -79,7 +78,7 @@ public abstract class CdiRepositoryBean<T> implements Bean<T>, PassivationCapabl
 
 	/**
 	 * Creates a new {@link CdiRepositoryBean}.
-	 * 
+	 *
 	 * @param qualifiers must not be {@literal null}.
 	 * @param repositoryType has to be an interface must not be {@literal null}.
 	 * @param beanManager the CDI {@link BeanManager}, must not be {@literal null}.
@@ -90,7 +89,7 @@ public CdiRepositoryBean(Set<Annotation> qualifiers, Class<T> repositoryType, Be
 
 	/**
 	 * Creates a new {@link CdiRepositoryBean}.
-	 * 
+	 *
 	 * @param qualifiers must not be {@literal null}.
 	 * @param repositoryType has to be an interface must not be {@literal null}.
 	 * @param beanManager the CDI {@link BeanManager}, must not be {@literal null}.
@@ -114,7 +113,7 @@ public CdiRepositoryBean(Set<Annotation> qualifiers, Class<T> repositoryType, Be
 
 	/**
 	 * Creates a unique identifier for the given repository type and the given annotations.
-	 * 
+	 *
 	 * @param qualifiers must not be {@literal null} or contain {@literal null} values.
 	 * @param repositoryType must not be {@literal null}.
 	 * @return
@@ -148,7 +147,7 @@ public Set<Type> getTypes() {
 
 	/**
 	 * Returns an instance of an the given {@link Bean}.
-	 * 
+	 *
 	 * @param bean the {@link Bean} about to create an instance for.
 	 * @return the actual component instance.
 	 * @see Bean#getTypes()
@@ -160,7 +159,7 @@ protected <S> S getDependencyInstance(Bean<S> bean) {
 	/**
 	 * Returns an instance of an the given {@link Bean} and allows to be specific about the type that is about to be
 	 * created.
-	 * 
+	 *
 	 * @param bean the {@link Bean} about to create an instance for.
 	 * @param type the expected type of the component instance created for that {@link Bean}. We need to hand this
 	 *          parameter explicitly as the {@link Bean} might carry multiple types but the primary one might not be the
@@ -219,7 +218,7 @@ public void destroy(@SuppressWarnings("null") T instance,
 	/**
 	 * Looks up an instance of a {@link CdiRepositoryConfiguration}. In case the instance cannot be found within the CDI
 	 * scope, a default configuration is used.
-	 * 
+	 *
 	 * @return an available CdiRepositoryConfiguration instance or a default configuration.
 	 */
 	protected CdiRepositoryConfiguration lookupConfiguration(BeanManager beanManager, Set<Annotation> qualifiers) {
@@ -232,7 +231,7 @@ protected CdiRepositoryConfiguration lookupConfiguration(BeanManager beanManager
 	/**
 	 * Try to lookup a custom implementation for a {@link org.springframework.data.repository.Repository}. Can only be
 	 * used when a {@code CustomRepositoryImplementationDetector} is provided.
-	 * 
+	 *
 	 * @param repositoryType
 	 * @param beanManager
 	 * @param qualifiers
@@ -253,7 +252,7 @@ private Optional<Bean<?>> getCustomImplementationBean(Class<?> repositoryType, B
 	/**
 	 * Retrieves a custom repository interfaces from a repository type. This works for the whole class hierarchy and can
 	 * find also a custom repository which is inherited over many levels.
-	 * 
+	 *
 	 * @param repositoryType The class representing the repository.
 	 * @param cdiRepositoryConfiguration The configuration for CDI usage.
 	 * @return the interface class or {@literal null}.
@@ -377,7 +376,7 @@ public String getId() {
 
 	/**
 	 * Creates the actual component instance.
-	 * 
+	 *
 	 * @param creationalContext will never be {@literal null}.
 	 * @param repositoryType will never be {@literal null}.
 	 * @return
@@ -395,7 +394,7 @@ protected T create(CreationalContext<T> creationalContext, Class<T> repositoryTy
 
 	/**
 	 * Creates the actual component instance.
-	 * 
+	 *
 	 * @param creationalContext will never be {@literal null}.
 	 * @param repositoryType will never be {@literal null}.
 	 * @param customImplementation can be {@literal null}.
@@ -430,11 +429,5 @@ static enum DefaultCdiRepositoryConfiguration implements CdiRepositoryConfigurat
 		public String getRepositoryImplementationPostfix() {
 			return DefaultRepositoryConfiguration.DEFAULT_REPOSITORY_IMPLEMENTATION_POSTFIX;
 		}
-
-		@Override
-		public QueryLookupStrategy.Key getQueryLookupStrategy() {
-			return DefaultRepositoryConfiguration.DEFAULT_QUERY_LOOKUP_STRATEGY;
-		}
-
 	}
 }

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 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;
+	}
 }