Resolve minor 4.3.x deprecations in master

Issue: SPR-15139

spring-expression/src/main/java/org/springframework/expression/spel/SpelMessage.java

@@ -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.
@@ -286,31 +286,6 @@ public enum SpelMessage {
 		return formattedMessage.toString();
 	}
 
-	/**
-	 * Produce a complete message including the prefix, the position (if known)
-	 * and with the inserts applied to the message.
-	 * @param pos the position (ignored and not included in the message if less than 0)
-	 * @param inserts the inserts to put into the formatted message
-	 * @return a formatted message
-	 * @deprecated as of Spring 4.3.5, in favor of {@link #formatMessage(Object...)}
-	 */
-	@Deprecated
-	public String formatMessage(int pos, Object... inserts) {
-		StringBuilder formattedMessage = new StringBuilder();
-		formattedMessage.append("EL").append(this.code);
-		switch (this.kind) {
-			case ERROR:
-				formattedMessage.append("E");
-				break;
-		}
-		formattedMessage.append(":");
-		if (pos >= 0) {
-			formattedMessage.append("(pos ").append(pos).append("): ");
-		}
-		formattedMessage.append(MessageFormat.format(this.message, inserts));
-		return formattedMessage.toString();
-	}
-
 
 	public enum Kind { INFO, WARNING, ERROR }
 

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractMethodArgumentResolutionException.java

@@ -1,49 +0,0 @@
-/*
- * 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.
- * 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.messaging.handler.annotation.support;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.messaging.Message;
-import org.springframework.messaging.handler.invocation.MethodArgumentResolutionException;
-
-/**
- * Base class for exceptions resulting from the invocation of
- * {@link org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver}.
- *
- * @author Rossen Stoyanchev
- * @since 4.0.3
- * @deprecated as of 4.3.6, in favor of the invocation-associated
- * {@link MethodArgumentResolutionException}
- */
-@Deprecated
-@SuppressWarnings("serial")
-public abstract class AbstractMethodArgumentResolutionException extends MethodArgumentResolutionException {
-
-	protected AbstractMethodArgumentResolutionException(Message<?> message, MethodParameter parameter) {
-		super(message, parameter);
-	}
-
-	protected AbstractMethodArgumentResolutionException(Message<?> message, MethodParameter parameter, String description) {
-		super(message, parameter, description);
-	}
-
-
-	protected static String getMethodParamMessage(MethodParameter param) {
-		return "";
-	}
-
-}

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MethodArgumentNotValidException.java

@@ -18,6 +18,7 @@ package org.springframework.messaging.handler.annotation.support;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.messaging.Message;
+import org.springframework.messaging.handler.invocation.MethodArgumentResolutionException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 
@@ -29,8 +30,8 @@ import org.springframework.validation.ObjectError;
  * @author Rossen Stoyanchev
  * @since 4.0.1
  */
-@SuppressWarnings({"serial", "deprecation"})
+@SuppressWarnings("serial")
-public class MethodArgumentNotValidException extends AbstractMethodArgumentResolutionException {
+public class MethodArgumentNotValidException extends MethodArgumentResolutionException {
 
 	private BindingResult bindingResult;
 

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MethodArgumentTypeMismatchException.java

@@ -18,6 +18,7 @@ package org.springframework.messaging.handler.annotation.support;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.messaging.Message;
+import org.springframework.messaging.handler.invocation.MethodArgumentResolutionException;
 
 /**
  * Exception that indicates that a method argument has not the expected type.
@@ -25,8 +26,8 @@ import org.springframework.messaging.Message;
  * @author Stephane Nicoll
  * @since 4.0.3
  */
-@SuppressWarnings({"serial", "deprecation"})
+@SuppressWarnings("serial")
-public class MethodArgumentTypeMismatchException extends AbstractMethodArgumentResolutionException {
+public class MethodArgumentTypeMismatchException extends MethodArgumentResolutionException {
 
 	public MethodArgumentTypeMismatchException(Message<?> message, MethodParameter parameter, String description) {
 		super(message, parameter, description);