Merge pull request OpenFeign#185 from bstick12/issue-183

adriancole · adriancole · commit 712a8c8f38d3 · 2015-02-18T17:42:57.000-08:00
Retains scheme in LBClient.RibbonRequest URI
diff --git a/core/src/test/java/feign/client/TrustingSSLSocketFactory.java b/core/src/test/java/feign/client/TrustingSSLSocketFactory.java
@@ -40,7 +40,7 @@
 /**
  * Used for ssl tests to simplify setup.
  */
-final class TrustingSSLSocketFactory extends SSLSocketFactory
+public final class TrustingSSLSocketFactory extends SSLSocketFactory
     implements X509TrustManager, X509KeyManager {
 
   private static final Map<String, SSLSocketFactory>
diff --git a/ribbon/build.gradle b/ribbon/build.gradle
@@ -8,4 +8,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:1.7.1'
     testCompile 'com.squareup.okhttp:mockwebserver:2.2.0'
+    testCompile project(':feign-core').sourceSets.test.output
 }
diff --git a/ribbon/src/main/java/feign/ribbon/RibbonClient.java b/ribbon/src/main/java/feign/ribbon/RibbonClient.java
@@ -1,15 +1,15 @@
 package feign.ribbon;
 
+import java.io.IOException;
+import java.net.URI;
+
 import com.netflix.client.ClientException;
 import com.netflix.client.ClientFactory;
 import com.netflix.client.config.CommonClientConfigKey;
 import com.netflix.client.config.DefaultClientConfigImpl;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.ILoadBalancer;
 
-import java.io.IOException;
-import java.net.URI;
-
 import feign.Client;
 import feign.Request;
 import feign.Response;
@@ -41,12 +41,8 @@ public Response execute(Request request, Request.Options options) throws IOExcep
     try {
       URI asUri = URI.create(request.url());
       String clientName = asUri.getHost();
-      URI
-          uriWithoutSchemeAndPort =
-          URI.create(request.url().replace(asUri.getScheme() + "://" + asUri.getHost(), ""));
-      LBClient.RibbonRequest
-          ribbonRequest =
-          new LBClient.RibbonRequest(request, uriWithoutSchemeAndPort);
+      URI uriWithoutHost = URI.create(request.url().replace(asUri.getHost(), ""));
+      LBClient.RibbonRequest ribbonRequest = new LBClient.RibbonRequest(request, uriWithoutHost);
       return lbClient(clientName).executeWithLoadBalancer(ribbonRequest,
           new FeignOptionsClientConfig(options)).toResponse();
     } catch (ClientException e) {
diff --git a/ribbon/src/test/java/feign/ribbon/RibbonClientTest.java b/ribbon/src/test/java/feign/ribbon/RibbonClientTest.java
@@ -34,10 +34,12 @@
 import com.squareup.okhttp.mockwebserver.SocketPolicy;
 import com.squareup.okhttp.mockwebserver.rule.MockWebServerRule;
 
+import feign.Client;
 import feign.Feign;
 import feign.Param;
 import feign.Request;
 import feign.RequestLine;
+import feign.client.TrustingSSLSocketFactory;
 
 public class RibbonClientTest {
 
@@ -123,6 +125,25 @@ public void urlEncodeQueryStringParameters() throws IOException, InterruptedExce
     assertEquals(recordedRequestLine, expectedRequestLine);
   }
 
+
+  @Test
+  public void testHTTPSViaRibbon() {
+
+    Client trustSSLSockets = new Client.Default(TrustingSSLSocketFactory.get(), null);
+
+    server1.get().useHttps(TrustingSSLSocketFactory.get("localhost"), false);
+    server1.enqueue(new MockResponse().setBody("success!"));
+
+    getConfigInstance().setProperty(serverListKey(), hostAndPort(server1.getUrl("")));
+
+    TestInterface api =
+        Feign.builder().client(new RibbonClient(trustSSLSockets))
+            .target(TestInterface.class, "https://" + client());
+    api.post();
+    assertEquals(1, server1.getRequestCount());
+
+  }
+
   @Test
   public void ioExceptionRetryWithBuilder() throws IOException, InterruptedException {
     server1.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.DISCONNECT_AT_START));

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ dependencies {`
`8`	`8`	`testCompile 'junit:junit:4.12'`
`9`	`9`	`testCompile 'org.assertj:assertj-core:1.7.1'`
`10`	`10`	`testCompile 'com.squareup.okhttp:mockwebserver:2.2.0'`
	`11`	`+ testCompile project(':feign-core').sourceSets.test.output`
`11`	`12`	`}`