better generic programming

swanis · swanis · commit 31fda0b875a3 · 2022-01-23T18:04:50.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>is.swan</groupId>
     <artifactId>mcmarket-api-java-wrapper</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/src/main/java/is/swan/mcmarketapi/request/Client.java b/src/main/java/is/swan/mcmarketapi/request/Client.java
@@ -14,19 +14,19 @@ public Client(Token token) {
         this.throttler = new Throttler();
     }
 
-    public Response send(Request request) {
-        Response response = getResponse(request);
+    public <V> Response<V> send(Request<V> request) {
+        Response<V> response = getResponse(request);
 
         if (response.isRatelimited() || response.getError() != null) {
             return response;
         }
 
-        response.setValue(request.handleJson((String) response.getValue()));
+        response.setValue(request.handleJson(response.getJson()));
 
         return response;
     }
 
-    public Response sendOrWait(Request request) {
+    public <V> Response<V> sendOrWait(Request<V> request) {
     	long stallFor;
     	while ((stallFor = this.throttler.stallFor(request.getMethod())) > 0) {
             try {
@@ -36,7 +36,7 @@ public Response sendOrWait(Request request) {
             }
     	}
     	
-        Response response = getResponse(request);
+        Response<V> response = getResponse(request);
         
         if (response.isRatelimited()) {
         	if (request.getMethod() == Method.GET) {
@@ -58,12 +58,12 @@ public Response sendOrWait(Request request) {
             return response;
         }
 
-        response.setValue(request.handleJson((String) response.getValue()));
+        response.setValue(request.handleJson(response.getJson()));
 
         return response;
     }
 
-    private Response getResponse(Request request) {
+    private <V> Response<V> getResponse(Request<V> request) {
         return switch(request.getMethod()) {
             case GET -> HTTPUtil.get(request.getURL(), token);
             case POST -> HTTPUtil.post(request.getURL(), request.getBody(), token);
diff --git a/src/main/java/is/swan/mcmarketapi/request/Response.java b/src/main/java/is/swan/mcmarketapi/request/Response.java
@@ -2,13 +2,19 @@
 
 public class Response<V> {
 
+    private final String json;
+
     private V value;
     private boolean ratelimited;
     private int millisecondsToWait;
     private Error error;
 
-    public Response(V value) {
-        this.value = value;
+    public Response(String json) {
+        this.json = json;
+    }
+
+    public String getJson() {
+        return json;
     }
 
     public V getValue() {
@@ -39,7 +45,7 @@ public Error getError() {
         return error;
     }
 
-    public Response setError(Error error) {
+    public Response<V> setError(Error error) {
         this.error = error;
         return this;
     }
diff --git a/src/main/java/is/swan/mcmarketapi/request/requests/conversation/StartConversationRequest.java b/src/main/java/is/swan/mcmarketapi/request/requests/conversation/StartConversationRequest.java
@@ -1,6 +1,5 @@
 package is.swan.mcmarketapi.request.requests.conversation;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import is.swan.mcmarketapi.request.Request;
 
diff --git a/src/main/java/is/swan/mcmarketapi/request/requests/conversation/reply/ReplyToUnreadConversationRequest.java b/src/main/java/is/swan/mcmarketapi/request/requests/conversation/reply/ReplyToUnreadConversationRequest.java
@@ -1,6 +1,5 @@
 package is.swan.mcmarketapi.request.requests.conversation.reply;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import is.swan.mcmarketapi.request.Request;
 
diff --git a/src/main/java/is/swan/mcmarketapi/request/requests/thread/reply/ReplyToThreadRequest.java b/src/main/java/is/swan/mcmarketapi/request/requests/thread/reply/ReplyToThreadRequest.java
@@ -1,6 +1,5 @@
 package is.swan.mcmarketapi.request.requests.thread.reply;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import is.swan.mcmarketapi.request.Request;
 
diff --git a/src/main/java/is/swan/mcmarketapi/utils/HTTPUtil.java b/src/main/java/is/swan/mcmarketapi/utils/HTTPUtil.java
@@ -2,9 +2,9 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
+import is.swan.mcmarketapi.Token;
 import is.swan.mcmarketapi.request.Error;
 import is.swan.mcmarketapi.request.Response;
-import is.swan.mcmarketapi.Token;
 
 import java.io.IOException;
 import java.net.URI;
@@ -17,7 +17,7 @@ public class HTTPUtil {
     private static final HttpClient CLIENT = HttpClient.newHttpClient();
     private static final Gson GSON = new Gson();
 
-    public static Response<String> get(String url, Token token) {
+    public static <V> Response<V> get(String url, Token token) {
         HttpRequest request = HttpRequest.newBuilder()
                 .uri(URI.create(url))
                 .header("Authorization", token.toString())
@@ -28,11 +28,11 @@ public static Response<String> get(String url, Token token) {
 
             return getResponse(httpResponse);
         } catch (IOException | InterruptedException e) {
-            return new Response<>("").setError(new Error(e.getClass().getName(), e.getMessage()));
+            return new Response<V>("").setError(new Error(e.getClass().getName(), e.getMessage()));
         }
     }
 
-    public static Response<String> post(String url, String body, Token token) {
+    public static <V> Response<V> post(String url, String body, Token token) {
         HttpRequest request = HttpRequest.newBuilder()
                 .POST(HttpRequest.BodyPublishers.ofString(body))
                 .uri(URI.create(url))
@@ -45,11 +45,11 @@ public static Response<String> post(String url, String body, Token token) {
 
             return getResponse(httpResponse);
         } catch (IOException | InterruptedException e) {
-            return new Response<>("").setError(new Error(e.getClass().getName(), e.getMessage()));
+            return new Response<V>("").setError(new Error(e.getClass().getName(), e.getMessage()));
         }
     }
 
-    public static Response<String> delete(String url, Token token) {
+    public static <V> Response<V> delete(String url, Token token) {
         HttpRequest request = HttpRequest.newBuilder()
                 .DELETE()
                 .uri(URI.create(url))
@@ -61,11 +61,11 @@ public static Response<String> delete(String url, Token token) {
 
             return getResponse(httpResponse);
         } catch (IOException | InterruptedException e) {
-            return new Response<>("").setError(new Error(e.getClass().getName(), e.getMessage()));
+            return new Response<V>("").setError(new Error(e.getClass().getName(), e.getMessage()));
         }
     }
 
-    public static Response<String> patch(String url, String body, Token token) {
+    public static <V> Response<V> patch(String url, String body, Token token) {
         HttpRequest request = HttpRequest.newBuilder()
                 .method("PATCH", HttpRequest.BodyPublishers.ofString(body))
                 .uri(URI.create(url))
@@ -78,12 +78,12 @@ public static Response<String> patch(String url, String body, Token token) {
 
             return getResponse(httpResponse);
         } catch (IOException | InterruptedException e) {
-            return new Response<>("").setError(new Error(e.getClass().getName(), e.getMessage()));
+            return new Response<V>("").setError(new Error(e.getClass().getName(), e.getMessage()));
         }
     }
 
-    private static Response<String> getResponse(HttpResponse<String> httpResponse) {
-        Response<String> response = new Response<>(httpResponse.body());
+    private static <V> Response<V> getResponse(HttpResponse<String> httpResponse) {
+        Response<V> response = new Response<>(httpResponse.body());
 
         if (httpResponse.headers().firstValue("Retry-After").isPresent()) {
             response.setRatelimited(true);

Original file line number	Diff line number	Diff line change
`@@ -14,19 +14,19 @@ public Client(Token token) {`
`14`	`14`	`this.throttler = new Throttler();`
`15`	`15`	`}`
`16`	`16`
`17`		`- public Response send(Request request) {`
`18`		`- Response response = getResponse(request);`
	`17`	`+ public <V> Response<V> send(Request<V> request) {`
	`18`	`+ Response<V> response = getResponse(request);`
`19`	`19`
`20`	`20`	`if (response.isRatelimited() \|\| response.getError() != null) {`
`21`	`21`	`return response;`
`22`	`22`	`}`
`23`	`23`
`24`		`- response.setValue(request.handleJson((String) response.getValue()));`
	`24`	`+ response.setValue(request.handleJson(response.getJson()));`
`25`	`25`
`26`	`26`	`return response;`
`27`	`27`	`}`
`28`	`28`
`29`		`- public Response sendOrWait(Request request) {`
	`29`	`+ public <V> Response<V> sendOrWait(Request<V> request) {`
`30`	`30`	`long stallFor;`
`31`	`31`	`while ((stallFor = this.throttler.stallFor(request.getMethod())) > 0) {`
`32`	`32`	`try {`
`@@ -36,7 +36,7 @@ public Response sendOrWait(Request request) {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- Response response = getResponse(request);`
	`39`	`+ Response<V> response = getResponse(request);`
`40`	`40`
`41`	`41`	`if (response.isRatelimited()) {`
`42`	`42`	`if (request.getMethod() == Method.GET) {`
`@@ -58,12 +58,12 @@ public Response sendOrWait(Request request) {`
`58`	`58`	`return response;`
`59`	`59`	`}`
`60`	`60`
`61`		`- response.setValue(request.handleJson((String) response.getValue()));`
	`61`	`+ response.setValue(request.handleJson(response.getJson()));`
`62`	`62`
`63`	`63`	`return response;`
`64`	`64`	`}`
`65`	`65`
`66`		`- private Response getResponse(Request request) {`
	`66`	`+ private <V> Response<V> getResponse(Request<V> request) {`
`67`	`67`	`return switch(request.getMethod()) {`
`68`	`68`	`case GET -> HTTPUtil.get(request.getURL(), token);`
`69`	`69`	`case POST -> HTTPUtil.post(request.getURL(), request.getBody(), token);`