Merge branch 'fix-remove-tracks-v2'

Author: dargmuesli

examples/data/playlists/RemoveTracksFromPlaylistExample.java

@@ -15,7 +15,8 @@ public class RemoveTracksFromPlaylistExample {
   private static final String accessToken = "taHZ2SdB-bPA3FsK3D7ZN5npZS47cMy-IEySVEGttOhXmqaVAIo0ESvTCLjLBifhHOHOIuhFUKPW1WMDP7w6dj3MAZdWT8CLI2MkZaXbYLTeoDvXesf2eeiLYPBGdx8tIwQJKgV8XdnzH_DONk";
   private static final String userId = "abbaspotify";
   private static final String playlistId = "3AGOiaoRXMSjswCLtuNqv5";
-  private static final JsonArray tracks = new JsonParser().parse("[\"01iyCAUm8EvOFqVWYJ3dVX\"]").getAsJsonArray();
+  private static final JsonArray tracks = new JsonParser()
+          .parse("[{\"uri\":\"spotify:track:01iyCAUm8EvOFqVWYJ3dVX\"}]").getAsJsonArray();
 
   private static final SpotifyApi spotifyApi = new SpotifyApi.Builder()
           .setAccessToken(accessToken)

src/main/java/com/wrapper/spotify/HttpDeleteBody.java

@@ -0,0 +1,25 @@
+package com.wrapper.spotify;
+
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+
+import java.net.URI;
+
+public class HttpDeleteBody extends HttpEntityEnclosingRequestBase {
+    public static final String METHOD_NAME = "DELETE";
+
+    public HttpDeleteBody() {
+    }
+
+    public HttpDeleteBody(URI uri) {
+        this.setURI(uri);
+    }
+
+    public HttpDeleteBody(String uri) {
+        this.setURI(URI.create(uri));
+    }
+
+    public String getMethod() {
+        return "DELETE";
+    }
+}
+

src/main/java/com/wrapper/spotify/IHttpManager.java

@@ -62,7 +62,7 @@ String put(URI uri, Header[] headers, HttpEntity body) throws
    * @throws IOException            In case of networking issues.
    * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
    */
-  String delete(URI uri, Header[] headers) throws
+  String delete(URI uri, Header[] headers, HttpEntity body) throws
           IOException,
           SpotifyWebApiException;
 

src/main/java/com/wrapper/spotify/SpotifyHttpManager.java

@@ -171,16 +171,17 @@ public String put(URI uri, Header[] headers, HttpEntity body) throws
   }
 
   @Override
-  public String delete(URI uri, Header[] headers) throws
+  public String delete(URI uri, Header[] headers, HttpEntity body) throws
           IOException,
           SpotifyWebApiException {
     assert (uri != null);
     assert (!uri.toString().equals(""));
 
-    final HttpDelete httpDelete = new HttpDelete();
+    final HttpDeleteBody httpDelete = new HttpDeleteBody();
 
     httpDelete.setURI(uri);
     httpDelete.setHeaders(headers);
+    httpDelete.setEntity(body);
 
     String responseBody = getResponseBody(execute(httpDelete));
 

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

@@ -156,7 +156,7 @@ public String deleteJson() throws
           SpotifyWebApiException {
     initializeBody();
 
-    String json = httpManager.delete(uri, headers.toArray(new Header[headers.size()]));
+    String json = httpManager.delete(uri, headers.toArray(new Header[headers.size()]), body);
 
     if (json == null || json.equals("")) {
       return null;

src/main/java/com/wrapper/spotify/requests/data/playlists/RemoveTracksFromPlaylistRequest.java

@@ -35,7 +35,7 @@ private RemoveTracksFromPlaylistRequest(final Builder builder) {
   public SnapshotResult execute() throws
           IOException,
           SpotifyWebApiException {
-    return new SnapshotResult.JsonUtil().createModelObject(getJson());
+    return new SnapshotResult.JsonUtil().createModelObject(deleteJson());
   }
 
   /**
@@ -88,11 +88,11 @@ public Builder playlist_id(final String playlist_id) {
      * <p>
      * There are several ways to specify which tracks to remove, determined by the request parameters.
      * Removing all occurrences of specific tracks: <br>
-     * {@code { "tracks": [{ "uri": "spotify:track:4iV5W9uYEdYUVa79Axb7Rh" },
-     * {"uri": "spotify:track:1301WleyT98MSxVHPZCA6M" }] }} <br>
+     * {@code [{ "uri": "spotify:track:4iV5W9uYEdYUVa79Axb7Rh" },
+     * {"uri": "spotify:track:1301WleyT98MSxVHPZCA6M" }] } <br>
      * Removing a specific occurrence of a track: <br>
-     * {@code { "tracks": [{ "uri": "spotify:track:4iV5W9uYEdYUVa79Axb7Rh", "positions": [0,3] },
-     * { "uri": "spotify:track:1301WleyT98MSxVHPZCA6M", "positions": [7] }] }}
+     * {@code [{ "uri": "spotify:track:4iV5W9uYEdYUVa79Axb7Rh", "positions": [0,3] },
+     * { "uri": "spotify:track:1301WleyT98MSxVHPZCA6M", "positions": [7] }] }
      *
      * @param tracks Required. An array of objects containing Spotify URIs of the tracks to remove. A maximum of
      *               100 objects can be sent at once

src/test/java/com/wrapper/spotify/TestUtil.java

@@ -55,7 +55,7 @@ public static IHttpManager returningJson(String jsonFixture) throws Exception {
       when(mockedHttpManager.get(any(URI.class), any(Header[].class))).thenReturn(fixture);
       when(mockedHttpManager.post(any(URI.class), any(Header[].class), any(HttpEntity.class))).thenReturn(fixture);
       when(mockedHttpManager.put(any(URI.class), any(Header[].class), any(HttpEntity.class))).thenReturn(fixture);
-      when(mockedHttpManager.delete(any(URI.class), any(Header[].class))).thenReturn(fixture);
+      when(mockedHttpManager.delete(any(URI.class), any(Header[].class), any(HttpEntity.class))).thenReturn(fixture);
 
       return mockedHttpManager;
     }

src/test/java/com/wrapper/spotify/requests/data/playlists/RemoveTracksFromPlaylistRequestTest.java

@@ -19,7 +19,7 @@
 public class RemoveTracksFromPlaylistRequestTest extends AbstractDataTest<SnapshotResult> {
   private final RemoveTracksFromPlaylistRequest defaultRequest = SPOTIFY_API
           .removeTracksFromPlaylist(ID_USER, ID_PLAYLIST, new JsonParser()
-                  .parse("[\"" + ID_TRACK + "\",\"" + ID_TRACK + "\"]").getAsJsonArray())
+                  .parse("[{\"uri\":\"" + ID_TRACK + "\"},{\"uri\":\"" + ID_TRACK + "\"}]").getAsJsonArray())
           .setHttpManager(
                   TestUtil.MockedHttpManager.returningJson(
                           "requests/data/playlists/RemoveTracksFromPlaylistRequest.json"))
@@ -35,7 +35,7 @@ public void shouldComplyWithReference() {
     assertHasBodyParameter(
             defaultRequest,
             "tracks",
-            "[\"" + ID_TRACK + "\",\"" + ID_TRACK + "\"]");
+            "[{\"uri\":\"" + ID_TRACK + "\"},{\"uri\":\"" + ID_TRACK + "\"}]");
     assertEquals(
             "https://api.spotify.com:443/v1/users/abbaspotify/playlists/3AGOiaoRXMSjswCLtuNqv5/tracks",
             defaultRequest.getUri().toString());