Moved WebExchangeDataBinder to web.bind.support (alongside WebRequestDataBinder)

Issue: SPR-14542
This commit is contained in:
Juergen Hoeller
2016-11-08 11:01:58 +01:00
parent f0be79e0a1
commit dda9762072
15 changed files with 25 additions and 40 deletions

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.http.codec;
import java.nio.ByteBuffer;
import java.util.Collections;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
* @author Marcin Kamionowski
* @author Rossen Stoyanchev
*/
public class EncoderHttpMessageWriterTest {
public class EncoderHttpMessageWriterTests {
private MockServerHttpResponse response = new MockServerHttpResponse();
@@ -74,7 +74,6 @@ public class EncoderHttpMessageWriterTest {
.verify();
}
@NotNull
private <T> EncoderHttpMessageWriter<T> createWriter(Encoder<T> encoder) {
return new EncoderHttpMessageWriter<>(encoder);
}

View File

@@ -20,7 +20,6 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
@@ -52,7 +51,6 @@ public class JettyHttpServer extends HttpServerSupport implements HttpServer, In
this.jettyServer.addConnector(connector);
}
@NotNull
private ServletHttpHandlerAdapter initServletHttpHandlerAdapter() {
if (getHttpHandlerMap() != null) {
return new ServletHttpHandlerAdapter(getHttpHandlerMap());

View File

@@ -21,7 +21,6 @@ import java.io.File;
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.startup.Tomcat;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
@@ -64,7 +63,6 @@ public class TomcatHttpServer extends HttpServerSupport implements HttpServer, I
rootContext.addServletMappingDecoded("/", "httpHandlerServlet");
}
@NotNull
private ServletHttpHandlerAdapter initServletHttpHandlerAdapter() {
if (getHttpHandlerMap() != null) {
return new ServletHttpHandlerAdapter(getHttpHandlerMap());

View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.bind;
package org.springframework.web.bind.support;
import java.beans.PropertyEditorSupport;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Iterator;
import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
@@ -227,7 +227,6 @@ public class WebExchangeDataBinderTests {
return builder.toString();
}
@NotNull
private ServerWebExchange createExchange() {
return new DefaultServerWebExchange(
this.request, new MockServerHttpResponse(), new DefaultWebSessionManager());