mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Fix checkstyle violations
This commit is contained in:
parent
9fd3b9103a
commit
6f0ccc64a5
@ -244,7 +244,7 @@ public class JpaProperties {
|
|||||||
if (ddlAuto != null) {
|
if (ddlAuto != null) {
|
||||||
return ddlAuto;
|
return ddlAuto;
|
||||||
}
|
}
|
||||||
return this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get();
|
return (this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ public class ServletContextInitializerBeans
|
|||||||
addAdaptableBeans(beanFactory);
|
addAdaptableBeans(beanFactory);
|
||||||
List<ServletContextInitializer> sortedInitializers = this.initializers.values()
|
List<ServletContextInitializer> sortedInitializers = this.initializers.values()
|
||||||
.stream()
|
.stream()
|
||||||
.flatMap(value -> value.stream()
|
.flatMap((value) -> value.stream()
|
||||||
.sorted(AnnotationAwareOrderComparator.INSTANCE))
|
.sorted(AnnotationAwareOrderComparator.INSTANCE))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
this.sortedList = Collections.unmodifiableList(sortedInitializers);
|
this.sortedList = Collections.unmodifiableList(sortedInitializers);
|
||||||
|
@ -19,9 +19,6 @@ package sample;
|
|||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Eddú Meléndez
|
|
||||||
*/
|
|
||||||
@RestController
|
@RestController
|
||||||
public class MessageController {
|
public class MessageController {
|
||||||
|
|
||||||
|
@ -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.
|
* 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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -19,12 +19,11 @@ package sample.secure.webflux;
|
|||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.context.annotation.Bean;
|
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.RouterFunction;
|
||||||
|
import org.springframework.web.reactive.function.server.RouterFunctions;
|
||||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
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
|
@SpringBootApplication
|
||||||
public class SampleSecureWebFluxApplication {
|
public class SampleSecureWebFluxApplication {
|
||||||
|
|
||||||
@ -34,7 +33,7 @@ public class SampleSecureWebFluxApplication {
|
|||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public RouterFunction<ServerResponse> monoRouterFunction(EchoHandler echoHandler) {
|
public RouterFunction<ServerResponse> monoRouterFunction(EchoHandler echoHandler) {
|
||||||
return route(POST("/echo"), echoHandler::echo);
|
return RouterFunctions.route(RequestPredicates.POST("/echo"), echoHandler::echo);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -101,6 +101,14 @@ public class SampleSecureWebFluxCustomSecurityTests {
|
|||||||
.expectStatus().isOk();
|
.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
|
@Configuration
|
||||||
static class SecurityConfiguration {
|
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()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -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;
|
package sample.webflux;
|
||||||
|
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
|
@ -19,12 +19,11 @@ package sample.webflux;
|
|||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.context.annotation.Bean;
|
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.RouterFunction;
|
||||||
|
import org.springframework.web.reactive.function.server.RouterFunctions;
|
||||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
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
|
@SpringBootApplication
|
||||||
public class SampleWebFluxApplication {
|
public class SampleWebFluxApplication {
|
||||||
|
|
||||||
@ -34,7 +33,7 @@ public class SampleWebFluxApplication {
|
|||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public RouterFunction<ServerResponse> monoRouterFunction(EchoHandler echoHandler) {
|
public RouterFunction<ServerResponse> monoRouterFunction(EchoHandler echoHandler) {
|
||||||
return route(POST("/echo"), echoHandler::echo);
|
return RouterFunctions.route(RequestPredicates.POST("/echo"), echoHandler::echo);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user