Merge pull request #101 from joeltgf/master

fehguy · fehguy · commit 0d40a53e06e5 · 2013-11-04T09:57:09.000-08:00
Change "success" response status code in Java ApiInvoker to all 2xx responses vs. just 200.
diff --git a/src/main/resources/Java/apiInvoker.mustache b/src/main/resources/Java/apiInvoker.mustache
@@ -12,6 +12,7 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.client.filter.LoggingFilter;
 import com.sun.jersey.api.client.WebResource.Builder;
 
+import javax.ws.rs.core.Response.Status.Family;
 import javax.ws.rs.core.MediaType;
 
 import java.util.Map;
@@ -123,7 +124,7 @@ public class ApiInvoker {
     else {
       throw new ApiException(500, "unknown method type " + method);
     }
-    if(response.getClientResponseStatus() == ClientResponse.Status.OK) {
+    if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {
       return (String) response.getEntity(String.class);
     }
     else {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import com.sun.jersey.api.client.config.DefaultClientConfig;`
`12`	`12`	`import com.sun.jersey.api.client.filter.LoggingFilter;`
`13`	`13`	`import com.sun.jersey.api.client.WebResource.Builder;`
`14`	`14`
	`15`	`+import javax.ws.rs.core.Response.Status.Family;`
`15`	`16`	`import javax.ws.rs.core.MediaType;`
`16`	`17`
`17`	`18`	`import java.util.Map;`
`@@ -123,7 +124,7 @@ public class ApiInvoker {`
`123`	`124`	`else {`
`124`	`125`	`throw new ApiException(500, "unknown method type " + method);`
`125`	`126`	`}`
`126`		`- if(response.getClientResponseStatus() == ClientResponse.Status.OK) {`
	`127`	`+ if(response.getClientResponseStatus().getFamily() == Family.SUCCESSFUL) {`
`127`	`128`	`return (String) response.getEntity(String.class);`
`128`	`129`	`}`
`129`	`130`	`else {`