Updated to handle response wrapper

Author: Gruncan

src/main/java/com/spotify/SpotifyClient.java

@@ -1,13 +1,13 @@
 package com.spotify;
 
-import com.spotify.json.JSONObject;
 import com.spotify.requests.IRequest;
+import com.spotify.requests.RequestResponse;
 
 public interface SpotifyClient {
 
 
     // to be changed
-    JSONObject executeRequest(IRequest request);
+    RequestResponse executeRequest(IRequest request);
 
 
 }

src/main/java/com/spotify/SpotifyClientBuilder.java

@@ -6,6 +6,7 @@
 import com.http.SpotifyHttpServerProvider;
 import com.spotify.json.JSONObject;
 import com.spotify.requests.IRequest;
+import com.spotify.requests.RequestResponse;
 import com.spotify.requests.util.Scope;
 import com.spotify.util.Util;
 
@@ -197,7 +198,7 @@ public SpotifyClientImp(String accessToken) {
 
 
         @Override
-        public JSONObject executeRequest(IRequest request) {
+        public RequestResponse executeRequest(IRequest request) {
             return request.execute(this.accessToken);
         }
     }

src/main/java/com/spotify/requests/AbstractRequest.java

@@ -48,7 +48,7 @@ private static <T> String convertToString(Class<T> cls, Object o) {
      * @param url The specific API URL to be used, excluding "https://api.spotify.com/v1/"
      * @return The raw json response from the request
      */
-    protected final JSONObject requestGet(String token, String url) {
+    protected final RequestResponse requestGet(String token, String url) {
         // Initialisation of http get request
 
 
@@ -63,7 +63,7 @@ protected final JSONObject requestGet(String token, String url) {
             String s = response.getMessage();
             switch (code) {
                 case 200:
-                    return new JSONObject(response.getContent());
+                    return new RequestResponse(new JSONObject(response.getContent()), code, s);
                 case 401:
                     System.out.println("Bad or expired token. This can happen if the user revoked a " +
                             "token or the access token has expired. You should re-authenticate the user.");
@@ -79,9 +79,8 @@ protected final JSONObject requestGet(String token, String url) {
                 default:
                     System.out.printf("Unknown fail cause, status code: %s.%n", code);
             }
-            System.out.println(s);
 
-            return null;
+            return new RequestResponse(null, code, s);
 
 
         } catch (NullPointerException e) {
@@ -91,7 +90,7 @@ protected final JSONObject requestGet(String token, String url) {
     }
 
     @Override
-    public JSONObject execute(String token) {
+    public RequestResponse execute(String token) {
 
         String urlQuery = this.buildRequestUrl();
         if (urlQuery == null) return null;

src/main/java/com/spotify/requests/IRequest.java

@@ -1,6 +1,6 @@
 package com.spotify.requests;
 
-import com.spotify.json.JSONObject;
+
 
 public interface IRequest {
 
@@ -9,6 +9,6 @@ public interface IRequest {
      *
      * @return {@code JSONObject} the raw json response
      */
-    JSONObject execute(String token);
+    RequestResponse execute(String token);
 
 }

src/test/java/com/spotify/Main.java

@@ -23,7 +23,7 @@ public static void main(String[] args) throws IllegalAccessException {
         TrackGet al = new TrackGet("05lBXOMA1uHpVPEQZyjoh3");
 
 //        AlbumsSavedMeGet al = new AlbumsSavedMeGet();
-        JSONObject jsonObject = spotifyClient.executeRequest(al);
+        JSONObject jsonObject = spotifyClient.executeRequest(al).ok();
         System.out.println(jsonObject.toString(4));
 
 

src/test/java/com/spotify/httpserver/SpotifyRequestTester.java

@@ -59,7 +59,7 @@ public void handle(HttpExchange e) throws IOException {
             SpotifyClient spotifyClient = spotifyClientBuilder.build(code);
 
             TrackGet currentUserProfileGet = new TrackGet("2mgkRsjpp6HH1MTyHYpTeF");
-            JSONObject jsonObject = spotifyClient.executeRequest(currentUserProfileGet);
+            JSONObject jsonObject = spotifyClient.executeRequest(currentUserProfileGet).ok();
 
 
             String response = jsonObject.toString(4);