From 6f0ccc64a5e2c9f131254fca80481717c01375c2 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 25 May 2018 22:16:59 -0700 Subject: [PATCH] Fix checkstyle violations --- .../autoconfigure/orm/jpa/JpaProperties.java | 2 +- .../servlet/ServletContextInitializerBeans.java | 2 +- .../src/main/java/sample/MessageController.java | 3 --- .../src/main/resources/application.properties | 2 +- .../src/main/java/sample/quartz/SampleJob.java | 4 ---- .../webflux/SampleSecureWebFluxApplication.java | 7 +++---- .../src/main/resources/application.properties | 2 +- .../SampleSecureWebFluxCustomSecurityTests.java | 16 ++++++++-------- .../src/main/resources/application.properties | 2 +- .../src/main/resources/application.properties | 2 +- .../java/sample/webflux/ExampleController.java | 16 ++++++++++++++++ .../sample/webflux/SampleWebFluxApplication.java | 7 +++---- .../src/main/resources/application.properties | 0 13 files changed, 36 insertions(+), 29 deletions(-) delete mode 100644 spring-boot-samples/spring-boot-sample-webflux/src/main/resources/application.properties diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java index 2bc143a935..3587f9b055 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java +++ b/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()); } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java index a2bfeb9688..c3663de2ef 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java +++ b/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 sortedInitializers = this.initializers.values() .stream() - .flatMap(value -> value.stream() + .flatMap((value) -> value.stream() .sorted(AnnotationAwareOrderComparator.INSTANCE)) .collect(Collectors.toList()); this.sortedList = Collections.unmodifiableList(sortedInitializers); diff --git a/spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/MessageController.java b/spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/MessageController.java index eda8760f30..d097e17aea 100644 --- a/spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/MessageController.java +++ b/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 { diff --git a/spring-boot-samples/spring-boot-sample-kafka/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-kafka/src/main/resources/application.properties index 179587112b..60839de6f4 100644 --- a/spring-boot-samples/spring-boot-sample-kafka/src/main/resources/application.properties +++ b/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 \ No newline at end of file +spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer diff --git a/spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleJob.java b/spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleJob.java index 4e5a961a77..52868aa65d 100644 --- a/spring-boot-samples/spring-boot-sample-quartz/src/main/java/sample/quartz/SampleJob.java +++ b/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. diff --git a/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java b/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java index dfb0c01d0d..dfd07c1bc8 100644 --- a/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java +++ b/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 monoRouterFunction(EchoHandler echoHandler) { - return route(POST("/echo"), echoHandler::echo); + return RouterFunctions.route(RequestPredicates.POST("/echo"), echoHandler::echo); } } diff --git a/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/resources/application.properties index c5268e4066..488b0d5579 100644 --- a/spring-boot-samples/spring-boot-sample-secure-webflux/src/main/resources/application.properties +++ b/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=* \ No newline at end of file +management.endpoints.web.exposure.include=* diff --git a/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java b/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java index 4d2796a0de..c4bd7341b7 100644 --- a/spring-boot-samples/spring-boot-sample-secure-webflux/src/test/java/sample/secure/webflux/SampleSecureWebFluxCustomSecurityTests.java +++ b/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())); - } - } diff --git a/spring-boot-samples/spring-boot-sample-servlet/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-servlet/src/main/resources/application.properties index cb7e159bf3..e548561d4a 100644 --- a/spring-boot-samples/spring-boot-sample-servlet/src/main/resources/application.properties +++ b/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 \ No newline at end of file +spring.security.user.password=password diff --git a/spring-boot-samples/spring-boot-sample-session-webflux/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-session-webflux/src/main/resources/application.properties index cb7e159bf3..e548561d4a 100644 --- a/spring-boot-samples/spring-boot-sample-session-webflux/src/main/resources/application.properties +++ b/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 \ No newline at end of file +spring.security.user.password=password diff --git a/spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/ExampleController.java b/spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/ExampleController.java index 2751508819..cec8ad4833 100644 --- a/spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/ExampleController.java +++ b/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; diff --git a/spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/SampleWebFluxApplication.java b/spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/SampleWebFluxApplication.java index 05085b0758..701bdfeaed 100644 --- a/spring-boot-samples/spring-boot-sample-webflux/src/main/java/sample/webflux/SampleWebFluxApplication.java +++ b/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 monoRouterFunction(EchoHandler echoHandler) { - return route(POST("/echo"), echoHandler::echo); + return RouterFunctions.route(RequestPredicates.POST("/echo"), echoHandler::echo); } } diff --git a/spring-boot-samples/spring-boot-sample-webflux/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-webflux/src/main/resources/application.properties deleted file mode 100644 index e69de29bb2..0000000000