* Users can inject a {@link AuditEventRepository} to publish their own events or * alternatively use Springs {@link AuthenticationEventPublisher} (usually obtained by diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java index 177800e13f..e734185684 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java @@ -63,21 +63,22 @@ public class RabbitAutoConfiguration { protected static class RabbitConnectionFactoryCreator { @Bean - public ConnectionFactory rabbitConnectionFactory( - RabbitProperties config) { - CachingConnectionFactory connectionFactory = new CachingConnectionFactory( + public ConnectionFactory rabbitConnectionFactory(RabbitProperties config) { + CachingConnectionFactory factory = new CachingConnectionFactory( config.getHost()); - connectionFactory.setPort(config.getPort()); + factory.setPort(config.getPort()); if (config.getUsername() != null) { - connectionFactory.setUsername(config.getUsername()); + factory.setUsername(config.getUsername()); } if (config.getPassword() != null) { - connectionFactory.setPassword(config.getPassword()); + factory.setPassword(config.getPassword()); } if (config.getVirtualHost() != null) { - connectionFactory.setVirtualHost(config.getVirtualHost()); + factory.setVirtualHost(config.getVirtualHost()); } - return connectionFactory; + return factory; } + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDatabaseInitializer.java index 241359120c..5e3df8eab4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDatabaseInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDatabaseInitializer.java @@ -77,4 +77,5 @@ public class BatchDatabaseInitializer implements EnvironmentAware { DatabasePopulatorUtils.execute(populator, this.dataSource); } } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpression.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpression.java index 1c2af2322c..f46b7c3881 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpression.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnExpression.java @@ -39,4 +39,5 @@ public @interface ConditionalOnExpression { * condition passes or {@code false} if it fails. */ String value() default "true"; + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplication.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplication.java index 7ad0399abe..658e3d8718 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplication.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnNotWebApplication.java @@ -35,4 +35,5 @@ import org.springframework.context.annotation.Conditional; @Documented @Conditional(OnWebApplicationCondition.class) public @interface ConditionalOnNotWebApplication { + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java index 6a7ff43843..356d95de64 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResource.java @@ -41,4 +41,5 @@ public @interface ConditionalOnResource { * @return the resource paths that must be present. */ public String[] resources() default {}; + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 11cb54f53c..57ccd264d3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -292,5 +292,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit string.append(")"); return string.toString(); } + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java index c5d5bb4934..eef35f86b5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java @@ -124,4 +124,5 @@ class OnClassCondition extends SpringBootCondition { public abstract boolean matches(String className, ConditionContext context); }; + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java index d7ee9b65f2..049ca04d73 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnWebApplicationCondition.java @@ -76,4 +76,5 @@ class OnWebApplicationCondition extends SpringBootCondition { return ConditionOutcome.noMatch("not a web application"); } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigureRegistrar.java index 75e496fc5d..b4ba780df3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoRepositoriesAutoConfigureRegistrar.java @@ -49,6 +49,7 @@ class MongoRepositoriesAutoConfigureRegistrar extends @EnableMongoRepositories private static class EnableMongoRepositoriesConfiguration { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoTemplateAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoTemplateAutoConfiguration.java index d1883d4e96..b7f8284be4 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoTemplateAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/MongoTemplateAutoConfiguration.java @@ -43,12 +43,12 @@ import com.mongodb.Mongo; public class MongoTemplateAutoConfiguration { @Autowired - private MongoProperties config; + private MongoProperties properties; @Bean @ConditionalOnMissingBean public MongoTemplate mongoTemplate(Mongo mongo) throws UnknownHostException { - return new MongoTemplate(mongo, this.config.getMongoClientDatabase()); + return new MongoTemplate(mongo, this.properties.getMongoClientDatabase()); } } 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 eff59011ac..11d2345b68 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 @@ -142,18 +142,21 @@ public class DataSourceAutoConfiguration implements EnvironmentAware { @ConditionalOnMissingBean(DataSource.class) @Import(EmbeddedDataSourceConfiguration.class) protected static class EmbeddedConfiguration { + } @Conditional(DataSourceAutoConfiguration.TomcatDatabaseCondition.class) @ConditionalOnMissingBean(DataSource.class) @Import(TomcatDataSourceConfiguration.class) protected static class TomcatConfiguration { + } @Conditional(DataSourceAutoConfiguration.BasicDatabaseCondition.class) @ConditionalOnMissingBean(DataSource.class) @Import(CommonsDataSourceConfiguration.class) protected static class DbcpConfiguration { + } @Configuration @@ -244,6 +247,7 @@ public class DataSourceAutoConfiguration implements EnvironmentAware { } return url; } + } /** @@ -267,6 +271,7 @@ public class DataSourceAutoConfiguration implements EnvironmentAware { } return super.getMatchOutcome(context, metadata); } + } /** @@ -304,6 +309,7 @@ public class DataSourceAutoConfiguration implements EnvironmentAware { } return ConditionOutcome.match("embedded database " + type + " detected"); } + } /** @@ -334,5 +340,7 @@ public class DataSourceAutoConfiguration implements EnvironmentAware { return ConditionOutcome.noMatch("no existing bean configured database"); } + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java index da1134efc4..8f53d84fbc 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDatabaseConnection.java @@ -121,4 +121,5 @@ public enum EmbeddedDatabaseConnection { } return NONE; } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java index 5f7a413bd1..8c6c117c3a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsTemplateAutoConfiguration.java @@ -42,7 +42,7 @@ import org.springframework.jms.core.JmsTemplate; public class JmsTemplateAutoConfiguration { @Autowired - private JmsTemplateProperties config; + private JmsTemplateProperties properties; @Autowired private ConnectionFactory connectionFactory; @@ -51,7 +51,7 @@ public class JmsTemplateAutoConfiguration { @ConditionalOnMissingBean(JmsTemplate.class) public JmsTemplate jmsTemplate() { JmsTemplate jmsTemplate = new JmsTemplate(this.connectionFactory); - jmsTemplate.setPubSubDomain(this.config.isPubSubDomain()); + jmsTemplate.setPubSubDomain(this.properties.isPubSubDomain()); return jmsTemplate; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java index 423c959a41..a3d01ed95e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java @@ -41,6 +41,7 @@ public class JmxAutoConfiguration { @Configuration @EnableMBeanExport(defaultDomain = "${spring.jmx.default_domain:}", server = "${spring.jmx.server:}") public static class MBeanExport { + } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java index 95d5b39e63..cb76baf458 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java @@ -176,5 +176,7 @@ public class AutoConfigurationReportLoggingInitializer implements public void onApplicationEvent(ApplicationEvent event) { AutoConfigurationReportLoggingInitializer.this.onApplicationEvent(event); } + } + } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java index 60982afcec..715bbe9068 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfiguration.java @@ -43,7 +43,7 @@ import com.mongodb.Mongo; public class MongoAutoConfiguration { @Autowired - private MongoProperties config; + private MongoProperties properties; private Mongo mongo; @@ -57,7 +57,7 @@ public class MongoAutoConfiguration { @Bean @ConditionalOnMissingBean public Mongo mongo() throws UnknownHostException { - this.mongo = this.config.createMongoClient(); + this.mongo = this.properties.createMongoClient(); return this.mongo; } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java index f39cc21f55..2a54a1a907 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/redis/RedisAutoConfiguration.java @@ -54,15 +54,15 @@ public class RedisAutoConfiguration { protected static class RedisConnectionConfiguration { @Autowired - private RedisProperties config; + private RedisProperties properties; @Bean @ConditionalOnMissingBean RedisConnectionFactory redisConnectionFactory() throws UnknownHostException { LettuceConnectionFactory factory = new LettuceConnectionFactory( - this.config.getHost(), this.config.getPort()); - if (this.config.getPassword() != null) { - factory.setPassword(this.config.getPassword()); + this.properties.getHost(), this.properties.getPort()); + if (this.properties.getPassword() != null) { + factory.setPassword(this.properties.getPassword()); } return factory; } @@ -74,20 +74,20 @@ public class RedisAutoConfiguration { protected static class RedisPooledConnectionConfiguration { @Autowired - private RedisProperties config; + private RedisProperties properties; @Bean @ConditionalOnMissingBean RedisConnectionFactory redisConnectionFactory() throws UnknownHostException { - if (this.config.getPool() != null) { + if (this.properties.getPool() != null) { LettuceConnectionFactory factory = new LettuceConnectionFactory( lettucePool()); return factory; } LettuceConnectionFactory factory = new LettuceConnectionFactory( - this.config.getHost(), this.config.getPort()); - if (this.config.getPassword() != null) { - factory.setPassword(this.config.getPassword()); + this.properties.getHost(), this.properties.getPort()); + if (this.properties.getPassword() != null) { + factory.setPassword(this.properties.getPassword()); } return factory; } @@ -95,13 +95,13 @@ public class RedisAutoConfiguration { @Bean @ConditionalOnMissingBean public LettucePool lettucePool() { - return new DefaultLettucePool(this.config.getHost(), this.config.getPort(), - poolConfig()); + return new DefaultLettucePool(this.properties.getHost(), + this.properties.getPort(), poolConfig()); } private PoolConfig poolConfig() { PoolConfig pool = new PoolConfig(); - RedisProperties.Pool props = this.config.getPool(); + RedisProperties.Pool props = this.properties.getPool(); if (props != null) { pool.setMaxActive(props.getMaxActive()); pool.setMaxIdle(props.getMaxIdle()); @@ -110,19 +110,22 @@ public class RedisAutoConfiguration { } return pool; } + } @Bean(name = "org.springframework.autoconfigure.redis.RedisProperties") @ConditionalOnMissingBean public RedisProperties redisProperties() { + return new RedisProperties(); + } @Configuration protected static class RedisConfiguration { @Autowired - private RedisProperties config; + private RedisProperties properties; @Bean @ConditionalOnMissingBean(name = "redisTemplate") diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java index cd49f36c37..807fdd23f7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java @@ -66,7 +66,6 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor; * password=password) but can easily be customized by providing a bean definition * of type {@link AuthenticationManager}. Also provides audit logging of authentication * events. - * *
* Some common simple customizations: *
* Note: In case of multiple {@code @Configuration} classes, later {@code @Bean} * definitions will override ones defined in earlier loaded files. This can be leveraged diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainer.java index 7481c7a110..75385ddeab 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainer.java @@ -19,7 +19,6 @@ package org.springframework.boot.context.embedded; /** * Simple interface that represents a fully configured embedded servlet container (for * example Tomcat or Jetty). Allows the container to be {@link #stop() stopped}. - * *
* Instances of this class are usually obtained via a * {@link EmbeddedServletContainerFactory}. diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizer.java index cf0e492390..a82930ed52 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizer.java @@ -22,7 +22,6 @@ import org.springframework.beans.factory.config.BeanPostProcessor; * Strategy interface for customizing auto-configured embedded servlet containers. Any * beans of this type will get a callback with the container factory before the container * itself is started, so you can set the port, address, error pages etc. - * *
* Beware: calls to this interface are usually made from a * {@link EmbeddedServletContainerCustomizerBeanPostProcessor} which is a diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerInitializedEvent.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerInitializedEvent.java index 0fd38ddb9c..2dafedbf09 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerInitializedEvent.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerInitializedEvent.java @@ -63,4 +63,5 @@ public class EmbeddedServletContainerInitializedEvent extends ApplicationEvent { public ApplicationContext getApplicationContext() { return this.applicationContext; } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java index 89ed559dbc..90ae6b26f5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java @@ -56,14 +56,12 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** * A {@link WebApplicationContext} that can be used to bootstrap itself from a contained * {@link EmbeddedServletContainerFactory} bean. - * *
* This context will create, initialize and run an {@link EmbeddedServletContainer} by * searching for a single {@link EmbeddedServletContainerFactory} bean within the * {@link ApplicationContext} itself. The {@link EmbeddedServletContainerFactory} is free * to use standard Spring concepts (such as dependency injection, lifecycle callbacks and * property placeholder variables). - * *
* In addition, any {@link Servlet} or {@link Filter} beans defined in the context will be * automatically registered with the embedded Servlet container. In the case of a single @@ -71,14 +69,12 @@ import org.springframework.web.context.support.WebApplicationContextUtils; * the lowercase bean name will be used as a mapping prefix. Any Servlet named * 'dispatcherServlet' will always be mapped to '/'. Filter beans will be mapped to all * URLs ('/*'). - * *
* For more advanced configuration, the context can instead define beans that implement * the {@link ServletContextInitializer} interface (most often * {@link ServletRegistrationBean}s and/or {@link FilterRegistrationBean}s). To prevent * double registration, the use of {@link ServletContextInitializer} beans will disable * automatic Servlet and Filter bean registration. - * *
* Although this context can be used directly, most developers should consider using the * {@link AnnotationConfigEmbeddedWebApplicationContext} or diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java index e6dd7f68eb..a1f9feb978 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java @@ -34,7 +34,6 @@ import org.springframework.util.Assert; * A {@link ServletContextInitializer} to register {@link Filter}s in a Servlet 3.0+ * container. Similar to the {@link ServletContext#addFilter(String, Filter) registration} * features provided by {@link ServletContext} but with a Spring Bean friendly design. - * *
* The {@link #setFilter(Filter) Filter} must be specified before calling * {@link #onStartup(ServletContext)}. Registrations can be associated with @@ -263,4 +262,5 @@ public class FilterRegistrationBean extends RegistrationBean { } } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java index 79ae307cf2..63918eb75d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java @@ -112,4 +112,5 @@ public abstract class RegistrationBean implements ServletContextInitializer { registration.setInitParameters(this.initParameters); } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializer.java index 7d3c2f05f9..b174de8eda 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletContextInitializer.java @@ -28,11 +28,9 @@ import org.springframework.web.WebApplicationInitializer; * interface (and do not implement {@link WebApplicationInitializer}) will not be * detected by {@link SpringServletContainerInitializer} and hence will not be * automatically bootstrapped by the Servlet container. - * *
* This interface is primarily designed to allow {@link ServletContextInitializer}s to be * managed by Spring and not the Servlet container. - * *
* For configuration examples see {@link WebApplicationInitializer}. * 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 e3c3621d81..acac1371b0 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 @@ -34,7 +34,6 @@ import org.springframework.util.Assert; * container. Similar to the {@link ServletContext#addServlet(String, Servlet) * registration} features provided by {@link ServletContext} but with a Spring Bean * friendly design. - * *
* The {@link #setServlet(Servlet) servlet} must be specified before calling * {@link #onStartup}. URL mapping can be configured used {@link #setUrlMappings} or @@ -173,4 +172,5 @@ public class ServletRegistrationBean extends RegistrationBean { registration.setMultipartConfig(this.multipartConfig); } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/WebApplicationContextServletContextAwareProcessor.java index 39fef03293..e56d54650b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/WebApplicationContextServletContextAwareProcessor.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/WebApplicationContextServletContextAwareProcessor.java @@ -53,4 +53,5 @@ public class WebApplicationContextServletContextAwareProcessor extends ServletConfig servletConfig = this.webApplicationContext.getServletConfig(); return (servletConfig != null ? servletConfig : super.getServletConfig()); } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContext.java index 3f78b5fae9..f98c672654 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContext.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/XmlEmbeddedWebApplicationContext.java @@ -25,7 +25,6 @@ import org.springframework.web.context.support.XmlWebApplicationContext; /** * {@link EmbeddedWebApplicationContext} which takes its configuration from XML documents, * understood by an {@link org.springframework.beans.factory.xml.XmlBeanDefinitionReader}. - * *
* Note: In case of multiple config locations, later bean definitions will override ones * defined in earlier loaded files. This can be leveraged to deliberately override certain diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java index 710bb69c92..0f2a6c484b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java @@ -40,6 +40,7 @@ public class JettyEmbeddedServletContainer implements EmbeddedServletContainer { private final Log logger = LogFactory.getLog(JettyEmbeddedServletContainer.class); private final Server server; + private final boolean autoStart; /** @@ -144,4 +145,5 @@ public class JettyEmbeddedServletContainer implements EmbeddedServletContainer { public Server getServer() { return this.server; } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index fd3acfcd4a..829299b917 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -49,7 +49,6 @@ import org.springframework.util.StringUtils; * {@link EmbeddedServletContainerFactory} that can be used to create * {@link JettyEmbeddedServletContainer}s. Can be initialized using Spring's * {@link ServletContextInitializer}s or Jetty {@link Configuration}s. - * *
* Unless explicitly configured otherwise this factory will created containers that * listens for HTTP requests on port 8080. @@ -302,4 +301,5 @@ public class JettyEmbeddedServletContainerFactory extends } } } + } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index ae98e27eaf..e9385f20a4 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -59,7 +59,6 @@ import org.springframework.util.StreamUtils; * {@link EmbeddedServletContainerFactory} that can be used to create * {@link TomcatEmbeddedServletContainer}s. Can be initialized using Spring's * {@link ServletContextInitializer}s or Tomcat {@link LifecycleListener}s. - * *
* Unless explicitly configured otherwise this factory will created containers that
* listens for HTTP requests on port 8080.
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializer.java
index 6a94a31d7b..7b2c7803d5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationContextInitializer.java
@@ -122,4 +122,5 @@ public class EnvironmentDelegateApplicationContextInitializer implements
public int getOrder() {
return this.order;
}
+
}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListener.java
index 270c0b2630..d3add41b7d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/env/EnvironmentDelegateApplicationListener.java
@@ -102,4 +102,5 @@ public class EnvironmentDelegateApplicationListener implements
public int getOrder() {
return this.order;
}
+
}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializer.java
index 1b73028000..415b883ab8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/web/ServletContextApplicationContextInitializer.java
@@ -35,7 +35,8 @@ public class ServletContextApplicationContextInitializer implements
private final ServletContext servletContext;
/**
- * @param servletContext
+ * Create a new {@link ServletContextApplicationContextInitializer} instance
+ * @param servletContext the servlet that should be ultimately set.
*/
public ServletContextApplicationContextInitializer(ServletContext servletContext) {
this.servletContext = servletContext;
diff --git a/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java
index 350c899e09..264153ce2c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/json/JsonParserFactory.java
@@ -42,4 +42,5 @@ public abstract class JsonParserFactory {
}
return new SimpleJsonParser();
}
+
}
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java
index b7198a6899..f75c4edcf8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/ClasspathLoggingApplicationListener.java
@@ -79,8 +79,7 @@ public final class ClasspathLoggingApplicationListener implements
if (classLoader instanceof URLClassLoader) {
return Arrays.toString(((URLClassLoader) classLoader).getURLs());
}
- else {
- return "unknown";
- }
+ return "unknown";
}
+
}
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
index cdf01d12b2..0ed40e4d5d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
@@ -17,8 +17,6 @@
package org.springframework.boot.logging;
import java.lang.management.ManagementFactory;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -46,7 +44,6 @@ import org.springframework.util.ResourceUtils;
* system, otherwise a default location is used. The classpath is probed for log4j and
* logback and if those are present they will be reconfigured, otherwise vanilla
* java.util.logging will be used.
* The default config locations are classpath:log4j.properties or
* classpath:log4j.xml for log4j; classpath:logback.xml for
@@ -54,8 +51,6 @@ import org.springframework.util.ResourceUtils;
* java.util.logging. If the correct one of those files is not found then
* some sensible defaults are adopted from files of the same name but in the package
* containing {@link LoggingApplicationListener}.
- *
* Some system properties may be set as side effects, and these can be useful if the
* logging configuration supports placeholders (i.e. log4j or logback):
@@ -91,10 +86,8 @@ public class LoggingApplicationListener implements SmartApplicationListener {
LOG_LEVEL_LOGGERS.add(LogLevel.TRACE, "org.hibernate.tool.hbm2ddl");
}
- @SuppressWarnings("unchecked")
- private static Collection
* Note that a WebApplicationInitializer is only needed if you are building a war file and
* deploying it. If you prefer to run an embedded container (we do) then you won't need
* this at all.
@@ -95,7 +94,6 @@ public abstract class SpringBootServletInitializer implements WebApplicationInit
* config classes) because other settings have sensible defaults. You might choose
* (for instance) to add default command line arguments, or set an active Spring
* profile.
- *
* @param application a builder for the application context
* @see SpringApplicationBuilder
*/
diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/ArrayDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/ArrayDocumentMatcher.java
index dade269bd9..c1c8315ba1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/yaml/ArrayDocumentMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/yaml/ArrayDocumentMatcher.java
@@ -58,4 +58,5 @@ public class ArrayDocumentMatcher implements DocumentMatcher {
}
return MatchStatus.NOT_FOUND;
}
-}
\ No newline at end of file
+
+}
diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/DefaultProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/DefaultProfileDocumentMatcher.java
index 18e9cc520d..95c00dda58 100644
--- a/spring-boot/src/main/java/org/springframework/boot/yaml/DefaultProfileDocumentMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/yaml/DefaultProfileDocumentMatcher.java
@@ -38,4 +38,5 @@ public class DefaultProfileDocumentMatcher implements DocumentMatcher {
return MatchStatus.NOT_FOUND;
}
}
-}
\ No newline at end of file
+
+}
diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/YamlPropertiesFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlPropertiesFactoryBean.java
index b0d2770a3c..b0dd3749ec 100644
--- a/spring-boot/src/main/java/org/springframework/boot/yaml/YamlPropertiesFactoryBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/yaml/YamlPropertiesFactoryBean.java
@@ -105,4 +105,5 @@ public class YamlPropertiesFactoryBean extends YamlProcessor implements
public boolean isSingleton() {
return this.singleton;
}
+
}