Skip to content

Commit 09558d7

Browse files
committed
Revert exposing getModulePrefix() on RepositoryConfigurationExtension.
This is a breaking change as many modules implement a protected method. We're going to change this later with #2644. Original pull request: #2635. See #2634.
1 parent 35dbda7 commit 09558d7

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private String registerRepositoryFragments(RepositoryConfiguration<?> configurat
170170
fragmentsBuilder.addConstructorArgValue(fragmentBeanNames);
171171

172172
String fragmentsBeanName = BeanDefinitionReaderUtils
173-
.uniqueBeanName(String.format("%s.%s.fragments", extension.getModulePrefix(),
173+
.uniqueBeanName(String.format("%s.%s.fragments", extension.getModuleName().toLowerCase(Locale.ROOT),
174174
ClassUtils.getShortName(configuration.getRepositoryInterface())), registry);
175175
registry.registerBeanDefinition(fragmentsBeanName, fragmentsBuilder.getBeanDefinition());
176176
return fragmentsBeanName;

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtension.java

+1-15
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
*/
1616
package org.springframework.data.repository.config;
1717

18-
import java.lang.annotation.Annotation;
1918
import java.util.Collection;
20-
import java.util.Collections;
2119

2220
import org.springframework.beans.factory.config.BeanDefinition;
2321
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
2422
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
2523
import org.springframework.core.io.ResourceLoader;
26-
import org.springframework.util.StringUtils;
2724

2825
/**
2926
* SPI to implement store specific extension to the repository bean definition registration process.
@@ -39,18 +36,7 @@ public interface RepositoryConfigurationExtension {
3936
*
4037
* @return
4138
*/
42-
default String getModuleName() {
43-
return StringUtils.capitalize(getModulePrefix());
44-
}
45-
46-
/**
47-
* Returns the prefix of the module to be used to create the default location for Spring Data named queries and module
48-
* specific bean definitions.
49-
*
50-
* @return must not be {@literal null}.
51-
* @since 3.0
52-
*/
53-
String getModulePrefix();
39+
String getModuleName();
5440

5541
/**
5642
* Returns all {@link RepositoryConfiguration}s obtained through the given {@link RepositoryConfigurationSource}.

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java

+12
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit
6060

6161
private boolean noMultiStoreSupport = false;
6262

63+
@Override
64+
public String getModuleName() {
65+
return StringUtils.capitalize(getModulePrefix());
66+
}
67+
6368
public <T extends RepositoryConfigurationSource> Collection<RepositoryConfiguration<T>> getRepositoryConfigurations(
6469
T configSource, ResourceLoader loader) {
6570
return getRepositoryConfigurations(configSource, loader, false);
@@ -104,6 +109,13 @@ public String getDefaultNamedQueryLocation() {
104109
public void registerBeansForRoot(BeanDefinitionRegistry registry,
105110
RepositoryConfigurationSource configurationSource) {}
106111

112+
/**
113+
* Returns the prefix of the module to be used to create the default location for Spring Data named queries.
114+
*
115+
* @return must not be {@literal null}.
116+
*/
117+
protected abstract String getModulePrefix();
118+
107119
public void postProcess(BeanDefinitionBuilder builder, RepositoryConfigurationSource source) {}
108120

109121
public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) {}

0 commit comments

Comments
 (0)