Merge pull request OpenFeign#90 from allenxwang/6.x

Adrian Cole · Adrian Cole · commit 2ef9e006c937 · 2013-11-12T14:41:47.000-08:00
Update to Ribbon 0.3.1
diff --git a/build.gradle b/build.gradle
@@ -113,7 +113,7 @@ project(':feign-ribbon') {
 
     dependencies {
         compile     project(':feign-core')
-        compile     'com.netflix.ribbon:ribbon-core:0.2.3'
+        compile     'com.netflix.ribbon:ribbon-core:0.3.1'
         testCompile 'org.testng:testng:6.8.5'
         testCompile 'com.google.mockwebserver:mockwebserver:20130706'
     }
diff --git a/ribbon/src/main/java/feign/ribbon/LBClient.java b/ribbon/src/main/java/feign/ribbon/LBClient.java
@@ -62,11 +62,11 @@ public RibbonResponse execute(RibbonRequest request) throws IOException {
     return new RibbonResponse(request.getUri(), response);
   }
 
-  @Override protected boolean isCircuitBreakerException(Exception e) {
+  @Override protected boolean isCircuitBreakerException(Throwable e) {
     return e instanceof IOException;
   }
 
-  @Override protected boolean isRetriableException(Exception e) {
+  @Override protected boolean isRetriableException(Throwable e) {
     return e instanceof RetryableException;
   }
 
@@ -75,10 +75,6 @@ protected Pair<String, Integer> deriveSchemeAndPortFromPartialUri(RibbonRequest
     return new Pair<String, Integer>(URI.create(task.request.url()).getScheme(), task.getUri().getPort());
   }
 
-  @Override protected int getDefaultPort() {
-    return 443;
-  }
-
   static class RibbonRequest extends ClientRequest implements Cloneable {
 
     private final Request request;
@@ -135,6 +131,13 @@ static class RibbonResponse implements IResponse {
     Response toResponse() {
       return response;
     }
+
+    @Override
+    public void close() throws IOException {
+        if (response.body() != null) {
+            response.body().close();
+        }
+    }
   }
 
   static int config(RibbonRequest request, CommonClientConfigKey key, int defaultValue) {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ project(':feign-ribbon') {`
`113`	`113`
`114`	`114`	`dependencies {`
`115`	`115`	`compile project(':feign-core')`
`116`		`- compile 'com.netflix.ribbon:ribbon-core:0.2.3'`
	`116`	`+ compile 'com.netflix.ribbon:ribbon-core:0.3.1'`
`117`	`117`	`testCompile 'org.testng:testng:6.8.5'`
`118`	`118`	`testCompile 'com.google.mockwebserver:mockwebserver:20130706'`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,11 @@ public RibbonResponse execute(RibbonRequest request) throws IOException {`
`62`	`62`	`return new RibbonResponse(request.getUri(), response);`
`63`	`63`	`}`
`64`	`64`
`65`		`- @Override protected boolean isCircuitBreakerException(Exception e) {`
	`65`	`+ @Override protected boolean isCircuitBreakerException(Throwable e) {`
`66`	`66`	`return e instanceof IOException;`
`67`	`67`	`}`
`68`	`68`
`69`		`- @Override protected boolean isRetriableException(Exception e) {`
	`69`	`+ @Override protected boolean isRetriableException(Throwable e) {`
`70`	`70`	`return e instanceof RetryableException;`
`71`	`71`	`}`
`72`	`72`
`@@ -75,10 +75,6 @@ protected Pair<String, Integer> deriveSchemeAndPortFromPartialUri(RibbonRequest`
`75`	`75`	`return new Pair<String, Integer>(URI.create(task.request.url()).getScheme(), task.getUri().getPort());`
`76`	`76`	`}`
`77`	`77`
`78`		`- @Override protected int getDefaultPort() {`
`79`		`- return 443;`
`80`		`- }`
`81`		`-`
`82`	`78`	`static class RibbonRequest extends ClientRequest implements Cloneable {`
`83`	`79`
`84`	`80`	`private final Request request;`
`@@ -135,6 +131,13 @@ static class RibbonResponse implements IResponse {`
`135`	`131`	`Response toResponse() {`
`136`	`132`	`return response;`
`137`	`133`	`}`
	`134`	`+`
	`135`	`+ @Override`
	`136`	`+ public void close() throws IOException {`
	`137`	`+ if (response.body() != null) {`
	`138`	`+ response.body().close();`
	`139`	`+ }`
	`140`	`+ }`
`138`	`141`	`}`
`139`	`142`
`140`	`143`	`static int config(RibbonRequest request, CommonClientConfigKey key, int defaultValue) {`