Promoted BindingContext to web.reactive root (since HandlerResult requires it there)

Issue: SPR-14542

Author: jhoeller

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/BindingContext.java renamed to spring-web-reactive/src/main/java/org/springframework/web/reactive/BindingContext.java

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.web.reactive.result.method;
+
+package org.springframework.web.reactive;
 
 import org.springframework.ui.Model;
 import org.springframework.validation.support.BindingAwareConcurrentModel;
@@ -22,7 +23,6 @@
 import org.springframework.web.bind.support.WebBindingInitializer;
 import org.springframework.web.server.ServerWebExchange;
 
-
 /**
  * A context for binding requests to method arguments that provides access to
  * the default model, data binding, validation, and type conversion.
@@ -45,14 +45,6 @@ public BindingContext(WebBindingInitializer initializer) {
 		this.initializer = initializer;
 	}
 
-	private static WebExchangeDataBinder initTypeConverter(WebBindingInitializer initializer) {
-		WebExchangeDataBinder binder = new WebExchangeDataBinder(null);
-		if (initializer != null) {
-			initializer.initBinder(binder);
-		}
-		return binder;
-	}
-
 
 	/**
 	 * Return the default model.
@@ -65,7 +57,6 @@ public Model getModel() {
 	/**
 	 * Create a {@link WebExchangeDataBinder} for applying data binding, type
 	 * conversion, and validation on the given "target" object.
-	 *
 	 * @param exchange the current exchange
 	 * @param target the object to create a data binder for
 	 * @param name the name of the target object
@@ -82,7 +73,6 @@ public WebExchangeDataBinder createDataBinder(ServerWebExchange exchange, Object
 	/**
 	 * Create a {@link WebExchangeDataBinder} without a "target" object, i.e.
 	 * for applying type conversion to simple types.
-	 *
 	 * @param exchange the current exchange
 	 * @param name the name of the target object
 	 * @return a Mono for the created {@link WebDataBinder} instance
@@ -101,9 +91,7 @@ protected WebExchangeDataBinder createBinderInstance(Object target, String objec
 	/**
 	 * Initialize the data binder instance for the given exchange.
 	 */
-	protected WebExchangeDataBinder initDataBinder(WebExchangeDataBinder binder,
-			ServerWebExchange exchange) {
-
+	protected WebExchangeDataBinder initDataBinder(WebExchangeDataBinder binder, ServerWebExchange exchange) {
 		return binder;
 	}
 

spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java

@@ -25,7 +25,6 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.ui.Model;
 import org.springframework.util.Assert;
-import org.springframework.web.reactive.result.method.BindingContext;
 
 /**
  * Represent the result of the invocation of a handler or a handler method.

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -19,9 +19,9 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.MethodParameter;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.server.ServerWebExchange;
 
-
 /**
  * Strategy interface for resolving method parameters into argument values in
  * the context of a given request.
@@ -31,7 +31,6 @@
  */
 public interface HandlerMethodArgumentResolver {
 
-
 	boolean supportsParameter(MethodParameter parameter);
 
 	/**

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java

@@ -36,11 +36,12 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerResult;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
- * A sub-class of {@link HandlerMethod} that can resolve method arguments from
+ * A subclass of {@link HandlerMethod} that can resolve method arguments from
  * a {@link ServerWebExchange} and use that to invoke the underlying method.
  *
  * @author Rossen Stoyanchev

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -21,9 +21,9 @@
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.MethodParameter;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.server.ServerWebExchange;
 
-
 /**
  * An extension of {@link HandlerMethodArgumentResolver} for implementations
  * that are synchronous in nature and do not block to resolve values.

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/SyncInvocableHandlerMethod.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method;
 
 import java.lang.reflect.Method;
@@ -21,6 +22,7 @@
 
 import org.springframework.util.Assert;
 import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerResult;
 import org.springframework.web.server.ServerWebExchange;
 
@@ -35,7 +37,6 @@
  */
 public class SyncInvocableHandlerMethod extends InvocableHandlerMethod {
 
-
 	public SyncInvocableHandlerMethod(HandlerMethod handlerMethod) {
 		super(handlerMethod);
 	}

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.lang.annotation.Annotation;
@@ -38,12 +39,12 @@
 import org.springframework.util.Assert;
 import org.springframework.validation.Validator;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.WebExchangeBindException;
 import org.springframework.web.bind.WebExchangeDataBinder;
-import org.springframework.web.reactive.result.method.BindingContext;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.UnsupportedMediaTypeStatusException;
-import org.springframework.web.bind.WebExchangeBindException;
 
 /**
  * Abstract base class for argument resolvers that resolve method arguments

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java

@@ -30,7 +30,7 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.ValueConstants;
-import org.springframework.web.reactive.result.method.BindingContext;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver;
 import org.springframework.web.server.ServerErrorException;
 import org.springframework.web.server.ServerWebExchange;
@@ -40,13 +40,15 @@
  * Abstract base class for resolving method arguments from a named value.
  * Request parameters, request headers, and path variables are examples of named
  * values. Each may have a name, a required flag, and a default value.
+ *
  * <p>Subclasses define how to do the following:
  * <ul>
  * <li>Obtain named value information for a method parameter
  * <li>Resolve names into argument values
  * <li>Handle missing argument values when argument values are required
  * <li>Optionally handle a resolved value
  * </ul>
+ *
  * <p>A default value string can contain ${...} placeholders and Spring Expression
  * Language #{...} expressions. For this to work a
  * {@link ConfigurableBeanFactory} must be supplied to the class constructor.

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueSyncArgumentResolver.java

@@ -22,7 +22,7 @@
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.MethodParameter;
-import org.springframework.web.reactive.result.method.BindingContext;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.result.method.SyncHandlerMethodArgumentResolver;
 import org.springframework.web.server.ServerWebExchange;
 
@@ -38,7 +38,6 @@
 public abstract class AbstractNamedValueSyncArgumentResolver extends AbstractNamedValueArgumentResolver
 		implements SyncHandlerMethodArgumentResolver {
 
-
 	public AbstractNamedValueSyncArgumentResolver(ConfigurableBeanFactory beanFactory) {
 		super(beanFactory);
 	}

spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactory.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.reactive.result.method.annotation;
 
 import java.lang.reflect.Method;
@@ -33,8 +34,8 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.support.WebBindingInitializer;
 import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerResult;
-import org.springframework.web.reactive.result.method.BindingContext;
 import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver;
 import org.springframework.web.reactive.result.method.InvocableHandlerMethod;
 import org.springframework.web.reactive.result.method.SyncHandlerMethodArgumentResolver;