Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,8 +78,7 @@ public class OAuth2RestOperationsConfigurationTests {
 		EnvironmentTestUtils.addEnvironment(this.environment,
 				"security.oauth2.client.client-id=acme");
 		initializeContext(ConfigForRequestScopedConfiguration.class, false);
-		assertThat(this.context.containsBean("oauth2ClientContext"))
+		assertThat(this.context.containsBean("oauth2ClientContext")).isTrue();
-				.isTrue();
 	}
 
 	@Test
@@ -95,8 +94,7 @@ public class OAuth2RestOperationsConfigurationTests {
 		EnvironmentTestUtils.addEnvironment(this.environment,
 				"security.oauth2.client.client-id=acme");
 		initializeContext(ConfigForSessionScopedConfiguration.class, false);
-		assertThat(this.context.containsBean("oauth2ClientContext"))
+		assertThat(this.context.containsBean("oauth2ClientContext")).isTrue();
-				.isTrue();
 	}
 
 	@Test
@@ -109,8 +107,7 @@ public class OAuth2RestOperationsConfigurationTests {
 
 	private void initializeContext(Class<?> configuration, boolean isClientCredentials) {
 		this.context = new SpringApplicationBuilder(configuration)
-				.environment(this.environment)
+				.environment(this.environment).web(!isClientCredentials).run();
-				.web(!isClientCredentials).run();
 	}
 
 	@Configuration
@@ -126,7 +123,8 @@ public class OAuth2RestOperationsConfigurationTests {
 
 	@Configuration
 	@Import({ OAuth2ClientConfiguration.class, OAuth2RestOperationsConfiguration.class })
-	protected static class ConfigForSessionScopedConfiguration extends WebApplicationConfiguration {
+	protected static class ConfigForSessionScopedConfiguration
+			extends WebApplicationConfiguration {
 
 		@Bean
 		public SecurityProperties securityProperties() {
@@ -136,7 +134,8 @@ public class OAuth2RestOperationsConfigurationTests {
 	}
 
 	@Configuration
-	protected static class ConfigForRequestScopedConfiguration extends WebApplicationConfiguration {
+	protected static class ConfigForRequestScopedConfiguration
+			extends WebApplicationConfiguration {
 
 	}
 

spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java

@@ -191,7 +191,6 @@ class TypeUtils {
 			if (type.getTypeArguments().isEmpty()) {
 				return qualifiedName;
 			}
-			else {
 			StringBuilder name = new StringBuilder();
 			name.append(qualifiedName);
 			if (!type.getTypeArguments().isEmpty()) {
@@ -199,7 +198,6 @@ class TypeUtils {
 			}
 			return name.toString();
 		}
-		}
 
 		private void appendTypeArguments(DeclaredType type, StringBuilder name) {
 			name.append("<");

spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,8 +123,7 @@ public enum DatabaseDriver {
 	 * Firebird.
 	 */
 	FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver",
-			"org.firebirdsql.ds.FBXADataSource",
+			"org.firebirdsql.ds.FBXADataSource", "SELECT 1 FROM RDB$DATABASE") {
-			"SELECT 1 FROM RDB$DATABASE") {
 
 		@Override
 		protected Collection<String> getUrlPrefixes() {

spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -337,8 +337,9 @@ public class RestTemplateBuilder {
 	/**
 	 * Set the {@link ClientHttpRequestFactory} that should be used with the
 	 * {@link RestTemplate}.
-   * <p>Note that this request factory will be shared with all builder instances
+	 * <p>
-   * derived from that point.
+	 * Note that this request factory will be shared with all builder instances derived
+	 * from that point.
 	 * @param requestFactory the request factory to use
 	 * @return a new builder instance
 	 */

spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.