Merge branch '5.1.x'

Author: rstoyanchev

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java

@@ -246,6 +246,17 @@ public <T> void onSubscribe(AbstractListenerWriteFlushProcessor<T> processor, Su
 					super.onSubscribe(processor, subscription);
 				}
 			}
+
+			@Override
+			public <T> void onComplete(AbstractListenerWriteFlushProcessor<T> processor) {
+				// This can happen on (very early) completion notification from container..
+				if (processor.changeState(this, COMPLETED)) {
+					processor.resultPublisher.publishComplete();
+				}
+				else {
+					processor.state.get().onComplete(processor);
+				}
+			}
 		},
 
 		REQUESTED {

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java

@@ -322,6 +322,12 @@ public <T> void onSubscribe(AbstractListenerWriteProcessor<T> processor, Subscri
 					super.onSubscribe(processor, subscription);
 				}
 			}
+
+			@Override
+			public <T> void onComplete(AbstractListenerWriteProcessor<T> processor) {
+				// This can happen on (very early) completion notification from container..
+				processor.changeStateToComplete(this);
+			}
 		},
 
 		REQUESTED {

spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java

@@ -259,8 +259,13 @@ protected Mono<Void> doCommit(@Nullable Supplier<? extends Mono<Void>> writeActi
 	protected abstract void applyStatusCode();
 
 	/**
-	 * Apply header changes from {@link #getHeaders()} to the underlying response.
-	 * This method is called once only.
+	 * Invoked when the response is getting committed allowing sub-classes to
+	 * make apply header values to the underlying response.
+	 * <p>Note that most sub-classes use an {@link HttpHeaders} instance that
+	 * wraps an adapter to the native response headers such that changes are
+	 * propagated to the underlying response on the go. That means this callback
+	 * is typically not used other than for specialized updates such as setting
+	 * the contentType or characterEncoding fields in a Servlet response.
 	 */
 	protected abstract void applyHeaders();
 

spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java

@@ -102,8 +102,15 @@ private static HttpHeaders createHeaders(HttpServletResponse response) {
 
 		@Override
 		protected void applyHeaders() {
-			MediaType contentType = getHeaders().getContentType();
 			HttpServletResponse response = getNativeResponse();
+			MediaType contentType = null;
+			try {
+				contentType = getHeaders().getContentType();
+			}
+			catch (Exception ex) {
+				String rawContentType = getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
+				response.setContentType(rawContentType);
+			}
 			if (response.getContentType() == null && contentType != null) {
 				response.setContentType(contentType.toString());
 			}

spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java

@@ -119,14 +119,25 @@ protected void applyHeaders() {
 				this.response.addHeader(headerName, headerValue);
 			}
 		});
-		MediaType contentType = getHeaders().getContentType();
+		MediaType contentType = null;
+		try {
+			contentType = getHeaders().getContentType();
+		}
+		catch (Exception ex) {
+			String rawContentType = getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
+			this.response.setContentType(rawContentType);
+		}
 		if (this.response.getContentType() == null && contentType != null) {
 			this.response.setContentType(contentType.toString());
 		}
 		Charset charset = (contentType != null ? contentType.getCharset() : null);
 		if (this.response.getCharacterEncoding() == null && charset != null) {
 			this.response.setCharacterEncoding(charset.name());
 		}
+		long contentLength = getHeaders().getContentLength();
+		if (contentLength != -1) {
+			this.response.setContentLengthLong(contentLength);
+		}
 	}
 
 	@Override

spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java

@@ -205,7 +205,14 @@ else if (response instanceof HttpServletResponseWrapper) {
 		@Override
 		protected void applyHeaders() {
 			HttpServletResponse response = getNativeResponse();
-			MediaType contentType = getHeaders().getContentType();
+			MediaType contentType = null;
+			try {
+				contentType = getHeaders().getContentType();
+			}
+			catch (Exception ex) {
+				String rawContentType = getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
+				response.setContentType(rawContentType);
+			}
 			if (response.getContentType() == null && contentType != null) {
 				response.setContentType(contentType.toString());
 			}

spring-web/src/main/java/org/springframework/web/filter/OncePerRequestFilter.java

@@ -248,7 +248,7 @@ protected abstract void doFilterInternal(
 	protected void doFilterNestedErrorDispatch(HttpServletRequest request, HttpServletResponse response,
 			FilterChain filterChain) throws ServletException, IOException {
 
-		doFilter(request, response, filterChain);
+		filterChain.doFilter(request, response);
 	}
 
 }

spring-web/src/test/java/org/springframework/web/filter/OncePerRequestFilterTests.java

@@ -168,9 +168,10 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
 		@Override
 		protected void doFilterNestedErrorDispatch(HttpServletRequest request, HttpServletResponse response,
-				FilterChain filterChain) {
+				FilterChain filterChain) throws ServletException, IOException {
 
 			this.didFilterNestedErrorDispatch = true;
+			super.doFilterNestedErrorDispatch(request, response, filterChain);
 		}
 	}
 

spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -33,7 +33,9 @@
 import org.springframework.http.server.reactive.AbstractServerHttpRequest;
 import org.springframework.http.server.reactive.AbstractServerHttpResponse;
 import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpRequestDecorator;
 import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.socket.HandshakeInfo;
@@ -145,8 +147,8 @@ public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
 		ServerHttpRequest request = exchange.getRequest();
 		ServerHttpResponse response = exchange.getResponse();
 
-		HttpServletRequest servletRequest = getHttpServletRequest(request);
-		HttpServletResponse servletResponse = getHttpServletResponse(response);
+		HttpServletRequest servletRequest = getNativeRequest(request);
+		HttpServletResponse servletResponse = getNativeResponse(response);
 
 		HandshakeInfo handshakeInfo = handshakeInfoFactory.get();
 		DataBufferFactory factory = response.bufferFactory();
@@ -174,14 +176,30 @@ public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
 		return Mono.empty();
 	}
 
-	private HttpServletRequest getHttpServletRequest(ServerHttpRequest request) {
-		Assert.isInstanceOf(AbstractServerHttpRequest.class, request);
-		return ((AbstractServerHttpRequest) request).getNativeRequest();
+	private static HttpServletRequest getNativeRequest(ServerHttpRequest request) {
+		if (request instanceof AbstractServerHttpRequest) {
+			return ((AbstractServerHttpRequest) request).getNativeRequest();
+		}
+		else if (request instanceof ServerHttpRequestDecorator) {
+			return getNativeRequest(((ServerHttpRequestDecorator) request).getDelegate());
+		}
+		else {
+			throw new IllegalArgumentException(
+					"Couldn't find HttpServletRequest in " + request.getClass().getName());
+		}
 	}
 
-	private HttpServletResponse getHttpServletResponse(ServerHttpResponse response) {
-		Assert.isInstanceOf(AbstractServerHttpResponse.class, response);
-		return ((AbstractServerHttpResponse) response).getNativeResponse();
+	private static HttpServletResponse getNativeResponse(ServerHttpResponse response) {
+		if (response instanceof AbstractServerHttpResponse) {
+			return ((AbstractServerHttpResponse) response).getNativeResponse();
+		}
+		else if (response instanceof ServerHttpResponseDecorator) {
+			return getNativeResponse(((ServerHttpResponseDecorator) response).getDelegate());
+		}
+		else {
+			throw new IllegalArgumentException(
+					"Couldn't find HttpServletResponse in " + response.getClass().getName());
+		}
 	}
 
 	private void startLazily(HttpServletRequest request) {

spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategy.java

@@ -25,6 +25,7 @@
 import org.springframework.core.io.buffer.NettyDataBufferFactory;
 import org.springframework.http.server.reactive.AbstractServerHttpResponse;
 import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
 import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.socket.HandshakeInfo;
 import org.springframework.web.reactive.socket.WebSocketHandler;
@@ -73,7 +74,7 @@ public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
 			@Nullable String subProtocol, Supplier<HandshakeInfo> handshakeInfoFactory) {
 
 		ServerHttpResponse response = exchange.getResponse();
-		HttpServerResponse reactorResponse = ((AbstractServerHttpResponse) response).getNativeResponse();
+		HttpServerResponse reactorResponse = getNativeResponse(response);
 		HandshakeInfo handshakeInfo = handshakeInfoFactory.get();
 		NettyDataBufferFactory bufferFactory = (NettyDataBufferFactory) response.bufferFactory();
 
@@ -87,4 +88,17 @@ public Mono<Void> upgrade(ServerWebExchange exchange, WebSocketHandler handler,
 				});
 	}
 
+	private static HttpServerResponse getNativeResponse(ServerHttpResponse response) {
+		if (response instanceof AbstractServerHttpResponse) {
+			return ((AbstractServerHttpResponse) response).getNativeResponse();
+		}
+		else if (response instanceof ServerHttpResponseDecorator) {
+			return getNativeResponse(((ServerHttpResponseDecorator) response).getDelegate());
+		}
+		else {
+			throw new IllegalArgumentException(
+					"Couldn't find native response in " + response.getClass().getName());
+		}
+	}
+
 }