Fix compiler deprecation-related errors

Author: rstoyanchev

spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java

@@ -44,7 +44,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureAdapter;
-import org.springframework.web.util.AbstractUriTemplateHandler;
 import org.springframework.web.util.DefaultUriBuilderFactory;
 import org.springframework.web.util.UriTemplateHandler;
 
@@ -162,13 +161,15 @@ public ResponseErrorHandler getErrorHandler() {
 	 * @param defaultUriVariables the default URI variable values
 	 * @since 4.3
 	 */
+	@SuppressWarnings("deprecation")
 	public void setDefaultUriVariables(Map<String, ?> defaultUriVariables) {
 		UriTemplateHandler handler = this.syncTemplate.getUriTemplateHandler();
 		if (handler instanceof DefaultUriBuilderFactory) {
 			((DefaultUriBuilderFactory) handler).setDefaultUriVariables(defaultUriVariables);
 		}
-		else if (handler instanceof AbstractUriTemplateHandler) {
-			((AbstractUriTemplateHandler) handler).setDefaultUriVariables(defaultUriVariables);
+		else if (handler instanceof org.springframework.web.util.AbstractUriTemplateHandler) {
+			((org.springframework.web.util.AbstractUriTemplateHandler) handler)
+					.setDefaultUriVariables(defaultUriVariables);
 		}
 		else {
 			throw new IllegalArgumentException(

spring-web/src/main/java/org/springframework/web/client/RestTemplate.java

@@ -52,7 +52,6 @@
 import org.springframework.http.converter.xml.SourceHttpMessageConverter;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.web.util.AbstractUriTemplateHandler;
 import org.springframework.web.util.DefaultUriBuilderFactory;
 import org.springframework.web.util.UriTemplateHandler;
 
@@ -263,12 +262,14 @@ public ResponseErrorHandler getErrorHandler() {
 	 * @param uriVars the default URI variable values
 	 * @since 4.3
 	 */
+	@SuppressWarnings("deprecation")
 	public void setDefaultUriVariables(Map<String, ?> uriVars) {
 		if (this.uriTemplateHandler instanceof DefaultUriBuilderFactory) {
 			((DefaultUriBuilderFactory) this.uriTemplateHandler).setDefaultUriVariables(uriVars);
 		}
-		else if (this.uriTemplateHandler instanceof AbstractUriTemplateHandler) {
-			((AbstractUriTemplateHandler) this.uriTemplateHandler).setDefaultUriVariables(uriVars);
+		else if (this.uriTemplateHandler instanceof org.springframework.web.util.AbstractUriTemplateHandler) {
+			((org.springframework.web.util.AbstractUriTemplateHandler) this.uriTemplateHandler)
+					.setDefaultUriVariables(uriVars);
 		}
 		else {
 			throw new IllegalArgumentException(