diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java b/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java
index dd6103173a..dffe0c15b2 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionParser.java
@@ -100,7 +100,7 @@ private void handleError(Exception e, Element source, ReaderContext reader) {
 	 */
 	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);
 	}
 }
diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java
index 5917e05c5c..2bd13c3c74 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java
@@ -179,7 +179,7 @@ protected ClassLoader getConfigurationInspectionClassLoader(ResourceLoader loade
 	 * @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 static String registerWithSourceAndGeneratedBeanName(AbstractBeanDefiniti
 	 * @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 static void registerIfNotAlreadyRegistered(Supplier<AbstractBeanDefinitio
 	 * @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 static void registerLazyIfNotAlreadyRegistered(Supplier<AbstractBeanDefin
 	 */
 	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);
 	}