diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtension.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtension.java
index 07aacda25..27001ae36 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtension.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtension.java
@@ -48,7 +48,7 @@ public interface RepositoryConfigurationExtension {
 	/**
 	 * Returns the descriptive name of the module.
 	 *
-	 * @return
+	 * @return will never be {@literal null}.
 	 */
 	String getModuleName();
 
@@ -60,7 +60,7 @@ public interface RepositoryConfigurationExtension {
 	 * @param strictMatchesOnly whether to return strict repository matches only. Handing in {@literal true} will cause
 	 *          the repository interfaces and domain types handled to be checked whether they are managed by the current
 	 *          store.
-	 * @return
+	 * @return will never be {@literal null}.
 	 * @since 1.9
 	 */
 	<T extends RepositoryConfigurationSource> Collection<RepositoryConfiguration<T>> getRepositoryConfigurations(
@@ -69,14 +69,14 @@ public interface RepositoryConfigurationExtension {
 	/**
 	 * Returns the default location of the Spring Data named queries.
 	 *
-	 * @return must not be {@literal null} or empty.
+	 * @return will never be {@literal null}.
 	 */
 	String getDefaultNamedQueryLocation();
 
 	/**
 	 * Returns the name of the repository factory class to be used.
 	 *
-	 * @return
+	 * @return will never be {@literal null}.
 	 */
 	String getRepositoryFactoryBeanClassName();
 
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 d89304a6c..adad5c6a6 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -54,8 +53,8 @@ import org.springframework.util.StringUtils;
  */
 public abstract class RepositoryConfigurationExtensionSupport implements RepositoryConfigurationExtension {
 
- 	private static final Log logger = LogFactory.getLog(RepositoryConfigurationExtensionSupport.class);
- 	private static final String CLASS_LOADING_ERROR = "%s - Could not load type %s using class loader %s";
+	private static final Log logger = LogFactory.getLog(RepositoryConfigurationExtensionSupport.class);
+	private static final String CLASS_LOADING_ERROR = "%s - Could not load type %s using class loader %s";
 	private static final String MULTI_STORE_DROPPED = "Spring Data %s - Could not safely identify store assignment for repository candidate %s; If you want this repository to be a %s repository,";
 
 	private boolean noMultiStoreSupport = false;