From a256602c7b226d03bb51af16a0c5b15dfc8c191c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Oct 2017 14:41:03 +0100 Subject: [PATCH] Polish --- ...CloudFoundryActuatorAutoConfiguration.java | 4 +-- ...FoundryActuatorAutoConfigurationTests.java | 6 ++-- .../AnnotationEndpointDiscoverer.java | 6 ++-- .../redis/LettuceConnectionConfiguration.java | 4 +-- .../security/SecurityAutoConfiguration.java | 3 +- ...h2ClientPropertiesRegistrationAdapter.java | 15 ++++++---- ...tomHibernateJpaAutoConfigurationTests.java | 30 +++++++++---------- .../HibernateJpaAutoConfigurationTests.java | 3 +- ...entPropertiesRegistrationAdapterTests.java | 3 +- .../OAuth2WebSecurityConfigurationTests.java | 3 +- ...eactiveSecurityAutoConfigurationTests.java | 4 +-- .../infrastructure/CommandLineInvoker.java | 5 ++-- ...tClientSpringBootTestIntegrationTests.java | 8 +++-- .../test/mock/mockito/DefinitionsParser.java | 4 +-- .../boot/gradle/tasks/run/BootRun.java | 6 ++-- .../docs/PackagingDocumentationTests.java | 6 ++-- .../docs/RunningDocumentationTests.java | 2 +- .../AbstractBootArchiveIntegrationTests.java | 4 +-- .../boot/gradle/testkit/GradleBuild.java | 3 +- .../boot/maven/RunArgumentsTests.java | 4 +-- .../springframework/boot/ApplicationTemp.java | 4 +-- ...urationPropertiesBindingPostProcessor.java | 6 ++-- .../orm/jpa/EntityManagerFactoryBuilder.java | 7 +++-- 23 files changed, 78 insertions(+), 62 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index f474709133..87d8eccc28 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -85,8 +85,8 @@ public class CloudFoundryActuatorAutoConfiguration { endpointMediaTypes); return new CloudFoundryWebEndpointServletHandlerMapping( new EndpointMapping("/cloudfoundryapplication"), - endpointDiscoverer.discoverEndpoints(), endpointMediaTypes, getCorsConfiguration(), - getSecurityInterceptor(builder, environment)); + endpointDiscoverer.discoverEndpoints(), endpointMediaTypes, + getCorsConfiguration(), getSecurityInterceptor(builder, environment)); } private CloudFoundrySecurityInterceptor getSecurityInterceptor( diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java index 56d6528bf0..8c0f729b7c 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java @@ -208,11 +208,13 @@ public class CloudFoundryActuatorAutoConfigurationTests { } @Test - public void allEndpointsAvailableUnderCloudFoundryWithoutEnablingWeb() throws Exception { + public void allEndpointsAvailableUnderCloudFoundryWithoutEnablingWeb() + throws Exception { this.context.register(TestConfiguration.class); this.context.refresh(); CloudFoundryWebEndpointServletHandlerMapping handlerMapping = getHandlerMapping(); - List> endpoints = (List>) handlerMapping.getEndpoints(); + List> endpoints = (List>) handlerMapping + .getEndpoints(); assertThat(endpoints.size()).isEqualTo(1); assertThat(endpoints.get(0).getId()).isEqualTo("test"); } diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscoverer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscoverer.java index 26ee5e5ca0..cfc90d0502 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscoverer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AnnotationEndpointDiscoverer.java @@ -163,8 +163,10 @@ public abstract class AnnotationEndpointDiscoverer private EndpointInfo getEndpointInfo(Map, EndpointInfo> endpoints, Class beanType, Class endpointClass) { EndpointInfo endpoint = endpoints.get(endpointClass); - Assert.state(endpoint != null, () -> "Invalid extension '" + beanType.getName() - + "': no endpoint found with type '" + endpointClass.getName() + "'"); + Assert.state(endpoint != null, + () -> "Invalid extension '" + beanType.getName() + + "': no endpoint found with type '" + endpointClass.getName() + + "'"); return endpoint; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java index 10f4851757..69c38b3f52 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java @@ -75,8 +75,8 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration { @ConditionalOnMissingBean(RedisConnectionFactory.class) public LettuceConnectionFactory redisConnectionFactory( ClientResources clientResources) throws UnknownHostException { - LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(clientResources, - this.properties.getLettuce().getPool()); + LettuceClientConfiguration clientConfig = getLettuceClientConfiguration( + clientResources, this.properties.getLettuce().getPool()); return createLettuceConnectionFactory(clientConfig); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java index 8770cebaf8..4495ef4169 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java @@ -41,8 +41,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; * @author Madhura Bhave */ @Configuration -@ConditionalOnClass({ AuthenticationManager.class, - EnableWebSecurity.class }) +@ConditionalOnClass({ AuthenticationManager.class, EnableWebSecurity.class }) @EnableConfigurationProperties(SecurityProperties.class) @Import({ SpringBootWebSecurityConfiguration.class, WebSecurityEnablerConfiguration.class, AuthenticationManagerConfiguration.class, SecurityDataConfiguration.class }) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java index ce1dbde4c9..ceb4dfdc11 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapter.java @@ -70,10 +70,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter { private static Builder getBuilder(String registrationId, String configuredProviderId, Map providers) { - String providerId = (configuredProviderId == null ? registrationId : configuredProviderId); + String providerId = (configuredProviderId == null ? registrationId + : configuredProviderId); CommonOAuth2Provider provider = getCommonProvider(providerId); if (provider == null && !providers.containsKey(providerId)) { - throw new IllegalStateException(getErrorMessage(configuredProviderId, registrationId)); + throw new IllegalStateException( + getErrorMessage(configuredProviderId, registrationId)); } Builder builder = (provider != null ? provider.getBuilder(registrationId) : ClientRegistration.withRegistrationId(registrationId)); @@ -83,9 +85,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter { return builder; } - private static String getErrorMessage(String configuredProviderId, String registrationId) { - return (configuredProviderId == null ? "Provider ID must be specified for client registration '" + registrationId + "'" : - "Unknown provider ID '" + configuredProviderId + "'"); + private static String getErrorMessage(String configuredProviderId, + String registrationId) { + return (configuredProviderId == null + ? "Provider ID must be specified for client registration '" + + registrationId + "'" + : "Unknown provider ID '" + configuredProviderId + "'"); } private static Builder getBuilder(Builder builder, Provider provider) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index a104abf754..21aa11bc29 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -55,31 +55,31 @@ public class CustomHibernateJpaAutoConfigurationTests { .withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class)); - @Test public void namingStrategyDelegatorTakesPrecedence() { this.contextRunner .withPropertyValues( "spring.jpa.properties.hibernate.ejb.naming_strategy_delegator:" - + "org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator" - ).run((context) -> { - JpaProperties bean = context.getBean(JpaProperties.class); - Map hibernateProperties = bean - .getHibernateProperties("create-drop"); - assertThat(hibernateProperties.get("hibernate.ejb.naming_strategy")).isNull(); - }); + + "org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator") + .run((context) -> { + JpaProperties bean = context.getBean(JpaProperties.class); + Map hibernateProperties = bean + .getHibernateProperties("create-drop"); + assertThat(hibernateProperties.get("hibernate.ejb.naming_strategy")) + .isNull(); + }); } @Test public void defaultDatabaseForH2() { - this.contextRunner.withPropertyValues( - "spring.datasource.url:jdbc:h2:mem:testdb", + this.contextRunner.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb", "spring.datasource.initialize:false").run((context) -> { - HibernateJpaVendorAdapter bean = context - .getBean(HibernateJpaVendorAdapter.class); - Database database = (Database) ReflectionTestUtils.getField(bean, "database"); - assertThat(database).isEqualTo(Database.H2); - }); + HibernateJpaVendorAdapter bean = context + .getBean(HibernateJpaVendorAdapter.class); + Database database = (Database) ReflectionTestUtils.getField(bean, + "database"); + assertThat(database).isEqualTo(Database.H2); + }); } @Configuration diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index f597758f5e..4a44badef9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -258,8 +258,7 @@ public class HibernateJpaAutoConfigurationTests @Test public void customResourceMapping() { - contextRunner() - .withClassLoader(new HideDataScriptClassLoader()) + contextRunner().withClassLoader(new HideDataScriptClassLoader()) .withPropertyValues( "spring.datasource.data:classpath:/db/non-annotated-data.sql", "spring.jpa.mapping-resources=META-INF/mappings/non-annotated.xml") diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java index 2f1bf6d1d7..7535d357bc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java @@ -208,7 +208,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests { Registration registration = new Registration(); properties.getRegistration().put("missing", registration); this.thrown.expect(IllegalStateException.class); - this.thrown.expectMessage("Provider ID must be specified for client registration 'missing'"); + this.thrown.expectMessage( + "Provider ID must be specified for client registration 'missing'"); OAuth2ClientPropertiesRegistrationAdapter.getClientRegistrations(properties); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java index d377002a3d..03b9d82d6b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java @@ -154,7 +154,8 @@ public class OAuth2WebSecurityConfigurationTests { } private ClientRegistration getClientRegistration(String id, String userInfoUri) { - ClientRegistration.Builder builder = ClientRegistration.withRegistrationId(id); + ClientRegistration.Builder builder = ClientRegistration + .withRegistrationId(id); builder.clientName("foo").clientId("foo") .clientAuthenticationMethod( org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java index 9753e590cb..492d74c500 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java @@ -103,8 +103,8 @@ public class ReactiveSecurityAutoConfigurationTests { TestConfig.class) .withConfiguration( AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class)) - .run((context) -> assertThat(context).getBean(ReactiveUserDetailsService.class) - .isNull()); + .run((context) -> assertThat(context) + .getBean(ReactiveUserDetailsService.class).isNull()); } @Configuration diff --git a/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java b/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java index 8155e2feba..cd149d1f2f 100644 --- a/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java +++ b/spring-boot-project/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java @@ -93,8 +93,9 @@ public final class CommandLineInvoker { } File bin = new File(unpacked.listFiles()[0], "bin"); File launchScript = new File(bin, isWindows() ? "spring.bat" : "spring"); - Assert.state(launchScript.exists() && launchScript.isFile(), () -> - "Could not find CLI launch script " + launchScript.getAbsolutePath()); + Assert.state(launchScript.exists() && launchScript.isFile(), + () -> "Could not find CLI launch script " + + launchScript.getAbsolutePath()); return launchScript; } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java index 09045d0a0f..2733882ffd 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebTestClientSpringBootTestIntegrationTests.java @@ -39,8 +39,9 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Stephane Nicoll */ @RunWith(SpringRunner.class) -@SpringBootTest(properties = "spring.main.web-application-type=reactive", classes = { WebTestClientSpringBootTestIntegrationTests.TestConfiguration.class, -ExampleWebFluxApplication.class }) +@SpringBootTest(properties = "spring.main.web-application-type=reactive", classes = { + WebTestClientSpringBootTestIntegrationTests.TestConfiguration.class, + ExampleWebFluxApplication.class }) @AutoConfigureWebTestClient public class WebTestClientSpringBootTestIntegrationTests { @@ -71,7 +72,8 @@ public class WebTestClientSpringBootTestIntegrationTests { @Configuration static class TestConfiguration { @Bean - public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) throws Exception { + public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) + throws Exception { http.authorizeExchange().anyExchange().permitAll(); return http.build(); } diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java index d79ac0c1e6..0aa4befdfc 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java @@ -109,8 +109,8 @@ class DefinitionsParser { private void addDefinition(AnnotatedElement element, Definition definition, String type) { boolean isNewDefinition = this.definitions.add(definition); - Assert.state(isNewDefinition, () -> - "Duplicate " + type + " definition " + definition); + Assert.state(isNewDefinition, + () -> "Duplicate " + type + " definition " + definition); if (element instanceof Field) { Field field = (Field) element; this.definitionFields.put(definition, field); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java index 29af82967c..d33ce77048 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java @@ -40,7 +40,8 @@ import org.gradle.process.JavaExecSpec; */ public class BootRun extends DefaultTask { - private final PropertyState mainClassName = getProject().property(String.class); + private final PropertyState mainClassName = getProject() + .property(String.class); @SuppressWarnings("unchecked") private final PropertyState> jvmArgs = (PropertyState>) (Object) getProject() @@ -90,7 +91,8 @@ public class BootRun extends DefaultTask { } /** - * Sets the name of the main class to be executed using the given {@code mainClassNameProvider}. + * Sets the name of the main class to be executed using the given + * {@code mainClassNameProvider}. * * @param mainClassNameProvider provider of the main class name */ diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java index 3ac348fa8f..c0209fc6ff 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/PackagingDocumentationTests.java @@ -92,14 +92,14 @@ public class PackagingDocumentationTests { @Test public void springBootDslMainClass() throws IOException { this.gradleBuild - .script("src/main/gradle/packaging/spring-boot-dsl-main-class.gradle") - .build("bootJar"); + .script("src/main/gradle/packaging/spring-boot-dsl-main-class.gradle") + .build("bootJar"); File file = new File(this.gradleBuild.getProjectDir(), "build/libs/" + this.gradleBuild.getProjectDir().getName() + ".jar"); assertThat(file).isFile(); try (JarFile jar = new JarFile(file)) { assertThat(jar.getManifest().getMainAttributes().getValue("Start-Class")) - .isEqualTo("com.example.ExampleApplication"); + .isEqualTo("com.example.ExampleApplication"); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java index 0530c99429..aed568e7a8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/RunningDocumentationTests.java @@ -56,7 +56,7 @@ public class RunningDocumentationTests { assertThat(this.gradleBuild .script("src/main/gradle/running/spring-boot-dsl-main-class-name.gradle") .build("configuredMainClass").getOutput()) - .contains("com.example.ExampleApplication"); + .contains("com.example.ExampleApplication"); } @Test diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java index a5d033e3f7..bbb67aea71 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/AbstractBootArchiveIntegrationTests.java @@ -120,9 +120,9 @@ public abstract class AbstractBootArchiveIntegrationTests { .getOutcome()).isEqualTo(TaskOutcome.SUCCESS); try (JarFile jarFile = new JarFile( new File(this.gradleBuild.getProjectDir(), "build/libs") - .listFiles()[0])) { + .listFiles()[0])) { assertThat(jarFile.getManifest().getMainAttributes().getValue("Start-Class")) - .isEqualTo("com.example.CustomMain"); + .isEqualTo("com.example.CustomMain"); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java index 351e201b5c..d5e4514ef2 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java @@ -196,7 +196,8 @@ public class GradleBuild implements TestRule { XPathFactory xPathFactory = XPathFactory.newInstance(); XPath xpath = xPathFactory.newXPath(); XPathExpression expr = xpath.compile(expression); - String version = expr.evaluate(new InputSource(new FileReader(".flattened-pom.xml"))); + String version = expr + .evaluate(new InputSource(new FileReader(".flattened-pom.xml"))); return version; } catch (Exception ex) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java index 00f797baef..6961085988 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/RunArgumentsTests.java @@ -43,14 +43,14 @@ public class RunArgumentsTests { @Test public void parseArrayContainingNullValue() { - String[] args = new RunArguments(new String[]{"foo", null, "bar"}).asArray(); + String[] args = new RunArguments(new String[] { "foo", null, "bar" }).asArray(); assertThat(args).isNotNull(); assertThat(args).containsOnly("foo", "bar"); } @Test public void parseArrayContainingEmptyValue() { - String[] args = new RunArguments(new String[]{"foo", "", "bar"}).asArray(); + String[] args = new RunArguments(new String[] { "foo", "", "bar" }).asArray(); assertThat(args).isNotNull(); assertThat(args).containsOnly("foo", "", "bar"); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java index 132d9dddce..c1b717629f 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationTemp.java @@ -91,8 +91,8 @@ public class ApplicationTemp { Assert.state(StringUtils.hasLength(property), "No 'java.io.tmpdir' property set"); File file = new File(property); Assert.state(file.exists(), () -> "Temp directory" + file + " does not exist"); - Assert.state(file.isDirectory(), () -> "Temp location " + file - + " is not a directory"); + Assert.state(file.isDirectory(), + () -> "Temp location " + file + " is not a directory"); return file; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java index 1bc764a613..69fa2b694b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java @@ -53,9 +53,9 @@ import org.springframework.validation.Validator; * @author Stephane Nicoll * @author Madhura Bhave */ -public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProcessor, - BeanFactoryAware, EnvironmentAware, ApplicationContextAware, InitializingBean, - PriorityOrdered { +public class ConfigurationPropertiesBindingPostProcessor + implements BeanPostProcessor, BeanFactoryAware, EnvironmentAware, + ApplicationContextAware, InitializingBean, PriorityOrdered { private static final Log logger = LogFactory .getLog(ConfigurationPropertiesBindingPostProcessor.class); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java index d0b02ae82b..b48f5d21b4 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java @@ -171,9 +171,10 @@ public class EntityManagerFactoryBuilder { /** * The mapping resources (equivalent to {@code } entries in * {@code persistence.xml}) for the persistence unit. - *

Note that mapping resources must be relative to the classpath root, - * e.g. "META-INF/mappings.xml" or "com/mycompany/repository/mappings.xml", - * so that they can be loaded through {@code ClassLoader.getResource}. + *

+ * Note that mapping resources must be relative to the classpath root, e.g. + * "META-INF/mappings.xml" or "com/mycompany/repository/mappings.xml", so that + * they can be loaded through {@code ClassLoader.getResource}. * @param mappingResources the mapping resources to use * @return the builder for fluent usage */