Fix Json parse exception (#412)

redouane59 · Oct 26, 2022 · bf1a840 · bf1a840
1 parent 3e5b553
commit bf1a840
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/io/github/redouane59/twitter/helpers/AbstractRequestHelper.java b/src/main/java/io/github/redouane59/twitter/helpers/AbstractRequestHelper.java
@@ -1,11 +1,13 @@
 package io.github.redouane59.twitter.helpers;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.scribejava.apis.TwitterApi;
 import com.github.scribejava.core.builder.ServiceBuilder;
 import com.github.scribejava.core.model.OAuthRequest;
 import com.github.scribejava.core.model.Response;
 import com.github.scribejava.core.model.Verb;
 import com.github.scribejava.core.oauth.OAuth10aService;
+import io.github.redouane59.twitter.TwitterClient;
 import io.github.redouane59.twitter.signature.TwitterCredentials;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -104,13 +106,21 @@ public <T> Optional<T> makeRequest(OAuthRequest request, boolean signRequired, C
       } else if (response.getCode() < 200 || response.getCode() > 299) {
         logApiError(request.getVerb().name(), request.getUrl(), stringResponse, response.getCode());
       }
-      result = JsonHelper.fromJson(stringResponse, classType);
+      result = convert(stringResponse, classType);
     } catch (IOException ex) {
       LOGGER.error("Error occupied on executing request", ex);
     }
     return Optional.ofNullable(result);
   }
 
+  protected <T> T convert(String json, Class<? extends T> targetClass) throws JsonProcessingException {
+    if (targetClass.isInstance(json)) {
+      return (T) json;
+    } else {
+      return JsonHelper.fromJson(json, targetClass);
+    }
+  }
+
   public abstract <T> Optional<T> getRequest(String url, Class<T> classType);
 
   public abstract <T> Optional<T> getRequestWithParameters(String url, Map<String, String> parameters, Class<T> classType);