From 22a6870d5c41cc38e62a06155ab75cdb0e6cf004 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Thu, 16 Aug 2018 14:03:47 +0200
Subject: [PATCH] DATACMNS-1367 - Improved repository bootstrap logging.

Core information about the bootstrap mode, timing and number of repositories created is now logged in info. Individual repository registration is logged in trace now.

Related tickets: DATACMNS-1368.
---
 ...erredRepositoryInitializationListener.java |  4 ++-
 .../RepositoryConfigurationDelegate.java      | 36 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springframework/data/repository/config/DeferredRepositoryInitializationListener.java b/src/main/java/org/springframework/data/repository/config/DeferredRepositoryInitializationListener.java
index d8b500ca8..a38376ad8 100644
--- a/src/main/java/org/springframework/data/repository/config/DeferredRepositoryInitializationListener.java
+++ b/src/main/java/org/springframework/data/repository/config/DeferredRepositoryInitializationListener.java
@@ -46,9 +46,11 @@ class DeferredRepositoryInitializationListener implements ApplicationListener<Co
 	@Override
 	public void onApplicationEvent(ContextRefreshedEvent event) {
 
-		LOG.debug("Triggering deferred initialization of Spring Data repositories…");
+		LOG.info("Triggering deferred initialization of Spring Data repositories…");
 
 		beanFactory.getBeansOfType(Repository.class);
+
+		LOG.info("Spring Data repositories initialized!");
 	}
 
 	/* 
diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
index 080d45318..b554b9f41 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java
@@ -20,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,6 +43,7 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.util.Assert;
+import org.springframework.util.StopWatch;
 
 /**
  * Delegate for configuration integration to reuse the general way of detecting repositories. Customization is done by
@@ -120,23 +122,33 @@ public class RepositoryConfigurationDelegate {
 	public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegistry registry,
 			RepositoryConfigurationExtension extension) {
 
+		if (LOG.isInfoEnabled()) {
+			LOG.info("Bootstrapping Spring Data repositories in {} mode.", configurationSource.getBootstrapMode().name());
+		}
+
 		extension.registerBeansForRoot(registry, configurationSource);
 
 		RepositoryBeanDefinitionBuilder builder = new RepositoryBeanDefinitionBuilder(registry, extension,
 				configurationSource, resourceLoader, environment);
 		List<BeanComponentDefinition> definitions = new ArrayList<>();
 
+		StopWatch watch = new StopWatch();
+
 		if (LOG.isDebugEnabled()) {
 			LOG.debug("Scanning for repositories in packages {}.",
 					configurationSource.getBasePackages().stream().collect(Collectors.joining(", ")));
 		}
 
-		Map<String, RepositoryConfiguration<?>> configurations = new HashMap<>();
+		watch.start();
 
-		for (RepositoryConfiguration<? extends RepositoryConfigurationSource> configuration : extension
-				.getRepositoryConfigurations(configurationSource, resourceLoader, inMultiStoreMode)) {
+		Collection<RepositoryConfiguration<RepositoryConfigurationSource>> configurations = extension
+				.getRepositoryConfigurations(configurationSource, resourceLoader, inMultiStoreMode);
 
-			configurations.put(configuration.getRepositoryInterface(), configuration);
+		Map<String, RepositoryConfiguration<?>> configurationsByRepositoryName = new HashMap<>(configurations.size());
+
+		for (RepositoryConfiguration<? extends RepositoryConfigurationSource> configuration : configurations) {
+
+			configurationsByRepositoryName.put(configuration.getRepositoryInterface(), configuration);
 
 			BeanDefinitionBuilder definitionBuilder = builder.build(configuration);
 
@@ -151,8 +163,8 @@ public class RepositoryConfigurationDelegate {
 			AbstractBeanDefinition beanDefinition = definitionBuilder.getBeanDefinition();
 			String beanName = configurationSource.generateBeanName(beanDefinition);
 
-			if (LOG.isDebugEnabled()) {
-				LOG.debug(REPOSITORY_REGISTRATION, extension.getModuleName(), beanName, configuration.getRepositoryInterface(),
+			if (LOG.isTraceEnabled()) {
+				LOG.trace(REPOSITORY_REGISTRATION, extension.getModuleName(), beanName, configuration.getRepositoryInterface(),
 						configuration.getRepositoryFactoryBeanClassName());
 			}
 
@@ -162,10 +174,13 @@ public class RepositoryConfigurationDelegate {
 			definitions.add(new BeanComponentDefinition(beanDefinition, beanName));
 		}
 
-		potentiallyLazifyRepositories(configurations, registry, configurationSource.getBootstrapMode());
+		potentiallyLazifyRepositories(configurationsByRepositoryName, registry, configurationSource.getBootstrapMode());
 
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("Finished repository scanning.");
+		watch.stop();
+
+		if (LOG.isInfoEnabled()) {
+			LOG.info("Finished Spring Data repository scanning in {}ms. Found {} repository interfaces.", //
+					watch.getLastTaskTimeMillis(), configurations.size());
 		}
 
 		return definitions;
@@ -205,6 +220,9 @@ public class RepositoryConfigurationDelegate {
 		beanFactory.setAutowireCandidateResolver(newResolver);
 
 		if (mode.equals(BootstrapMode.DEFERRED)) {
+
+			LOG.debug("Registering deferred repository initialization listener.");
+
 			beanFactory.registerSingleton(DeferredRepositoryInitializationListener.class.getName(),
 					new DeferredRepositoryInitializationListener(beanFactory));
 		}