Polishing.

Attach repository interface name to each repository init event.

Make spring.data.repository.postprocessors conditional to reduce the number of events. Append full fragment diagnostics.

Reorder methods, add author tag, reformat code.

Closes #2247.
Original pull request: #2273.

Author: mp911de

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java

@@ -57,6 +57,7 @@
  * @author Oliver Gierke
  * @author Jens Schauder
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 public class RepositoryConfigurationDelegate {
 
@@ -148,8 +149,9 @@ public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegist
 
 		ApplicationStartup startup = getStartup(registry);
 		StartupStep repoScan = startup.start("spring.data.repository.scanning");
-		repoScan.tag("data-module", extension.getModuleName());
-		repoScan.tag("packages", configurationSource.getBasePackages().stream().collect(Collectors.joining(", ")));
+		repoScan.tag("dataModule", extension.getModuleName());
+		repoScan.tag("basePackages",
+				() -> configurationSource.getBasePackages().stream().collect(Collectors.joining(", ")));
 
 		watch.start();
 
@@ -263,18 +265,14 @@ private boolean multipleStoresDetected() {
 		return multipleModulesFound;
 	}
 
-	ApplicationStartup getStartup(BeanDefinitionRegistry registry) {
+	private static ApplicationStartup getStartup(BeanDefinitionRegistry registry) {
 
-		if(ConfigurableBeanFactory.class.isInstance(registry)) {
-			return ((ConfigurableBeanFactory)registry).getApplicationStartup();
+		if (registry instanceof ConfigurableBeanFactory) {
+			return ((ConfigurableBeanFactory) registry).getApplicationStartup();
 		}
 
-		if (DefaultListableBeanFactory.class.isInstance(registry)) {
-			return ((DefaultListableBeanFactory)registry).getBeanProvider(ApplicationStartup.class).getIfAvailable(() -> ApplicationStartup.DEFAULT);
-		}
-
-		if(GenericApplicationContext.class.isInstance(registry)) {
-			return ((GenericApplicationContext)registry).getDefaultListableBeanFactory().getApplicationStartup();
+		if (registry instanceof GenericApplicationContext) {
+			return ((GenericApplicationContext) registry).getDefaultListableBeanFactory().getApplicationStartup();
 		}
 
 		return ApplicationStartup.DEFAULT;

src/main/java/org/springframework/data/repository/core/support/RepositoryFactorySupport.java

@@ -277,28 +277,52 @@ public <T> T getRepository(Class<T> repositoryInterface, RepositoryFragments fra
 
 		ApplicationStartup applicationStartup = getStartup();
 
-		StartupStep repositoryInit = applicationStartup.start("spring.data.repository.init");
-		repositoryInit.tag("repository", () -> repositoryInterface.getName());
+		StartupStep repositoryInit = onEvent(applicationStartup, "spring.data.repository.init", repositoryInterface);
 
-		StartupStep repositoryMetadataStep = applicationStartup.start("spring.data.repository.metadata");
+		repositoryBaseClass.ifPresent(it -> repositoryInit.tag("baseClass", it.getName()));
+
+		StartupStep repositoryMetadataStep = onEvent(applicationStartup, "spring.data.repository.metadata",
+				repositoryInterface);
 		RepositoryMetadata metadata = getRepositoryMetadata(repositoryInterface);
 		repositoryMetadataStep.end();
 
-		StartupStep repositoryCompositionStep = applicationStartup.start("spring.data.repository.composition");
-		repositoryCompositionStep.tag("fragment.count", () -> String.valueOf(fragments.size()));
+		StartupStep repositoryCompositionStep = onEvent(applicationStartup, "spring.data.repository.composition",
+				repositoryInterface);
+		repositoryCompositionStep.tag("fragment.count", String.valueOf(fragments.size()));
 
 		RepositoryComposition composition = getRepositoryComposition(metadata, fragments);
 		RepositoryInformation information = getRepositoryInformation(metadata, composition);
+
+		repositoryCompositionStep.tag("fragments", () -> {
+
+			StringBuilder fragmentsTag = new StringBuilder();
+
+			for (RepositoryFragment<?> fragment : composition.getFragments()) {
+
+				if (fragmentsTag.length() > 0) {
+					fragmentsTag.append(";");
+				}
+
+				fragmentsTag.append(fragment.getSignatureContributor().getName());
+				fragmentsTag.append(fragment.getImplementation().map(it -> ":" + it.getClass().getName()).orElse(""));
+			}
+
+			return fragmentsTag.toString();
+		});
+
 		repositoryCompositionStep.end();
 
 		validate(information, composition);
 
-		StartupStep repositoryTargetStep = applicationStartup.start("spring.data.repository.target");
+		StartupStep repositoryTargetStep = onEvent(applicationStartup, "spring.data.repository.target",
+				repositoryInterface);
 		Object target = getTargetRepository(information);
+
+		repositoryTargetStep.tag("target", target.getClass().getName());
 		repositoryTargetStep.end();
 
 		// Create proxy
-		StartupStep repositoryProxyStep = applicationStartup.start("spring.data.repository.proxy");
+		StartupStep repositoryProxyStep = onEvent(applicationStartup, "spring.data.repository.proxy", repositoryInterface);
 		ProxyFactory result = new ProxyFactory();
 		result.setTarget(target);
 		result.setInterfaces(repositoryInterface, Repository.class, TransactionalProxy.class);
@@ -309,30 +333,33 @@ public <T> T getRepository(Class<T> repositoryInterface, RepositoryFragments fra
 
 		result.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 
-		StartupStep repositoryPostprocessorsStep = applicationStartup.start("spring.data.repository.postprocessors");
-		postProcessors.forEach(processor -> {
-
-			StartupStep singlePostProcessor = applicationStartup.start("spring.data.repository.postprocessor");
-			singlePostProcessor.tag("type", processor.getClass().getName());
-			processor.postProcess(result, information);
-			singlePostProcessor.end();
-		});
-		repositoryPostprocessorsStep.end();
+		if (!postProcessors.isEmpty()) {
+			StartupStep repositoryPostprocessorsStep = onEvent(applicationStartup, "spring.data.repository.postprocessors",
+					repositoryInterface);
+			postProcessors.forEach(processor -> {
+
+				StartupStep singlePostProcessor = onEvent(applicationStartup, "spring.data.repository.postprocessor",
+						repositoryInterface);
+				singlePostProcessor.tag("type", processor.getClass().getName());
+				processor.postProcess(result, information);
+				singlePostProcessor.end();
+			});
+			repositoryPostprocessorsStep.end();
+		}
 
 		if (DefaultMethodInvokingMethodInterceptor.hasDefaultMethods(repositoryInterface)) {
 			result.addAdvice(new DefaultMethodInvokingMethodInterceptor());
 		}
 
-		StartupStep queryExecutorsStep = applicationStartup.start("spring.data.repository.queryexecutors");
 		ProjectionFactory projectionFactory = getProjectionFactory(classLoader, beanFactory);
 		Optional<QueryLookupStrategy> queryLookupStrategy = getQueryLookupStrategy(queryLookupStrategyKey,
 				evaluationContextProvider);
 		result.addAdvice(new QueryExecutorMethodInterceptor(information, projectionFactory, queryLookupStrategy,
 				namedQueries, queryPostProcessors, methodInvocationListeners));
-		queryExecutorsStep.end();
 
-		composition = composition.append(RepositoryFragment.implemented(target));
-		result.addAdvice(new ImplementationMethodExecutionInterceptor(information, composition, methodInvocationListeners));
+		RepositoryComposition compositionToUse = composition.append(RepositoryFragment.implemented(target));
+		result.addAdvice(
+				new ImplementationMethodExecutionInterceptor(information, compositionToUse, methodInvocationListeners));
 
 		T repository = (T) result.getProxy(classLoader);
 		repositoryProxyStep.end();
@@ -346,19 +373,6 @@ public <T> T getRepository(Class<T> repositoryInterface, RepositoryFragments fra
 		return repository;
 	}
 
-	ApplicationStartup getStartup() {
-
-		try {
-
-			ApplicationStartup applicationStartup = beanFactory != null ? beanFactory.getBean(ApplicationStartup.class)
-					: ApplicationStartup.DEFAULT;
-
-			return applicationStartup != null ? applicationStartup : ApplicationStartup.DEFAULT;
-		} catch (NoSuchBeanDefinitionException e) {
-			return ApplicationStartup.DEFAULT;
-		}
-	}
-
 	/**
 	 * Returns the {@link ProjectionFactory} to be used with the repository instances created.
 	 *
@@ -540,6 +554,25 @@ protected final <R> R getTargetRepositoryViaReflection(Class<?> baseClass, Objec
 						baseClass, Arrays.stream(constructorArguments).map(Object::getClass).collect(Collectors.toList()))));
 	}
 
+	private ApplicationStartup getStartup() {
+
+		try {
+
+			ApplicationStartup applicationStartup = beanFactory != null ? beanFactory.getBean(ApplicationStartup.class)
+					: ApplicationStartup.DEFAULT;
+
+			return applicationStartup != null ? applicationStartup : ApplicationStartup.DEFAULT;
+		} catch (NoSuchBeanDefinitionException e) {
+			return ApplicationStartup.DEFAULT;
+		}
+	}
+
+	private StartupStep onEvent(ApplicationStartup applicationStartup, String name, Class<?> repositoryInterface) {
+
+		StartupStep step = applicationStartup.start(name);
+		return step.tag("repository", repositoryInterface.getName());
+	}
+
 	/**
 	 * Method interceptor that calls methods on the {@link RepositoryComposition}.
 	 *

src/test/java/org/springframework/data/repository/core/support/RepositoryFactorySupportUnitTests.java

@@ -420,7 +420,6 @@ void callsApplicationStartupOnRepositoryInitialization() {
 		orderedInvocation.verify(startup).start("spring.data.repository.composition");
 		orderedInvocation.verify(startup).start("spring.data.repository.target");
 		orderedInvocation.verify(startup).start("spring.data.repository.proxy");
-		orderedInvocation.verify(startup).start("spring.data.repository.postprocessors");
 	}
 
 	private ConvertingRepository prepareConvertingRepository(final Object expectedValue) {