Merge pull request #54 from polyapi/develop

Develop

Author: gastonortiz

README.md

@@ -360,4 +360,4 @@ Comparing to its Typescript counterpart, the Java library is still missing the f
 These features will be added in the future releases.
 
 ## Changelog
-See the Changelog **[here](https://github.com/polyapi/polyapi-java/releases)**.
+See the Changelog **[here](https://github.com/polyapi/polyapi-java/releases)**.

commons/src/main/java/io/polyapi/commons/api/service/PolyApiService.java

@@ -93,14 +93,14 @@ private <I, O> O parsedCall(HttpMethod method, String relativePath, Map<String,
                     if (contentType.startsWith("application/json")) {
                         parsedResult = jsonParser.parseInputStream(response.body(), TypeVariable.class.isAssignableFrom(type.getClass()) ? Object.class : type);
                     } else {
-                        if ((type.getClass().isAssignableFrom(String.class) || TypeVariable.class.isAssignableFrom(type.getClass())) && contentType.startsWith("text/")) {
+                        if (checkType(type, String.class) && contentType.startsWith("text/")) {
                             try {
                                 parsedResult = (O)IOUtils.toString(response.body(), defaultCharset());
                             } catch (IOException e) {
                                 throw new ParsingException("An error occurred while parsing the response.", e);
                             }
                         } else {
-                            if ((InputStream.class.isAssignableFrom(type.getClass()) || type.getClass().isAssignableFrom(TypeVariable.class))) {
+                            if (checkType(type, InputStream.class)) {
                                 parsedResult = (O)response.body();
                             } else {
                                 throw new UnsupportedContentTypeException(contentType, type);
@@ -114,6 +114,10 @@ private <I, O> O parsedCall(HttpMethod method, String relativePath, Map<String,
         return result;
     }
 
+    private boolean checkType(Type type, Class<?> expectedClass) {
+        return (type.getClass().isAssignableFrom(Class.class) && Class.class.cast(type).isAssignableFrom(expectedClass)) || TypeVariable.class.isAssignableFrom(type.getClass());
+    }
+
     private Response callApi(HttpMethod method, String relativePath, Map<String, List<String>> headers, Map<String, List<String>> queryParams, InputStream body) {
         Request request = client.prepareAuthenticatedRequest(host, port, method, relativePath)
                 .withHeaders(headers)

pom.xml

@@ -244,4 +244,4 @@
             </distributionManagement>
         </profile>
     </profiles>
-</project>
+</project>