Merge pull request #7 from Gruncan/v1.1a

V1.1a

pom.xml

@@ -6,8 +6,8 @@
 
 
     <groupId>com.spotstat</groupId>
-    <artifactId>spotstat</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>S4J</artifactId>
+    <version>1.1a</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -18,12 +18,25 @@
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
+            <artifactId>junit-jupiter</artifactId>
             <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <excludedGroups>SlowNetworkTest</excludedGroups>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>

src/main/java/com/http/HttpRequest.java

@@ -80,6 +80,11 @@ public HttpResponse execute() {
 
 
             int code = con.getResponseCode();
+            // if request failed at receiver end
+            if (code != 200)
+                return new HttpResponse(code, null, con.getResponseMessage());
+
+            // if request failed at client end
             InputStream is = con.getErrorStream();
             if (is == null)
                 is = con.getInputStream();

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

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

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

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