From ce4d560dc10fb55f0e60fe9fe46707a9f5a5c905 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Thu, 28 Sep 2017 17:25:47 -0400
Subject: [PATCH] Fix RibbonClientHttpRequestFactoryTests

fixes gh-2314
---
 .../ribbon/RibbonAutoConfiguration.java       |  9 ++-----
 .../RibbonClientHttpRequestFactoryTests.java  | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
index 8d03633c..1362387e 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
@@ -118,7 +118,7 @@ public class RibbonAutoConfiguration {
 	@Configuration
 	@ConditionalOnClass(HttpRequest.class)
 	@ConditionalOnRibbonRestClient
-	protected static class RibbonClientConfig {
+	protected static class RibbonClientHttpRequestFactoryConfiguration {
 
 		@Autowired
 		private SpringClientFactory springClientFactory;
@@ -126,12 +126,7 @@ public class RibbonAutoConfiguration {
 		@Bean
 		public RestTemplateCustomizer restTemplateCustomizer(
 				final RibbonClientHttpRequestFactory ribbonClientHttpRequestFactory) {
-			return new RestTemplateCustomizer() {
-				@Override
-				public void customize(RestTemplate restTemplate) {
-					restTemplate.setRequestFactory(ribbonClientHttpRequestFactory);
-				}
-			};
+			return restTemplate -> restTemplate.setRequestFactory(ribbonClientHttpRequestFactory);
 		}
 
 		@Bean
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java
index 16990b98..4ed3bce4 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientHttpRequestFactoryTests.java
@@ -16,12 +16,9 @@
 
 package org.springframework.cloud.netflix.ribbon;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import java.lang.reflect.Field;
 import java.net.URI;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -30,16 +27,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.AbstractClientHttpRequestFactoryWrapper;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -53,13 +51,17 @@ import org.springframework.web.client.RestTemplate;
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
 /**
  * @author Spencer Gibb
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = RibbonClientHttpRequestFactoryTests.App.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = {
+@SpringBootTest(classes = RibbonClientHttpRequestFactoryTests.App.class, webEnvironment = RANDOM_PORT, value = {
 		"spring.application.name=ribbonclienttest", "spring.jmx.enabled=true",
-		"spring.cloud.netflix.metrics.enabled=false", "ribbon.http.client.enabled=true" })
+		"spring.cloud.netflix.metrics.enabled=false", "ribbon.restclient.enabled=true", "debug=true" })
 @DirtiesContext
 public class RibbonClientHttpRequestFactoryTests {
 
@@ -71,11 +73,13 @@ public class RibbonClientHttpRequestFactoryTests {
 	protected RestTemplate restTemplate;
 
 	@Test
-	@Ignore //FIXME 2.0.0
 	public void requestFactoryIsRibbon() {
 		ClientHttpRequestFactory requestFactory = this.restTemplate.getRequestFactory();
-		assertTrue("wrong RequestFactory type: " + requestFactory.getClass(),
-				requestFactory instanceof RibbonClientHttpRequestFactory);
+		assertThat(requestFactory).isInstanceOf(AbstractClientHttpRequestFactoryWrapper.class);
+		Field field = ReflectionUtils.findField(AbstractClientHttpRequestFactoryWrapper.class, "requestFactory");
+		ReflectionUtils.makeAccessible(field);
+		ClientHttpRequestFactory delegate = (ClientHttpRequestFactory) ReflectionUtils.getField(field, requestFactory);
+		assertThat(delegate).isInstanceOf(RibbonClientHttpRequestFactory.class);
 	}
 
 	@Test