Skip to content

Commit 036ccde

Browse files
mp911deodrotbohm
authored andcommitted
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.
1 parent 3029210 commit 036ccde

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.springframework.data.repository.config.DefaultRepositoryConfiguration;
4545
import org.springframework.data.repository.config.RepositoryBeanNameGenerator;
4646
import org.springframework.data.repository.config.SpringDataAnnotationBeanNameGenerator;
47-
import org.springframework.data.repository.query.QueryLookupStrategy;
4847
import org.springframework.lang.Nullable;
4948
import org.springframework.util.Assert;
5049
import org.springframework.util.ClassUtils;
@@ -430,11 +429,5 @@ static enum DefaultCdiRepositoryConfiguration implements CdiRepositoryConfigurat
430429
public String getRepositoryImplementationPostfix() {
431430
return DefaultRepositoryConfiguration.DEFAULT_REPOSITORY_IMPLEMENTATION_POSTFIX;
432431
}
433-
434-
@Override
435-
public QueryLookupStrategy.Key getQueryLookupStrategy() {
436-
return DefaultRepositoryConfiguration.DEFAULT_QUERY_LOOKUP_STRATEGY;
437-
}
438-
439432
}
440433
}

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
package org.springframework.data.repository.cdi;
1818

19+
import org.springframework.data.repository.config.DefaultRepositoryConfiguration;
1920
import org.springframework.data.repository.query.QueryLookupStrategy;
2021

2122
/**
2223
* Interface containing the configurable options for the Spring Data repository subsystem using CDI.
2324
*
2425
* @author Mark Paluch
26+
* @author Fabian Henniges
2527
*/
2628
public interface CdiRepositoryConfiguration {
2729

@@ -32,12 +34,13 @@ public interface CdiRepositoryConfiguration {
3234
*/
3335
String getRepositoryImplementationPostfix();
3436

35-
3637
/**
37-
* Return the strategy to lookup queries
38+
* Return the strategy to lookup queries.
3839
*
39-
* @return the lookup strategy to use
40+
* @return the lookup strategy to use.
41+
* @since 2.1
4042
*/
41-
QueryLookupStrategy.Key getQueryLookupStrategy();
42-
43+
default QueryLookupStrategy.Key getQueryLookupStrategy() {
44+
return DefaultRepositoryConfiguration.DEFAULT_QUERY_LOOKUP_STRATEGY;
45+
}
4346
}

0 commit comments

Comments
 (0)