Skip to content

Commit 0840211

Browse files
authored
Merge pull request #7 from Gruncan/v1.1a
V1.1a
2 parents 0a2c45b + 1645ef5 commit 0840211

File tree

71 files changed

+711
-2206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+711
-2206
lines changed

pom.xml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77

88
<groupId>com.spotstat</groupId>
9-
<artifactId>spotstat</artifactId>
10-
<version>1.0-SNAPSHOT</version>
9+
<artifactId>S4J</artifactId>
10+
<version>1.1a</version>
1111

1212
<properties>
1313
<maven.compiler.source>17</maven.compiler.source>
@@ -18,12 +18,25 @@
1818

1919
<dependency>
2020
<groupId>org.junit.jupiter</groupId>
21-
<artifactId>junit-jupiter-api</artifactId>
21+
<artifactId>junit-jupiter</artifactId>
2222
<version>5.8.2</version>
2323
<scope>test</scope>
2424
</dependency>
2525

2626
</dependencies>
2727

28+
<build>
29+
<plugins>
30+
<plugin>
31+
<groupId>org.apache.maven.plugins</groupId>
32+
<artifactId>maven-surefire-plugin</artifactId>
33+
<version>2.22.2</version>
34+
<configuration>
35+
<excludedGroups>SlowNetworkTest</excludedGroups>
36+
</configuration>
37+
</plugin>
38+
</plugins>
39+
</build>
40+
2841

2942
</project>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ public HttpResponse execute() {
8080

8181

8282
int code = con.getResponseCode();
83+
// if request failed at receiver end
84+
if (code != 200)
85+
return new HttpResponse(code, null, con.getResponseMessage());
86+
87+
// if request failed at client end
8388
InputStream is = con.getErrorStream();
8489
if (is == null)
8590
is = con.getInputStream();
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.spotify;
22

3-
import com.spotify.json.JSONObject;
4-
import com.spotify.requests.AbstractRequest;
3+
import com.spotify.requests.IRequest;
4+
import com.spotify.requests.RequestResponse;
55

66
public interface SpotifyClient {
77

88

99
// to be changed
10-
JSONObject executeRequest(AbstractRequest abstractRequest);
10+
RequestResponse executeRequest(IRequest request);
1111

1212

1313
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import com.http.HttpResponse;
66
import com.http.SpotifyHttpServerProvider;
77
import com.spotify.json.JSONObject;
8-
import com.spotify.requests.AbstractRequest;
8+
import com.spotify.requests.IRequest;
9+
import com.spotify.requests.RequestResponse;
910
import com.spotify.requests.util.Scope;
1011
import com.spotify.util.Util;
1112

@@ -197,8 +198,8 @@ public SpotifyClientImp(String accessToken) {
197198

198199

199200
@Override
200-
public JSONObject executeRequest(AbstractRequest abstractRequest) {
201-
return abstractRequest.execute(this.accessToken);
201+
public RequestResponse executeRequest(IRequest request) {
202+
return request.execute(this.accessToken);
202203
}
203204
}
204205
}

src/main/java/com/spotify/objects/SpotifyField.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/main/java/com/spotify/objects/SpotifyImage.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

src/main/java/com/spotify/objects/SpotifyNotRequired.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/main/java/com/spotify/objects/SpotifyObject.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/java/com/spotify/objects/album/Album.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/main/java/com/spotify/objects/search/SearchResult.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)