root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2017-06-13 14:20:33 +02:00
parent aa28b6cb54
commit a0cea9a86f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1006,8 +1006,8 @@ project("spring-test") {
optional(project(":spring-tx"))
optional(project(":spring-orm"))
optional(project(":spring-web"))
optional(project(":spring-webmvc"))
optional(project(":spring-webflux"))
optional(project(":spring-webmvc"))
optional(project(":spring-websocket"))
optional("junit:junit:${junitVersion}")
optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")

9
spring-web/src/main/java/org/springframework/web/server/DefaultServerWebExchangeBuilder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 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.
@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.server;
import java.security.Principal;
@ -25,7 +26,7 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.util.Assert;
/**
* Package private implementation of {@link ServerWebExchange.Builder}.
* Package-private implementation of {@link ServerWebExchange.Builder}.
*
* @author Rossen Stoyanchev
* @since 5.0
@ -42,7 +43,7 @@ class DefaultServerWebExchangeBuilder implements ServerWebExchange.Builder {
DefaultServerWebExchangeBuilder(ServerWebExchange delegate) {
Assert.notNull(delegate, "'delegate' is required.");
Assert.notNull(delegate, "Delegate is required");
this.delegate = delegate;
}
@ -90,7 +91,6 @@ class DefaultServerWebExchangeBuilder implements ServerWebExchange.Builder {
private final Mono<Principal> principalMono;
public MutativeDecorator(ServerWebExchange delegate, ServerHttpRequest request,
ServerHttpResponse response, Mono<Principal> principalMono) {
@ -100,7 +100,6 @@ class DefaultServerWebExchangeBuilder implements ServerWebExchange.Builder {
this.principalMono = principalMono;
}
@Override
public ServerHttpRequest getRequest() {
return (this.request != null ? this.request : getDelegate().getRequest());