From ee861e8001072a11c0c619c8739ef1297e36bb46 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Fri, 27 Jan 2017 17:26:14 -0500
Subject: [PATCH] Fix compiler deprecation-related errors

---
 .../org/springframework/web/client/AsyncRestTemplate.java  | 7 ++++---
 .../java/org/springframework/web/client/RestTemplate.java  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java
index 00c9a87677a..a0ad553bf23 100644
--- a/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/AsyncRestTemplate.java
@@ -44,7 +44,6 @@ import org.springframework.http.converter.HttpMessageConverter;
 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 class AsyncRestTemplate extends InterceptingAsyncHttpAccessor implements
 	 * @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(
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
index 22721dc2128..ea94a66c839 100644
--- a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -52,7 +52,6 @@ import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConve
 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 class RestTemplate extends InterceptingHttpAccessor implements RestOperat
 	 * @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(