Add HttpHandlerDecorator and fix test package

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

@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.reactivestreams.Publisher;
 
-import org.springframework.util.Assert;
 
 /**
  * {@link HttpHandler} that delegates to a chain of {@link HttpFilter}s followed
@@ -29,17 +28,14 @@ import org.springframework.util.Assert;
  *
  * @author Rossen Stoyanchev
  */
-public class FilterChainHttpHandler implements HttpHandler {
+public class FilterChainHttpHandler extends HttpHandlerDecorator {
 
 	private final List<HttpFilter> filters;
 
-	private final HttpHandler targetHandler;
-
 
 	public FilterChainHttpHandler(HttpHandler targetHandler, HttpFilter... filters) {
-		Assert.notNull(targetHandler, "'targetHandler' is required.");
+		super(targetHandler);
 		this.filters = (filters != null ? Arrays.asList(filters) : Collections.emptyList());
-		this.targetHandler = targetHandler;
 	}
 
 
@@ -60,7 +56,7 @@ public class FilterChainHttpHandler implements HttpHandler {
 				return filter.filter(request, response, this);
 			}
 			else {
-				return targetHandler.handle(request, response);
+				return getDelegate().handle(request, response);
 			}
 		}
 	}

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

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2015 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 org.springframework.http.server.reactive;
+
+import org.reactivestreams.Publisher;
+
+import org.springframework.util.Assert;
+
+/**
+ *
+ * @author Rossen Stoyanchev
+ */
+public class HttpHandlerDecorator implements HttpHandler {
+
+	private final HttpHandler delegate;
+
+
+	public HttpHandlerDecorator(HttpHandler delegate) {
+		Assert.notNull(delegate, "'delegate' must not be null");
+		this.delegate = delegate;
+	}
+
+
+	public HttpHandler getDelegate() {
+		return this.delegate;
+	}
+
+
+	@Override
+	public Publisher<Void> handle(ServerHttpRequest request, ServerHttpResponse response) {
+		return this.delegate.handle(request, response);
+	}
+
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + " [delegate=" + this.delegate + "]";
+	}
+
+}

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 import org.junit.After;
 import org.junit.Before;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/EchoHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 import org.reactivestreams.Publisher;
 

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/EchoHandlerIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 import java.net.URI;
 import java.util.Random;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/FilterChainHttpHandlerTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 
 import java.util.concurrent.TimeUnit;
@@ -24,13 +24,6 @@ import org.reactivestreams.Publisher;
 import reactor.Publishers;
 import reactor.rx.Streams;
 
-import org.springframework.http.server.reactive.FilterChainHttpHandler;
-import org.springframework.http.server.reactive.HttpFilter;
-import org.springframework.http.server.reactive.HttpFilterChain;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/RandomHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 import java.nio.ByteBuffer;
 import java.util.Random;
@@ -27,10 +27,6 @@ import org.reactivestreams.Subscription;
 import reactor.io.buffer.Buffer;
 import reactor.rx.Streams;
 
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
-
 import static org.junit.Assert.assertEquals;
 
 /**

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/RandomHandlerIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 import java.net.URI;
 import java.util.Random;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
@@ -27,9 +27,6 @@ import reactor.io.buffer.Buffer;
 import reactor.rx.Streams;
 
 import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.util.BufferOutputStream;
 import org.springframework.util.ByteBufferPublisherInputStream;
 

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandlerIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.server;
+package org.springframework.http.server.reactive;
 
 import java.net.URI;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.web.client.RestTemplate;
 
 /**

spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java

@@ -31,7 +31,7 @@ import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.server.AbstractHttpHandlerIntegrationTests;
+import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;

spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java

@@ -51,7 +51,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.server.AbstractHttpHandlerIntegrationTests;
+import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;