Skip to content

Commit 6be7a85

Browse files
committed
Polishing.
Add missing Nullable annotations, simplify generated bean name creation. See #3170
1 parent c593518 commit 6be7a85

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private void handleError(Exception e, Element source, ReaderContext reader) {
100100
*/
101101
protected static boolean hasBean(Class<?> type, BeanDefinitionRegistry registry) {
102102

103-
String name = String.format("%s%s0", type.getName(), GENERATED_BEAN_NAME_SEPARATOR);
103+
String name = type.getName().concat(GENERATED_BEAN_NAME_SEPARATOR).concat("0");
104104
return registry.containsBeanDefinition(name);
105105
}
106106
}

Diff for: src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ protected ClassLoader getConfigurationInspectionClassLoader(ResourceLoader loade
179179
* @return the bean name generated for the given {@link BeanDefinition}
180180
*/
181181
public static String registerWithSourceAndGeneratedBeanName(AbstractBeanDefinition bean,
182-
BeanDefinitionRegistry registry, Object source) {
182+
BeanDefinitionRegistry registry, @Nullable Object source) {
183183

184184
bean.setSource(source);
185185

@@ -200,7 +200,7 @@ public static String registerWithSourceAndGeneratedBeanName(AbstractBeanDefiniti
200200
* @since 2.1
201201
*/
202202
public static void registerIfNotAlreadyRegistered(Supplier<AbstractBeanDefinition> supplier,
203-
BeanDefinitionRegistry registry, String beanName, Object source) {
203+
BeanDefinitionRegistry registry, String beanName, @Nullable Object source) {
204204

205205
if (registry.containsBeanDefinition(beanName)) {
206206
return;
@@ -223,7 +223,7 @@ public static void registerIfNotAlreadyRegistered(Supplier<AbstractBeanDefinitio
223223
* @since 2.1
224224
*/
225225
public static void registerLazyIfNotAlreadyRegistered(Supplier<AbstractBeanDefinition> supplier,
226-
BeanDefinitionRegistry registry, String beanName, Object source) {
226+
BeanDefinitionRegistry registry, String beanName, @Nullable Object source) {
227227

228228
if (registry.containsBeanDefinition(beanName)) {
229229
return;
@@ -246,7 +246,7 @@ public static void registerLazyIfNotAlreadyRegistered(Supplier<AbstractBeanDefin
246246
*/
247247
public static boolean hasBean(Class<?> type, BeanDefinitionRegistry registry) {
248248

249-
String name = String.format("%s%s0", type.getName(), GENERATED_BEAN_NAME_SEPARATOR);
249+
String name = type.getName().concat(GENERATED_BEAN_NAME_SEPARATOR).concat("0");
250250
return registry.containsBeanDefinition(name);
251251
}
252252

0 commit comments

Comments
 (0)