diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java index ea18f751fc..1221fd1c76 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java @@ -126,6 +126,7 @@ public class ManagementWebSecurityAutoConfiguration { } } + } @Configuration diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java index ab4d4654be..63fe5409f7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpoint.java @@ -45,8 +45,8 @@ import org.springframework.web.util.UrlPathHelper; */ @ConfigurationProperties(prefix = "endpoints.jolokia", ignoreUnknownFields = false) @HypermediaDisabled -public class JolokiaMvcEndpoint extends AbstractNamedMvcEndpoint - implements InitializingBean, ApplicationContextAware, ServletContextAware, DisposableBean { +public class JolokiaMvcEndpoint extends AbstractNamedMvcEndpoint implements + InitializingBean, ApplicationContextAware, ServletContextAware, DisposableBean { private final ServletWrappingController controller = new ServletWrappingController(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java index 387cf3c42f..324f703eb4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java @@ -64,8 +64,8 @@ public class AuthorizationAuditListener extends AbstractAuthorizationAuditListen if (event.getAuthentication().getDetails() != null) { data.put("details", event.getAuthentication().getDetails()); } - publish(new AuditEvent(event.getAuthentication().getName(), - AUTHORIZATION_FAILURE, data)); + publish(new AuditEvent(event.getAuthentication().getName(), AUTHORIZATION_FAILURE, + data)); } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java index 20d54973fd..37818fa174 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfigurationTests.java @@ -346,8 +346,8 @@ public class CrshAutoConfigurationTests { && authentication.getCredentials().equals(PASSWORD)) { authentication = new UsernamePasswordAuthenticationToken( authentication.getPrincipal(), - authentication.getCredentials(), Collections - .singleton(new SimpleGrantedAuthority("ACTUATOR"))); + authentication.getCredentials(), Collections.singleton( + new SimpleGrantedAuthority("ACTUATOR"))); } else { throw new BadCredentialsException( diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java index 981459dcd2..efc37364e8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java @@ -269,8 +269,8 @@ public class EndpointMBeanExporterTests { MBeanExporter mbeanExporter = registerLoggersEndpoint(); Object response = mbeanExporter.getServer().invoke( getObjectName("loggersEndpoint", this.context), "setLogLevel", - new Object[]{"com.example", "trace"}, - new String[]{String.class.getName(), String.class.getName()}); + new Object[] { "com.example", "trace" }, + new String[] { String.class.getName(), String.class.getName() }); assertThat(response).isNull(); } @@ -280,10 +280,9 @@ public class EndpointMBeanExporterTests { this.thrown.expect(MBeanException.class); this.thrown.expectCause(hasMessage(containsString("No enum constant"))); this.thrown.expectCause(hasMessage(containsString("LogLevel.INVALID"))); - mbeanExporter.getServer().invoke( - getObjectName("loggersEndpoint", this.context), "setLogLevel", - new Object[]{"com.example", "invalid"}, - new String[]{String.class.getName(), String.class.getName()}); + mbeanExporter.getServer().invoke(getObjectName("loggersEndpoint", this.context), + "setLogLevel", new Object[] { "com.example", "invalid" }, + new String[] { String.class.getName(), String.class.getName() }); } private MBeanExporter registerLoggersEndpoint() { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java index e24fa49817..c5c04e82b6 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java @@ -109,6 +109,7 @@ public class MvcEndpointsTests { TestMvcEndpoint(Endpoint delegate) { super(delegate); } + } private static class OtherTestMvcEndpoint extends EndpointMvcAdapter { @@ -116,6 +117,7 @@ public class MvcEndpointsTests { OtherTestMvcEndpoint(Endpoint delegate) { super(delegate); } + } } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java index 580477399f..b1848800ec 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java @@ -86,8 +86,8 @@ public class AuthenticationAuditListenerTests { AuditApplicationEvent event = handleAuthenticationEvent( new AuthenticationSwitchUserEvent( new UsernamePasswordAuthenticationToken("user", "password"), - new User("user", "password", - AuthorityUtils.commaSeparatedStringToAuthorityList("USER")))); + new User("user", "password", AuthorityUtils + .commaSeparatedStringToAuthorityList("USER")))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_SWITCH); } @@ -98,12 +98,12 @@ public class AuthenticationAuditListenerTests { UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken( "user", "password"); authentication.setDetails(details); - AuditApplicationEvent event = handleAuthenticationEvent(new AuthenticationFailureExpiredEvent( - authentication, new BadCredentialsException("Bad user"))); + AuditApplicationEvent event = handleAuthenticationEvent( + new AuthenticationFailureExpiredEvent(authentication, + new BadCredentialsException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE); - assertThat(event.getAuditEvent().getData()) - .containsEntry("details", details); + assertThat(event.getAuditEvent().getData()).containsEntry("details", details); } private AuditApplicationEvent handleAuthenticationEvent( diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java index 7785202a52..e1410f3b37 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java @@ -56,7 +56,8 @@ public class AuthorizationAuditListenerTests { public void testAuthenticationCredentialsNotFound() { AuditApplicationEvent event = handleAuthorizationEvent( new AuthenticationCredentialsNotFoundEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), new AuthenticationCredentialsNotFoundException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthenticationAuditListener.AUTHENTICATION_FAILURE); @@ -66,7 +67,8 @@ public class AuthorizationAuditListenerTests { public void testAuthorizationFailure() { AuditApplicationEvent event = handleAuthorizationEvent( new AuthorizationFailureEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), new UsernamePasswordAuthenticationToken("user", "password"), new AccessDeniedException("Bad user"))); assertThat(event.getAuditEvent().getType()) @@ -81,7 +83,8 @@ public class AuthorizationAuditListenerTests { authentication.setDetails(details); AuditApplicationEvent event = handleAuthorizationEvent( new AuthorizationFailureEvent(this, - Collections.singletonList(new SecurityConfig("USER")), + Collections.singletonList( + new SecurityConfig("USER")), authentication, new AccessDeniedException("Bad user"))); assertThat(event.getAuditEvent().getType()) .isEqualTo(AuthorizationAuditListener.AUTHORIZATION_FAILURE); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java index 2379fdb4a0..eeb9d29fe5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java @@ -30,7 +30,6 @@ public enum SearchStrategy { /** * Search all parents and ancestors, but not the current context. - * * @deprecated since 1.5 in favor of {@link SearchStrategy#ANCESTORS} */ @Deprecated PARENTS, diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java index f10aec41ce..1f1a3d08db 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java @@ -84,6 +84,7 @@ abstract class DataSourceConfiguration { /** * DBCP DataSource configuration. + * * @deprecated as of Spring Boot 1.5 in favor of DBCP2 */ @ConditionalOnClass(org.apache.commons.dbcp.BasicDataSource.class) 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 dde619245f..bbe619a7bb 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 @@ -124,8 +124,8 @@ class DataSourceInitializer implements ApplicationListener getScripts(String propertyName, - List resources, String fallback) { + private List getScripts(String propertyName, List resources, + String fallback) { if (resources != null) { return getResources(propertyName, resources, true); } @@ -136,8 +136,8 @@ class DataSourceInitializer implements ApplicationListener getResources(String propertyName, - List locations, boolean validate) { + private List getResources(String propertyName, List locations, + boolean validate) { List resources = new ArrayList(); for (String location : locations) { for (Resource resource : doGetResources(location)) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java index 2dea5b54fd..8a4b993945 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsProperties.java @@ -130,6 +130,7 @@ public class JmsProperties { ? this.concurrency + "-" + this.maxConcurrency : String.valueOf(this.concurrency)); } + } public static class Template { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java index f5b735d1f6..54d580bad1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java @@ -30,8 +30,8 @@ import org.springframework.jdbc.support.SQLExceptionTranslator; import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator; /** - * Transforms {@link java.sql.SQLException} into a Spring-specific {@link - * DataAccessException}. + * Transforms {@link java.sql.SQLException} into a Spring-specific + * {@link DataAccessException}. * * @author Lukas Eder * @author Andreas Ahlenstorf diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java index b25d883443..628f346154 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfiguration.java @@ -56,7 +56,8 @@ public class ValidationAutoConfiguration { @Bean @ConditionalOnMissingBean - public MethodValidationPostProcessor methodValidationPostProcessor(Validator validator) { + public MethodValidationPostProcessor methodValidationPostProcessor( + Validator validator) { MethodValidationPostProcessor processor = new MethodValidationPostProcessor(); processor.setValidator(validator); return processor; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 00f9e586d1..a7def07eed 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -1554,6 +1554,7 @@ public class ServerProperties public void setRotate(boolean rotate) { this.rotate = rotate; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java index 99563aaf57..8417a4e794 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java @@ -297,9 +297,8 @@ public class DataSourceInitializerTests { PropertyPlaceholderAutoConfiguration.class); EnvironmentTestUtils.addEnvironment(this.context, "spring.datasource.initialize:true", - "spring.datasource.schema:" - + ClassUtils.addResourcePathToPackagePath(getClass(), - "schema.sql"), + "spring.datasource.schema:" + ClassUtils + .addResourcePathToPackagePath(getClass(), "schema.sql"), "spring.datasource.data:classpath:does/not/exist.sql"); this.thrown.expect(BeanCreationException.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java index 8bec1437e8..b9337677dd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java @@ -67,14 +67,15 @@ public class ValidationAutoConfigurationTests { public void userDefinedMethodValidationPostProcessorTakesPrecedence() { load(SampleConfiguration.class); assertThat(this.context.getBeansOfType(Validator.class)).hasSize(1); - Object userMethodValidationPostProcessor = - this.context.getBean("testMethodValidationPostProcessor"); + Object userMethodValidationPostProcessor = this.context + .getBean("testMethodValidationPostProcessor"); assertThat(this.context.getBean(MethodValidationPostProcessor.class)) .isSameAs(userMethodValidationPostProcessor); assertThat(this.context.getBeansOfType(MethodValidationPostProcessor.class)) .hasSize(1); - assertThat(this.context.getBean(Validator.class)).isNotSameAs( - new DirectFieldAccessor(userMethodValidationPostProcessor).getPropertyValue("validator")); + assertThat(this.context.getBean(Validator.class)) + .isNotSameAs(new DirectFieldAccessor(userMethodValidationPostProcessor) + .getPropertyValue("validator")); } public void load(Class config) { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java index 725437d6de..ae25bc252c 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContextTests.java @@ -36,7 +36,8 @@ public class DependencyResolutionContextTests { @Test public void canAddSpringBootDependencies() { DependencyResolutionContext dependencyResolutionContext = new DependencyResolutionContext(); - dependencyResolutionContext.addDependencyManagement(new SpringBootDependenciesDependencyManagement()); + dependencyResolutionContext.addDependencyManagement( + new SpringBootDependenciesDependencyManagement()); assertThat(dependencyResolutionContext.getManagedDependencies()).isNotEmpty(); } diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java index 40b1680e8f..515d888692 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java @@ -35,7 +35,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest -@TestPropertySource(properties = {"endpoints.hypermedia.enabled: true", "management.security.enabled: false"}) +@TestPropertySource(properties = { "endpoints.hypermedia.enabled: true", + "management.security.enabled: false" }) public class SampleHypermediaGsonApplicationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java index 3dfbeffcff..6f38b7f82c 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java @@ -73,8 +73,8 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter { @Override public void init(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication().withUser("admin").password("admin") - .roles("ADMIN", "USER", "ACTUATOR").and().withUser("user").password("user") - .roles("USER"); + .roles("ADMIN", "USER", "ACTUATOR").and().withUser("user") + .password("user").roles("USER"); } } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java index 317afaac29..e363fb1c48 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureJdbc.java @@ -25,9 +25,9 @@ import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; /** - * {@link ImportAutoConfiguration Auto-configuration imports} for typical jdbc tests. - * Most tests should consider using {@link JdbcTest @JdbcTest} rather than using - * this annotation directly. + * {@link ImportAutoConfiguration Auto-configuration imports} for typical jdbc tests. Most + * tests should consider using {@link JdbcTest @JdbcTest} rather than using this + * annotation directly. * * @author Stephane Nicoll * @since 1.5.0 @@ -38,4 +38,5 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @Documented @ImportAutoConfiguration public @interface AutoConfigureJdbc { + } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java index 8825771cda..122b02712b 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTypeExcludeFilter.java @@ -49,10 +49,10 @@ class JdbcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter { @Override protected ComponentScan.Filter[] getFilters(FilterType type) { switch (type) { - case INCLUDE: - return this.annotation.includeFilters(); - case EXCLUDE: - return this.annotation.excludeFilters(); + case INCLUDE: + return this.annotation.includeFilters(); + case EXCLUDE: + return this.annotation.excludeFilters(); } throw new IllegalStateException("Unsupported type " + type); } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java index 5234da155c..09a827065d 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java @@ -34,7 +34,8 @@ import org.springframework.boot.test.autoconfigure.properties.PropertyMapping; * instead of any application defined or auto-configured {@link DataSource}. * * @author Stephane Nicoll - * @deprecated since 1.5 in favour of {@link org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase} + * @deprecated since 1.5 in favour of + * {@link org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase} */ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java index 6fcab22879..64264c8883 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java @@ -62,16 +62,14 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests { @Primary public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } @Bean public DataSource secondaryDataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java index d14eaf3f92..cc41a38cd7 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java @@ -34,8 +34,7 @@ public class ExampleJdbcApplication { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java index 6247b2e418..db6a80933c 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleRepository.java @@ -49,8 +49,9 @@ public class ExampleRepository { } public ExampleEntity findById(int id) { - return this.jdbcTemplate.queryForObject("select id, name from example where id =?", - new Object[] { id }, ROW_MAPPER); + return this.jdbcTemplate.queryForObject( + "select id, name from example where id =?", new Object[] { id }, + ROW_MAPPER); } public Collection findAll() { @@ -65,6 +66,7 @@ public class ExampleRepository { String name = rs.getString("name"); return new ExampleEntity(id, name); } + } } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java index cc4902ae6c..218f46e4bf 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java @@ -61,8 +61,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTest @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java index f223d8a898..4dcad35dce 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java @@ -63,8 +63,7 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationT @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java index 650bf6caa9..069310c262 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java @@ -93,8 +93,7 @@ public class TestDatabaseAutoConfigurationTests { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java index cb84ae81ea..9dd732b565 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java @@ -76,8 +76,7 @@ public class DataJpaTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationT @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.H2); + .generateUniqueName(true).setType(EmbeddedDatabaseType.H2); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java index 022996d085..188f336328 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java @@ -34,8 +34,7 @@ public class ExampleDataJpaApplication { @Bean public DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() - .generateUniqueName(true) - .setType(EmbeddedDatabaseType.HSQL); + .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL); return builder.build(); } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java index 5ea2c26a13..c5aa5e7d16 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTestAllControllersIntegrationTests.java @@ -68,8 +68,7 @@ public class WebMvcTestAllControllersIntegrationTests { @Test public void shouldRunValidationSuccess() throws Exception { - this.mvc.perform(get("/three/OK")) - .andExpect(status().isOk()) + this.mvc.perform(get("/three/OK")).andExpect(status().isOk()) .andExpect(content().string("Hello OK")); } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java index 7d6c662f10..1c735eebc5 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java @@ -59,7 +59,8 @@ class TypeElementMembers { private final FieldValuesParser fieldValuesParser; - TypeElementMembers(ProcessingEnvironment env, FieldValuesParser fieldValuesParser, TypeElement element) { + TypeElementMembers(ProcessingEnvironment env, FieldValuesParser fieldValuesParser, + TypeElement element) { this.env = env; this.typeUtils = new TypeUtils(this.env); this.fieldValuesParser = fieldValuesParser; diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index bf3ffba589..69ba7d4ba0 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -357,10 +357,18 @@ public class ConfigurationMetadataAnnotationProcessorTests { ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class); assertThat(metadata).has(Metadata.withGroup("nestedChildProps") .fromSource(ClassWithNestedProperties.NestedChildClass.class)); - assertThat(metadata).has(Metadata.withProperty("nestedChildProps.child-class-property", Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(20)); - assertThat(metadata).has(Metadata.withProperty("nestedChildProps.parent-class-property", Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class).withDefaultValue(10)); + assertThat(metadata) + .has(Metadata + .withProperty("nestedChildProps.child-class-property", + Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(20)); + assertThat(metadata) + .has(Metadata + .withProperty("nestedChildProps.parent-class-property", + Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(10)); } @Test diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java index fc3e4abe6a..247fcea05f 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/method/DeprecatedMethodConfig.java @@ -52,6 +52,7 @@ public class DeprecatedMethodConfig { public void setFlag(boolean flag) { this.flag = flag; } + } } diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java index 80aaa6c2f2..bec8e0f663 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/ClassWithNestedProperties.java @@ -36,6 +36,7 @@ public class ClassWithNestedProperties { public void setParentClassProperty(int parentClassProperty) { this.parentClassProperty = parentClassProperty; } + } @ConfigurationProperties(prefix = "nestedChildProps") @@ -50,5 +51,7 @@ public class ClassWithNestedProperties { public void setChildClassProperty(int childClassProperty) { this.childClassProperty = childClassProperty; } + } + } diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java index 0612b41c18..a2f71f8c59 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java @@ -392,7 +392,6 @@ public abstract class MainClassFinder { * Creates a new {@code MainClass} rather represents the main class with the given * {@code name}. The class is annotated with the annotations with the given * {@code annotationNames}. - * * @param name the name of the class * @param annotationNames the names of the annotations on the class */ diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java index 6efca10a31..59f94407a8 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java @@ -65,7 +65,8 @@ public class ExplodedArchive implements Archive { * Create a new {@link ExplodedArchive} instance. * @param root the root folder * @param recursive if recursive searching should be used to locate the manifest. - * Defaults to {@code true}, folders with a large tree might want to set this to {@code + * Defaults to {@code true}, folders with a large tree might want to set this to + * {@code * false}. */ public ExplodedArchive(File root, boolean recursive) { diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java index 4eb94098e1..187cfdb164 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java @@ -412,8 +412,8 @@ public class UndertowEmbeddedServletContainerFactory String prefix = (this.accessLogPrefix != null ? this.accessLogPrefix : "access_log."); AccessLogReceiver accessLogReceiver = new DefaultAccessLogReceiver( - createWorker(), this.accessLogDirectory, prefix, - this.accessLogSuffix, this.accessLogRotate); + createWorker(), this.accessLogDirectory, prefix, this.accessLogSuffix, + this.accessLogRotate); String formatString = (this.accessLogPattern != null) ? this.accessLogPattern : "common"; return new AccessLogHandler(handler, accessLogReceiver, formatString, diff --git a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index 97deea9544..27bd772fef 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -164,7 +164,7 @@ public enum DatabaseDriver { * Informix. */ INFORMIX("informix", "Informix Dynamic Server", "com.informix.jdbc.IfxDriver", null, - "select count(*) from systables") { + "select count(*) from systables") { @Override protected Collection getUrlPrefixes() { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java index e84f025026..376c13ef99 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java @@ -184,6 +184,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem { /** * Maintains a mapping between native levels and {@link LogLevel}. + * * @param The native level type */ protected static class LogLevels { diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java index 6f4c32d2ca..4d33be2ff7 100644 --- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java +++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java @@ -48,9 +48,9 @@ public abstract class LoggingSystem { public static final String NONE = "none"; /** - * The name used for the root logger. LoggingSystem implementations should ensure - * that this is the name used to represent the root logger, regardless of the - * underlying implementation. + * The name used for the root logger. LoggingSystem implementations should ensure that + * this is the name used to represent the root logger, regardless of the underlying + * implementation. */ public static final String ROOT_LOGGER_NAME = "ROOT"; diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java index 281a8eabc6..aeef5859c5 100644 --- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java +++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java @@ -75,16 +75,15 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { } String text = builder.toString(); - String finalText = isCaseInsensitive(jdbcEnvironment) ? text.toLowerCase(Locale.ROOT) - : text; + String finalText = isCaseInsensitive(jdbcEnvironment) + ? text.toLowerCase(Locale.ROOT) : text; return new Identifier(finalText, name.isQuoted()); } /** * Specify whether the database is case sensitive. * @param jdbcEnvironment The JDBC environment which can be used to determine case - * @return true if the database is case insensitive - * sensitivity + * @return true if the database is case insensitive sensitivity */ protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) { return true; diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java index eabcf28293..492e2f81a1 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java @@ -699,6 +699,7 @@ public class EnableConfigurationPropertiesTests { } // No getter - you should be able to bind to a write-only bean + } // No annotation diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java index c6010bc8e9..9fe1f8dcdf 100644 --- a/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java @@ -176,7 +176,8 @@ public class JavaLoggingSystemTests extends AbstractLoggingSystemTests { List configurations = this.loggingSystem .getLoggerConfigurations(); assertThat(configurations).isNotEmpty(); - assertThat(configurations.get(0).getName()).isEqualTo(LoggingSystem.ROOT_LOGGER_NAME); + assertThat(configurations.get(0).getName()) + .isEqualTo(LoggingSystem.ROOT_LOGGER_NAME); } @Test diff --git a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java index 39353f2103..8adeee8bfc 100644 --- a/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java @@ -70,13 +70,14 @@ public class SpringPhysicalNamingStrategyTests { @Test public void tableNameShouldNotBeLowerCaseIfCaseSensitive() throws Exception { this.metadata = this.metadataSources.getMetadataBuilder(this.serviceRegistry) - .applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy()).build(); + .applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy()) + .build(); PersistentClass binding = this.metadata .getEntityBinding(TelephoneNumber.class.getName()); assertThat(binding.getTable().getQuotedName()).isEqualTo("Telephone_Number"); } - private class TestSpringPhysicalNamingStrategy extends SpringPhysicalNamingStrategy { + private class TestSpringPhysicalNamingStrategy extends SpringPhysicalNamingStrategy { @Override protected boolean isCaseInsensitive(JdbcEnvironment jdbcEnvironment) { @@ -84,4 +85,5 @@ public class SpringPhysicalNamingStrategyTests { } } + }