Merge branch '2.0.x'

cff5c1ec · Andy Wilkinson · 55d70d56 · 0d7d95d8 · cff5c1ec
Commit cff5c1ec authored May 31, 2018 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

RestTemplateBuilder.java .../springframework/boot/web/client/RestTemplateBuilder.java +0 -2

No files found.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
@@ -72,8 +72,6 @@ public class RestTemplateBuilder {
 				"org.springframework.http.client.HttpComponentsClientHttpRequestFactory");
 		candidates.put("okhttp3.OkHttpClient",
 				"org.springframework.http.client.OkHttp3ClientHttpRequestFactory");
-		candidates.put("com.squareup.okhttp.OkHttpClient",
-				"org.springframework.http.client.OkHttpClientHttpRequestFactory");
 		REQUEST_FACTORY_CANDIDATES = Collections.unmodifiableMap(candidates);
 	}