From ec2f33f9861e3634ae943a8871412b86dc9f77f9 Mon Sep 17 00:00:00 2001 From: Kirill Vlasov Date: Fri, 11 Dec 2015 16:40:40 +0500 Subject: [PATCH] Make loggers private static final Apply consistency across all static loggers. Closes gh-4784 --- .../boot/actuate/audit/listener/AuditListener.java | 2 +- .../boot/actuate/autoconfigure/ShellProperties.java | 4 ++-- .../boot/actuate/endpoint/jmx/EndpointMBeanExporter.java | 2 +- .../boot/actuate/health/DiskSpaceHealthIndicator.java | 2 +- .../boot/actuate/metrics/jmx/JmxMetricWriter.java | 2 +- .../actuate/metrics/reader/MetricRegistryMetricReader.java | 2 +- .../boot/actuate/trace/WebRequestTraceFilter.java | 2 +- .../boot/autoconfigure/AutoConfigurationPackages.java | 2 +- .../boot/autoconfigure/batch/BasicBatchConfigurer.java | 2 +- .../autoconfigure/batch/JobLauncherCommandLineRunner.java | 2 +- .../boot/autoconfigure/condition/BeanTypeRegistry.java | 2 +- .../data/elasticsearch/ElasticsearchAutoConfiguration.java | 2 +- .../boot/autoconfigure/jackson/JacksonAutoConfiguration.java | 2 +- .../boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java | 2 +- .../boot/autoconfigure/jdbc/DataSourceInitializer.java | 2 +- .../jms/artemis/ArtemisEmbeddedConfigurationFactory.java | 2 +- .../jms/hornetq/HornetQEmbeddedConfigurationFactory.java | 2 +- .../mobile/DeviceDelegatingViewResolverAutoConfiguration.java | 2 +- .../security/AuthenticationManagerConfiguration.java | 2 +- .../security/BootGlobalAuthenticationConfiguration.java | 2 +- .../boot/autoconfigure/web/WebMvcAutoConfiguration.java | 2 +- .../springframework/boot/devtools/livereload/Connection.java | 2 +- .../boot/devtools/livereload/LiveReloadServer.java | 2 +- .../boot/devtools/tunnel/client/HttpTunnelConnection.java | 2 +- .../org/springframework/boot/loader/PropertiesLauncher.java | 2 +- .../ConfigurationWarningsApplicationContextInitializer.java | 2 +- .../boot/context/FileEncodingApplicationListener.java | 2 +- .../boot/context/config/RandomValuePropertySource.java | 2 +- .../context/embedded/ServletListenerRegistrationBean.java | 2 +- .../boot/context/embedded/ServletRegistrationBean.java | 2 +- .../org/springframework/boot/context/web/ErrorPageFilter.java | 2 +- .../org/springframework/boot/env/PropertySourcesLoader.java | 2 +- .../liquibase/LiquibaseServiceLocatorApplicationListener.java | 2 +- 33 files changed, 34 insertions(+), 34 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java index b69932250be..4a6b1dc2581 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java @@ -31,7 +31,7 @@ import org.springframework.context.ApplicationListener; */ public class AuditListener implements ApplicationListener { - private static Log logger = LogFactory.getLog(AuditListener.class); + private static final Log logger = LogFactory.getLog(AuditListener.class); private final AuditEventRepository auditEventRepository; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java index 6a2ec643323..b416204f34a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java @@ -41,7 +41,7 @@ import org.springframework.util.StringUtils; @ConfigurationProperties(prefix = "shell", ignoreUnknownFields = true) public class ShellProperties { - private static Log logger = LogFactory.getLog(ShellProperties.class); + private static final Log logger = LogFactory.getLog(ShellProperties.class); /** * Authentication type. Auto-detected according to the environment (i.e. if Spring @@ -418,7 +418,7 @@ public class ShellProperties { public static class SimpleAuthenticationProperties extends CrshShellAuthenticationProperties { - private static Log logger = LogFactory + private static final Log logger = LogFactory .getLog(SimpleAuthenticationProperties.class); private User user = new User(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java index fc60bdd38c0..fea94d536c3 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java @@ -66,7 +66,7 @@ public class EndpointMBeanExporter extends MBeanExporter */ public static final String DEFAULT_DOMAIN = "org.springframework.boot"; - private static Log logger = LogFactory.getLog(EndpointMBeanExporter.class); + private static final Log logger = LogFactory.getLog(EndpointMBeanExporter.class); private final AnnotationJmxAttributeSource attributeSource = new AnnotationJmxAttributeSource(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java index a067c1b767c..9e5ea0147ee 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java @@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; */ public class DiskSpaceHealthIndicator extends AbstractHealthIndicator { - private static Log logger = LogFactory.getLog(DiskSpaceHealthIndicator.class); + private static final Log logger = LogFactory.getLog(DiskSpaceHealthIndicator.class); private final DiskSpaceHealthIndicatorProperties properties; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java index d1513be4075..8c9aad6ed93 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java @@ -48,7 +48,7 @@ import org.springframework.jmx.export.naming.ObjectNamingStrategy; @ManagedResource(description = "MetricWriter for pushing metrics to JMX MBeans.") public class JmxMetricWriter implements MetricWriter { - private static Log logger = LogFactory.getLog(JmxMetricWriter.class); + private static final Log logger = LogFactory.getLog(JmxMetricWriter.class); private final ConcurrentMap values = new ConcurrentHashMap(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java index be78e60600a..b5c97de6ee3 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; */ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryListener { - private static Log logger = LogFactory.getLog(MetricRegistryMetricReader.class); + private static final Log logger = LogFactory.getLog(MetricRegistryMetricReader.class); private static final Map, Set> numberKeys = new ConcurrentHashMap, Set>(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java index 02312c342b3..3d047836394 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java @@ -48,7 +48,7 @@ import org.springframework.web.filter.OncePerRequestFilter; */ public class WebRequestTraceFilter extends OncePerRequestFilter implements Ordered { - private final Log logger = LogFactory.getLog(WebRequestTraceFilter.class); + private static final Log logger = LogFactory.getLog(WebRequestTraceFilter.class); private boolean dumpRequests = false; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java index 77689b5ec3e..06d338afe73 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java @@ -48,7 +48,7 @@ import org.springframework.util.StringUtils; */ public abstract class AutoConfigurationPackages { - private static Log logger = LogFactory.getLog(AutoConfigurationPackages.class); + private static final Log logger = LogFactory.getLog(AutoConfigurationPackages.class); private static final String BEAN = AutoConfigurationPackages.class.getName(); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java index 094c72fc6b6..219c0d18fed 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BasicBatchConfigurer.java @@ -45,7 +45,7 @@ import org.springframework.util.StringUtils; @Component public class BasicBatchConfigurer implements BatchConfigurer { - private static Log logger = LogFactory.getLog(BasicBatchConfigurer.class); + private static final Log logger = LogFactory.getLog(BasicBatchConfigurer.class); private final BatchProperties properties; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java index 9d8a29b842f..29dd7ce4ce2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -66,7 +66,7 @@ import org.springframework.util.StringUtils; public class JobLauncherCommandLineRunner implements CommandLineRunner, ApplicationEventPublisherAware { - private static Log logger = LogFactory.getLog(JobLauncherCommandLineRunner.class); + private static final Log logger = LogFactory.getLog(JobLauncherCommandLineRunner.class); private JobParametersConverter converter = new DefaultJobParametersConverter(); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java index 2f750db5825..c04a36cccaf 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java @@ -63,7 +63,7 @@ import org.springframework.util.StringUtils; */ abstract class BeanTypeRegistry { - static Log logger = LogFactory.getLog(BeanTypeRegistry.class); + private static final Log logger = LogFactory.getLog(BeanTypeRegistry.class); static final String FACTORY_BEAN_OBJECT_TYPE = "factoryBeanObjectType"; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java index 6bc3650848c..5cac2d861d3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java @@ -66,7 +66,7 @@ public class ElasticsearchAutoConfiguration implements DisposableBean { DEFAULTS = Collections.unmodifiableMap(defaults); } - private static Log logger = LogFactory.getLog(ElasticsearchAutoConfiguration.class); + private static final Log logger = LogFactory.getLog(ElasticsearchAutoConfiguration.class); @Autowired private ElasticsearchProperties properties; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java index e5aa015f1cb..099780e8d85 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfiguration.java @@ -94,7 +94,7 @@ public class JacksonAutoConfiguration { DateTimeSerializer.class, JacksonJodaDateFormat.class }) static class JodaDateTimeJacksonConfiguration { - private final Log log = LogFactory.getLog(JodaDateTimeJacksonConfiguration.class); + private static final Log log = LogFactory.getLog(JodaDateTimeJacksonConfiguration.class); @Autowired private JacksonProperties jacksonProperties; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java index 3c11059940d..b1ac2a2e4fa 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -67,7 +67,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; @Import({ Registrar.class, DataSourcePoolMetadataProvidersConfiguration.class }) public class DataSourceAutoConfiguration { - private static Log logger = LogFactory.getLog(DataSourceAutoConfiguration.class); + private static final Log logger = LogFactory.getLog(DataSourceAutoConfiguration.class); /** * Determines if the {@code dataSource} being used by Spring was created from diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java index 3ac65280477..17ef8fdaec6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java @@ -46,7 +46,7 @@ import org.springframework.util.StringUtils; */ class DataSourceInitializer implements ApplicationListener { - private static Log logger = LogFactory.getLog(DataSourceInitializer.class); + private static final Log logger = LogFactory.getLog(DataSourceInitializer.class); @Autowired private ConfigurableApplicationContext applicationContext; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java index 8e2c8dbc1ce..6c256ecdf40 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java @@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory; */ class ArtemisEmbeddedConfigurationFactory { - private Log logger = LogFactory.getLog(ArtemisEmbeddedConfigurationFactory.class); + private static final Log logger = LogFactory.getLog(ArtemisEmbeddedConfigurationFactory.class); private final ArtemisProperties.Embedded properties; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java index 618a0a5e3a2..4d1cfee394b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/hornetq/HornetQEmbeddedConfigurationFactory.java @@ -37,7 +37,7 @@ import org.springframework.boot.autoconfigure.jms.hornetq.HornetQProperties.Embe */ class HornetQEmbeddedConfigurationFactory { - private Log logger = LogFactory.getLog(HornetQEmbeddedConfigurationFactory.class); + private static final Log logger = LogFactory.getLog(HornetQEmbeddedConfigurationFactory.class); private final Embedded properties; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java index 54d4e969e0d..599405703de 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java @@ -53,7 +53,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver; @AutoConfigureAfter({ WebMvcAutoConfiguration.class, ThymeleafAutoConfiguration.class }) public class DeviceDelegatingViewResolverAutoConfiguration { - private static Log logger = LogFactory + private static final Log logger = LogFactory .getLog(DeviceDelegatingViewResolverAutoConfiguration.class); private static abstract class AbstractDelegateConfiguration { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java index b44e366e19d..b11d80c17c6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java @@ -69,7 +69,7 @@ import org.springframework.util.ReflectionUtils; @Order(0) public class AuthenticationManagerConfiguration { - private static Log logger = LogFactory + private static final Log logger = LogFactory .getLog(AuthenticationManagerConfiguration.class); @Bean diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java index e120a5654c1..e41a20885a8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java @@ -60,7 +60,7 @@ public class BootGlobalAuthenticationConfiguration { private static class BootGlobalAuthenticationConfigurationAdapter extends GlobalAuthenticationConfigurerAdapter { - private static Log logger = LogFactory + private static final Log logger = LogFactory .getLog(BootGlobalAuthenticationConfiguration.class); private final ApplicationContext context; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java index 4e7b3274fbe..51839a223f3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java @@ -132,7 +132,7 @@ public class WebMvcAutoConfiguration { @EnableConfigurationProperties({ WebMvcProperties.class, ResourceProperties.class }) public static class WebMvcAutoConfigurationAdapter extends WebMvcConfigurerAdapter { - private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class); + private static final Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class); @Autowired private ResourceProperties resourceProperties = new ResourceProperties(); diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java index a7aebebe079..6b6b6371ea9 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java @@ -38,7 +38,7 @@ import org.springframework.util.Base64Utils; */ class Connection { - private static Log logger = LogFactory.getLog(Connection.class); + private static final Log logger = LogFactory.getLog(Connection.class); private static final Pattern WEBSOCKET_KEY_PATTERN = Pattern .compile("^Sec-WebSocket-Key:(.*)$", Pattern.MULTILINE); diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java index a1a30437890..922fa15451c 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java @@ -49,7 +49,7 @@ public class LiveReloadServer { */ public static final int DEFAULT_PORT = 35729; - private static Log logger = LogFactory.getLog(LiveReloadServer.class); + private static final Log logger = LogFactory.getLog(LiveReloadServer.class); private static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(4); diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java index 8cc68bfdb4a..219af782f66 100644 --- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java @@ -52,7 +52,7 @@ import org.springframework.util.Assert; */ public class HttpTunnelConnection implements TunnelConnection { - private static Log logger = LogFactory.getLog(HttpTunnelConnection.class); + private static final Log logger = LogFactory.getLog(HttpTunnelConnection.class); private final URI uri; diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java index a2a8059b2ca..971b59056e6 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java @@ -74,7 +74,7 @@ import org.springframework.boot.loader.util.SystemPropertyUtils; */ public class PropertiesLauncher extends Launcher { - private final Logger logger = Logger.getLogger(Launcher.class.getName()); + private static final Logger logger = Logger.getLogger(Launcher.class.getName()); /** * Properties key for main class. As a manifest entry can also be specified as diff --git a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java index e48e32d08cd..f2c85d58771 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java @@ -52,7 +52,7 @@ import org.springframework.util.StringUtils; public class ConfigurationWarningsApplicationContextInitializer implements ApplicationContextInitializer { - private static Log logger = LogFactory + private static final Log logger = LogFactory .getLog(ConfigurationWarningsApplicationContextInitializer.class); @Override diff --git a/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java index dd8bfdb3321..fd5e3215a6b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java @@ -46,7 +46,7 @@ import org.springframework.core.Ordered; public class FileEncodingApplicationListener implements ApplicationListener, Ordered { - private static Log logger = LogFactory.getLog(FileEncodingApplicationListener.class); + private static final Log logger = LogFactory.getLog(FileEncodingApplicationListener.class); @Override public int getOrder() { diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/RandomValuePropertySource.java b/spring-boot/src/main/java/org/springframework/boot/context/config/RandomValuePropertySource.java index b1794c8e857..82b067b1a7d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/config/RandomValuePropertySource.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/config/RandomValuePropertySource.java @@ -58,7 +58,7 @@ public class RandomValuePropertySource extends PropertySource { private static final String PREFIX = "random."; - private static Log logger = LogFactory.getLog(RandomValuePropertySource.class); + private static final Log logger = LogFactory.getLog(RandomValuePropertySource.class); public RandomValuePropertySource(String name) { super(name, new Random()); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletListenerRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletListenerRegistrationBean.java index 1f2aa0827ad..593b690caab 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletListenerRegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletListenerRegistrationBean.java @@ -59,7 +59,7 @@ import org.springframework.util.ClassUtils; public class ServletListenerRegistrationBean extends RegistrationBean { - private static Log logger = LogFactory.getLog(ServletListenerRegistrationBean.class); + private static final Log logger = LogFactory.getLog(ServletListenerRegistrationBean.class); private static final Set> SUPPORTED_TYPES; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java index 38fa545f061..fcd5ce1a807 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletRegistrationBean.java @@ -52,7 +52,7 @@ import org.springframework.util.ObjectUtils; */ public class ServletRegistrationBean extends RegistrationBean { - private static Log logger = LogFactory.getLog(ServletRegistrationBean.class); + private static final Log logger = LogFactory.getLog(ServletRegistrationBean.class); private static final String[] DEFAULT_MAPPINGS = { "/*" }; diff --git a/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java b/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java index 0963fc3df3b..11f67ea2814 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java @@ -61,7 +61,7 @@ import org.springframework.web.util.NestedServletException; public class ErrorPageFilter extends AbstractConfigurableEmbeddedServletContainer implements Filter, NonEmbeddedServletContainerFactory { - private static Log logger = LogFactory.getLog(ErrorPageFilter.class); + private static final Log logger = LogFactory.getLog(ErrorPageFilter.class); // From RequestDispatcher but not referenced to remain compatible with Servlet 2.5 diff --git a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java index b523897f06d..37c20533f0c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java +++ b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java @@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; */ public class PropertySourcesLoader { - private static Log logger = LogFactory.getLog(PropertySourcesLoader.class); + private static final Log logger = LogFactory.getLog(PropertySourcesLoader.class); private final MutablePropertySources propertySources; diff --git a/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java index be0ab51fa66..a5d2502b317 100644 --- a/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java +++ b/spring-boot/src/main/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListener.java @@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils; public class LiquibaseServiceLocatorApplicationListener implements ApplicationListener { - static final Log logger = LogFactory + private static final Log logger = LogFactory .getLog(LiquibaseServiceLocatorApplicationListener.class); @Override