Commit ec2f33f9 authored by Kirill Vlasov's avatar Kirill Vlasov Committed by Phillip Webb

Make loggers private static final

Apply consistency across all static loggers.

Closes gh-4784
parent 0b1dc94b
...@@ -31,7 +31,7 @@ import org.springframework.context.ApplicationListener; ...@@ -31,7 +31,7 @@ import org.springframework.context.ApplicationListener;
*/ */
public class AuditListener implements ApplicationListener<AuditApplicationEvent> { public class AuditListener implements ApplicationListener<AuditApplicationEvent> {
private static Log logger = LogFactory.getLog(AuditListener.class); private static final Log logger = LogFactory.getLog(AuditListener.class);
private final AuditEventRepository auditEventRepository; private final AuditEventRepository auditEventRepository;
......
...@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils; ...@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
@ConfigurationProperties(prefix = "shell", ignoreUnknownFields = true) @ConfigurationProperties(prefix = "shell", ignoreUnknownFields = true)
public class ShellProperties { 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 * Authentication type. Auto-detected according to the environment (i.e. if Spring
...@@ -418,7 +418,7 @@ public class ShellProperties { ...@@ -418,7 +418,7 @@ public class ShellProperties {
public static class SimpleAuthenticationProperties public static class SimpleAuthenticationProperties
extends CrshShellAuthenticationProperties { extends CrshShellAuthenticationProperties {
private static Log logger = LogFactory private static final Log logger = LogFactory
.getLog(SimpleAuthenticationProperties.class); .getLog(SimpleAuthenticationProperties.class);
private User user = new User(); private User user = new User();
......
...@@ -66,7 +66,7 @@ public class EndpointMBeanExporter extends MBeanExporter ...@@ -66,7 +66,7 @@ public class EndpointMBeanExporter extends MBeanExporter
*/ */
public static final String DEFAULT_DOMAIN = "org.springframework.boot"; 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(); private final AnnotationJmxAttributeSource attributeSource = new AnnotationJmxAttributeSource();
......
...@@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
*/ */
public class DiskSpaceHealthIndicator extends AbstractHealthIndicator { 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; private final DiskSpaceHealthIndicatorProperties properties;
......
...@@ -48,7 +48,7 @@ import org.springframework.jmx.export.naming.ObjectNamingStrategy; ...@@ -48,7 +48,7 @@ import org.springframework.jmx.export.naming.ObjectNamingStrategy;
@ManagedResource(description = "MetricWriter for pushing metrics to JMX MBeans.") @ManagedResource(description = "MetricWriter for pushing metrics to JMX MBeans.")
public class JmxMetricWriter implements MetricWriter { 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<String, MetricValue> values = new ConcurrentHashMap<String, MetricValue>(); private final ConcurrentMap<String, MetricValue> values = new ConcurrentHashMap<String, MetricValue>();
......
...@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; ...@@ -55,7 +55,7 @@ import org.springframework.util.StringUtils;
*/ */
public class MetricRegistryMetricReader implements MetricReader, MetricRegistryListener { 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<Class<?>, Set<String>> numberKeys = new ConcurrentHashMap<Class<?>, Set<String>>(); private static final Map<Class<?>, Set<String>> numberKeys = new ConcurrentHashMap<Class<?>, Set<String>>();
......
...@@ -48,7 +48,7 @@ import org.springframework.web.filter.OncePerRequestFilter; ...@@ -48,7 +48,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
*/ */
public class WebRequestTraceFilter extends OncePerRequestFilter implements Ordered { 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; private boolean dumpRequests = false;
......
...@@ -48,7 +48,7 @@ import org.springframework.util.StringUtils; ...@@ -48,7 +48,7 @@ import org.springframework.util.StringUtils;
*/ */
public abstract class AutoConfigurationPackages { 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(); private static final String BEAN = AutoConfigurationPackages.class.getName();
......
...@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils; ...@@ -45,7 +45,7 @@ import org.springframework.util.StringUtils;
@Component @Component
public class BasicBatchConfigurer implements BatchConfigurer { 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; private final BatchProperties properties;
......
...@@ -66,7 +66,7 @@ import org.springframework.util.StringUtils; ...@@ -66,7 +66,7 @@ import org.springframework.util.StringUtils;
public class JobLauncherCommandLineRunner public class JobLauncherCommandLineRunner
implements CommandLineRunner, ApplicationEventPublisherAware { 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(); private JobParametersConverter converter = new DefaultJobParametersConverter();
......
...@@ -63,7 +63,7 @@ import org.springframework.util.StringUtils; ...@@ -63,7 +63,7 @@ import org.springframework.util.StringUtils;
*/ */
abstract class BeanTypeRegistry { 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"; static final String FACTORY_BEAN_OBJECT_TYPE = "factoryBeanObjectType";
......
...@@ -66,7 +66,7 @@ public class ElasticsearchAutoConfiguration implements DisposableBean { ...@@ -66,7 +66,7 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
DEFAULTS = Collections.unmodifiableMap(defaults); DEFAULTS = Collections.unmodifiableMap(defaults);
} }
private static Log logger = LogFactory.getLog(ElasticsearchAutoConfiguration.class); private static final Log logger = LogFactory.getLog(ElasticsearchAutoConfiguration.class);
@Autowired @Autowired
private ElasticsearchProperties properties; private ElasticsearchProperties properties;
......
...@@ -94,7 +94,7 @@ public class JacksonAutoConfiguration { ...@@ -94,7 +94,7 @@ public class JacksonAutoConfiguration {
DateTimeSerializer.class, JacksonJodaDateFormat.class }) DateTimeSerializer.class, JacksonJodaDateFormat.class })
static class JodaDateTimeJacksonConfiguration { static class JodaDateTimeJacksonConfiguration {
private final Log log = LogFactory.getLog(JodaDateTimeJacksonConfiguration.class); private static final Log log = LogFactory.getLog(JodaDateTimeJacksonConfiguration.class);
@Autowired @Autowired
private JacksonProperties jacksonProperties; private JacksonProperties jacksonProperties;
......
...@@ -67,7 +67,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; ...@@ -67,7 +67,7 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
@Import({ Registrar.class, DataSourcePoolMetadataProvidersConfiguration.class }) @Import({ Registrar.class, DataSourcePoolMetadataProvidersConfiguration.class })
public class DataSourceAutoConfiguration { 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 * Determines if the {@code dataSource} being used by Spring was created from
......
...@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils; ...@@ -46,7 +46,7 @@ import org.springframework.util.StringUtils;
*/ */
class DataSourceInitializer implements ApplicationListener<DataSourceInitializedEvent> { class DataSourceInitializer implements ApplicationListener<DataSourceInitializedEvent> {
private static Log logger = LogFactory.getLog(DataSourceInitializer.class); private static final Log logger = LogFactory.getLog(DataSourceInitializer.class);
@Autowired @Autowired
private ConfigurableApplicationContext applicationContext; private ConfigurableApplicationContext applicationContext;
......
...@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory; ...@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
*/ */
class ArtemisEmbeddedConfigurationFactory { class ArtemisEmbeddedConfigurationFactory {
private Log logger = LogFactory.getLog(ArtemisEmbeddedConfigurationFactory.class); private static final Log logger = LogFactory.getLog(ArtemisEmbeddedConfigurationFactory.class);
private final ArtemisProperties.Embedded properties; private final ArtemisProperties.Embedded properties;
......
...@@ -37,7 +37,7 @@ import org.springframework.boot.autoconfigure.jms.hornetq.HornetQProperties.Embe ...@@ -37,7 +37,7 @@ import org.springframework.boot.autoconfigure.jms.hornetq.HornetQProperties.Embe
*/ */
class HornetQEmbeddedConfigurationFactory { class HornetQEmbeddedConfigurationFactory {
private Log logger = LogFactory.getLog(HornetQEmbeddedConfigurationFactory.class); private static final Log logger = LogFactory.getLog(HornetQEmbeddedConfigurationFactory.class);
private final Embedded properties; private final Embedded properties;
......
...@@ -53,7 +53,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver; ...@@ -53,7 +53,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
@AutoConfigureAfter({ WebMvcAutoConfiguration.class, ThymeleafAutoConfiguration.class }) @AutoConfigureAfter({ WebMvcAutoConfiguration.class, ThymeleafAutoConfiguration.class })
public class DeviceDelegatingViewResolverAutoConfiguration { public class DeviceDelegatingViewResolverAutoConfiguration {
private static Log logger = LogFactory private static final Log logger = LogFactory
.getLog(DeviceDelegatingViewResolverAutoConfiguration.class); .getLog(DeviceDelegatingViewResolverAutoConfiguration.class);
private static abstract class AbstractDelegateConfiguration { private static abstract class AbstractDelegateConfiguration {
......
...@@ -69,7 +69,7 @@ import org.springframework.util.ReflectionUtils; ...@@ -69,7 +69,7 @@ import org.springframework.util.ReflectionUtils;
@Order(0) @Order(0)
public class AuthenticationManagerConfiguration { public class AuthenticationManagerConfiguration {
private static Log logger = LogFactory private static final Log logger = LogFactory
.getLog(AuthenticationManagerConfiguration.class); .getLog(AuthenticationManagerConfiguration.class);
@Bean @Bean
......
...@@ -60,7 +60,7 @@ public class BootGlobalAuthenticationConfiguration { ...@@ -60,7 +60,7 @@ public class BootGlobalAuthenticationConfiguration {
private static class BootGlobalAuthenticationConfigurationAdapter private static class BootGlobalAuthenticationConfigurationAdapter
extends GlobalAuthenticationConfigurerAdapter { extends GlobalAuthenticationConfigurerAdapter {
private static Log logger = LogFactory private static final Log logger = LogFactory
.getLog(BootGlobalAuthenticationConfiguration.class); .getLog(BootGlobalAuthenticationConfiguration.class);
private final ApplicationContext context; private final ApplicationContext context;
......
...@@ -132,7 +132,7 @@ public class WebMvcAutoConfiguration { ...@@ -132,7 +132,7 @@ public class WebMvcAutoConfiguration {
@EnableConfigurationProperties({ WebMvcProperties.class, ResourceProperties.class }) @EnableConfigurationProperties({ WebMvcProperties.class, ResourceProperties.class })
public static class WebMvcAutoConfigurationAdapter extends WebMvcConfigurerAdapter { public static class WebMvcAutoConfigurationAdapter extends WebMvcConfigurerAdapter {
private static Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class); private static final Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class);
@Autowired @Autowired
private ResourceProperties resourceProperties = new ResourceProperties(); private ResourceProperties resourceProperties = new ResourceProperties();
......
...@@ -38,7 +38,7 @@ import org.springframework.util.Base64Utils; ...@@ -38,7 +38,7 @@ import org.springframework.util.Base64Utils;
*/ */
class Connection { 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 private static final Pattern WEBSOCKET_KEY_PATTERN = Pattern
.compile("^Sec-WebSocket-Key:(.*)$", Pattern.MULTILINE); .compile("^Sec-WebSocket-Key:(.*)$", Pattern.MULTILINE);
......
...@@ -49,7 +49,7 @@ public class LiveReloadServer { ...@@ -49,7 +49,7 @@ public class LiveReloadServer {
*/ */
public static final int DEFAULT_PORT = 35729; 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); private static final int READ_TIMEOUT = (int) TimeUnit.SECONDS.toMillis(4);
......
...@@ -52,7 +52,7 @@ import org.springframework.util.Assert; ...@@ -52,7 +52,7 @@ import org.springframework.util.Assert;
*/ */
public class HttpTunnelConnection implements TunnelConnection { 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; private final URI uri;
......
...@@ -74,7 +74,7 @@ import org.springframework.boot.loader.util.SystemPropertyUtils; ...@@ -74,7 +74,7 @@ import org.springframework.boot.loader.util.SystemPropertyUtils;
*/ */
public class PropertiesLauncher extends Launcher { 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 * Properties key for main class. As a manifest entry can also be specified as
......
...@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils; ...@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils;
public class ConfigurationWarningsApplicationContextInitializer public class ConfigurationWarningsApplicationContextInitializer
implements ApplicationContextInitializer<ConfigurableApplicationContext> { implements ApplicationContextInitializer<ConfigurableApplicationContext> {
private static Log logger = LogFactory private static final Log logger = LogFactory
.getLog(ConfigurationWarningsApplicationContextInitializer.class); .getLog(ConfigurationWarningsApplicationContextInitializer.class);
@Override @Override
......
...@@ -46,7 +46,7 @@ import org.springframework.core.Ordered; ...@@ -46,7 +46,7 @@ import org.springframework.core.Ordered;
public class FileEncodingApplicationListener public class FileEncodingApplicationListener
implements ApplicationListener<ApplicationEnvironmentPreparedEvent>, Ordered { implements ApplicationListener<ApplicationEnvironmentPreparedEvent>, Ordered {
private static Log logger = LogFactory.getLog(FileEncodingApplicationListener.class); private static final Log logger = LogFactory.getLog(FileEncodingApplicationListener.class);
@Override @Override
public int getOrder() { public int getOrder() {
......
...@@ -58,7 +58,7 @@ public class RandomValuePropertySource extends PropertySource<Random> { ...@@ -58,7 +58,7 @@ public class RandomValuePropertySource extends PropertySource<Random> {
private static final String PREFIX = "random."; 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) { public RandomValuePropertySource(String name) {
super(name, new Random()); super(name, new Random());
......
...@@ -59,7 +59,7 @@ import org.springframework.util.ClassUtils; ...@@ -59,7 +59,7 @@ import org.springframework.util.ClassUtils;
public class ServletListenerRegistrationBean<T extends EventListener> public class ServletListenerRegistrationBean<T extends EventListener>
extends RegistrationBean { extends RegistrationBean {
private static Log logger = LogFactory.getLog(ServletListenerRegistrationBean.class); private static final Log logger = LogFactory.getLog(ServletListenerRegistrationBean.class);
private static final Set<Class<?>> SUPPORTED_TYPES; private static final Set<Class<?>> SUPPORTED_TYPES;
......
...@@ -52,7 +52,7 @@ import org.springframework.util.ObjectUtils; ...@@ -52,7 +52,7 @@ import org.springframework.util.ObjectUtils;
*/ */
public class ServletRegistrationBean extends RegistrationBean { 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 = { "/*" }; private static final String[] DEFAULT_MAPPINGS = { "/*" };
......
...@@ -61,7 +61,7 @@ import org.springframework.web.util.NestedServletException; ...@@ -61,7 +61,7 @@ import org.springframework.web.util.NestedServletException;
public class ErrorPageFilter extends AbstractConfigurableEmbeddedServletContainer public class ErrorPageFilter extends AbstractConfigurableEmbeddedServletContainer
implements Filter, NonEmbeddedServletContainerFactory { 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 // From RequestDispatcher but not referenced to remain compatible with Servlet 2.5
......
...@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; ...@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
*/ */
public class PropertySourcesLoader { public class PropertySourcesLoader {
private static Log logger = LogFactory.getLog(PropertySourcesLoader.class); private static final Log logger = LogFactory.getLog(PropertySourcesLoader.class);
private final MutablePropertySources propertySources; private final MutablePropertySources propertySources;
......
...@@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils; ...@@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils;
public class LiquibaseServiceLocatorApplicationListener public class LiquibaseServiceLocatorApplicationListener
implements ApplicationListener<ApplicationStartedEvent> { implements ApplicationListener<ApplicationStartedEvent> {
static final Log logger = LogFactory private static final Log logger = LogFactory
.getLog(LiquibaseServiceLocatorApplicationListener.class); .getLog(LiquibaseServiceLocatorApplicationListener.class);
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment