From be801fc5fcecf7230fbeb7755ea84d433e3131da Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 28 Jul 2020 14:37:19 +0200 Subject: [PATCH] Polish See gh-24878 --- .../beans/factory/support/AbstractBeanFactory.java | 2 +- .../context/annotation/ConfigurationClassPostProcessor.java | 2 +- .../context/support/AbstractApplicationContext.java | 2 +- .../springframework/core/metrics/ApplicationStartup.java | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index 572de98f9f..76ecaaa52b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -181,7 +181,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp new NamedThreadLocal<>("Prototype beans currently in creation"); /** Application startup metrics. **/ - private ApplicationStartup applicationStartup = ApplicationStartup.getDefault(); + private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT; /** * Create a new AbstractBeanFactory. diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java index c0f01dbe68..23dcd32a8f 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java @@ -145,7 +145,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo /* Using fully qualified class names as default bean names by default. */ private BeanNameGenerator importBeanNameGenerator = IMPORT_BEAN_NAME_GENERATOR; - private ApplicationStartup applicationStartup = ApplicationStartup.getDefault(); + private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT; @Override diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index 7351f6df2b..951861aa85 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -231,7 +231,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader private ApplicationEventMulticaster applicationEventMulticaster; /** Application startup metrics. **/ - private ApplicationStartup applicationStartup = ApplicationStartup.getDefault(); + private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT; /** Statically specified listeners. */ private final Set> applicationListeners = new LinkedHashSet<>(); diff --git a/spring-core/src/main/java/org/springframework/core/metrics/ApplicationStartup.java b/spring-core/src/main/java/org/springframework/core/metrics/ApplicationStartup.java index 7d375720dc..ed72682e5b 100644 --- a/spring-core/src/main/java/org/springframework/core/metrics/ApplicationStartup.java +++ b/spring-core/src/main/java/org/springframework/core/metrics/ApplicationStartup.java @@ -28,12 +28,10 @@ package org.springframework.core.metrics; public interface ApplicationStartup { /** - * Return a default "no op" {@code ApplicationStartup} implementation. + * Default "no op" {@code ApplicationStartup} implementation. *

This variant is designed for minimal overhead and does not record data. */ - static ApplicationStartup getDefault() { - return new DefaultApplicationStartup(); - } + ApplicationStartup DEFAULT = new DefaultApplicationStartup(); /** * Create a new step and marks its beginning.