Fix checkstyle violations

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java

@@ -244,7 +244,7 @@ public class JpaProperties {
 			if (ddlAuto != null) {
 				return ddlAuto;
 			}
-			return this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get();
+			return (this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get());
 		}
 
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java

@@ -81,7 +81,7 @@ public class ServletContextInitializerBeans
 		addAdaptableBeans(beanFactory);
 		List<ServletContextInitializer> sortedInitializers = this.initializers.values()
 				.stream()
-				.flatMap(value -> value.stream()
+				.flatMap((value) -> value.stream()
 						.sorted(AnnotationAwareOrderComparator.INSTANCE))
 				.collect(Collectors.toList());
 		this.sortedList = Collections.unmodifiableList(sortedInitializers);

spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/MessageController.java

@@ -19,9 +19,6 @@ package sample;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author Eddú Meléndez
- */
 @RestController
 public class MessageController {
 

spring-boot-samples/spring-boot-sample-kafka/src/main/resources/application.properties

@@ -3,4 +3,4 @@ spring.kafka.consumer.group-id=testGroup
 spring.kafka.consumer.auto-offset-reset=earliest
 spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
 spring.kafka.consumer.properties.spring.json.trusted.packages=sample.kafka
-spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
+spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer

spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleJob.java

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD:spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleJob.java
- * Copyright 2012-2017 the original author or authors.
-=======
  * Copyright 2012-2018 the original author or authors.
->>>>>>> local15x/1.5.x:spring-boot-samples/spring-boot-sample-hibernate4/src/main/java/sample/hibernate4/service/CitySearchCriteria.java
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java

@@ -19,12 +19,11 @@ package sample.secure.webflux;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.web.reactive.function.server.RequestPredicates;
 import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
 
-import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
-import static org.springframework.web.reactive.function.server.RouterFunctions.route;
-
 @SpringBootApplication
 public class SampleSecureWebFluxApplication {
 
@@ -34,7 +33,7 @@ public class SampleSecureWebFluxApplication {
 
 	@Bean
 	public RouterFunction<ServerResponse> monoRouterFunction(EchoHandler echoHandler) {
-		return route(POST("/echo"), echoHandler::echo);
+		return RouterFunctions.route(RequestPredicates.POST("/echo"), echoHandler::echo);
 	}
 
 }

spring-boot-samples/spring-boot-sample-secure-webflux/src/main/resources/application.properties

@@ -1,3 +1,3 @@
 spring.security.user.name=user
 spring.security.user.password=password
-management.endpoints.web.exposure.include=*
+management.endpoints.web.exposure.include=*

spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java

@@ -101,6 +101,14 @@ public class SampleSecureWebFluxCustomSecurityTests {
 				.expectStatus().isOk();
 	}
 
+	private String getBasicAuth() {
+		return new String(Base64.getEncoder().encode(("user:password").getBytes()));
+	}
+
+	private String getBasicAuthForAdmin() {
+		return new String(Base64.getEncoder().encode(("admin:admin").getBytes()));
+	}
+
 	@Configuration
 	static class SecurityConfiguration {
 
@@ -128,12 +136,4 @@ public class SampleSecureWebFluxCustomSecurityTests {
 
 	}
 
-	private String getBasicAuth() {
-		return new String(Base64.getEncoder().encode(("user:password").getBytes()));
-	}
-
-	private String getBasicAuthForAdmin() {
-		return new String(Base64.getEncoder().encode(("admin:admin").getBytes()));
-	}
-
 }

spring-boot-samples/spring-boot-sample-servlet/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 spring.security.user.name=user
-spring.security.user.password=password
+spring.security.user.password=password

spring-boot-samples/spring-boot-sample-session-webflux/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 spring.security.user.name=user
-spring.security.user.password=password
+spring.security.user.password=password

spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/ExampleController.java

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package sample.webflux;
 
 import org.springframework.http.MediaType;

spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/SampleWebFluxApplication.java

@@ -19,12 +19,11 @@ package sample.webflux;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.web.reactive.function.server.RequestPredicates;
 import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
 
-import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
-import static org.springframework.web.reactive.function.server.RouterFunctions.route;
-
 @SpringBootApplication
 public class SampleWebFluxApplication {
 
@@ -34,7 +33,7 @@ public class SampleWebFluxApplication {
 
 	@Bean
 	public RouterFunction<ServerResponse> monoRouterFunction(EchoHandler echoHandler) {
-		return route(POST("/echo"), echoHandler::echo);
+		return RouterFunctions.route(RequestPredicates.POST("/echo"), echoHandler::echo);
 	}
 
 }