Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Add missing Nullable annotations, simplify generated bean name creation.

See #3170
This commit is contained in:
Mark Paluch
2025-02-18 08:44:28 +01:00
parent 30457ac4ed
commit 9e2b7fe5c2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java
View File

@@ -100,7 +100,7 @@ public class RepositoryBeanDefinitionParser implements BeanDefinitionParser {
*/
protected static boolean hasBean(Class<?> type, BeanDefinitionRegistry registry) {
String name = String.format("%s%s0", type.getName(), GENERATED_BEAN_NAME_SEPARATOR);
String name = type.getName().concat(GENERATED_BEAN_NAME_SEPARATOR).concat("0");
return registry.containsBeanDefinition(name);
}
}

8
src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java
View File

@@ -179,7 +179,7 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit
* @return the bean name generated for the given {@link BeanDefinition}
*/
public static String registerWithSourceAndGeneratedBeanName(AbstractBeanDefinition bean,
BeanDefinitionRegistry registry, Object source) {
BeanDefinitionRegistry registry, @Nullable Object source) {
bean.setSource(source);
@@ -200,7 +200,7 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit
* @since 2.1
*/
public static void registerIfNotAlreadyRegistered(Supplier<AbstractBeanDefinition> supplier,
BeanDefinitionRegistry registry, String beanName, Object source) {
BeanDefinitionRegistry registry, String beanName, @Nullable Object source) {
if (registry.containsBeanDefinition(beanName)) {
return;
@@ -223,7 +223,7 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit
* @since 2.1
*/
public static void registerLazyIfNotAlreadyRegistered(Supplier<AbstractBeanDefinition> supplier,
BeanDefinitionRegistry registry, String beanName, Object source) {
BeanDefinitionRegistry registry, String beanName, @Nullable Object source) {
if (registry.containsBeanDefinition(beanName)) {
return;
@@ -246,7 +246,7 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit
*/
public static boolean hasBean(Class<?> type, BeanDefinitionRegistry registry) {
String name = String.format("%s%s0", type.getName(), GENERATED_BEAN_NAME_SEPARATOR);
String name = type.getName().concat(GENERATED_BEAN_NAME_SEPARATOR).concat("0");
return registry.containsBeanDefinition(name);
}