spotify-web-api-java · thelinmichael · May 18, 2014 · May 16, 2014 · May 16, 2014 · May 16, 2014
diff --git a/search-album.json b/search-album.json
diff --git a/src/main/java/se/michaelthelin/spotify/Api.java b/src/main/java/se/michaelthelin/spotify/Api.java
@@ -1,6 +1,5 @@
 package se.michaelthelin.spotify;
 
-import com.google.protobuf.RepeatedFieldBuilder;
 import se.michaelthelin.spotify.UtilProtos.Url.Scheme;
 import se.michaelthelin.spotify.methods.*;
 

diff --git a/src/main/java/se/michaelthelin/spotify/JsonUtil.java b/src/main/java/se/michaelthelin/spotify/JsonUtil.java
@@ -116,7 +116,7 @@ private static Album createAlbum(JSONObject albumJson) {
     album.setName(albumJson.getString("name"));
     album.setPopularity(albumJson.getInt("popularity"));
     album.setReleaseDate(createReleaseDate(albumJson.getJSONObject("release_date")));
-    album.setTracks(createSimpleTracks(albumJson.getJSONArray("tracks")));
+    album.setTracks(createSimpleTrackPage(albumJson.getJSONObject("tracks")));
     album.setType(createSpotifyEntityType(albumJson.getString("type")));
     album.setUri(albumJson.getString("uri"));
 
@@ -154,12 +154,16 @@ public static ReleaseDate createReleaseDate(JSONObject releaseDateJson) {
     ReleaseDate releaseDate = new ReleaseDate();
 
     releaseDate.setYear(releaseDateJson.getInt("year"));
-    if (!releaseDateJson.getJSONObject("month").isNullObject()) {
+    if (releaseDateJson.has("month") && !releaseDateJson.get("month").equals("null")) {
       releaseDate.setMonth(releaseDateJson.getInt("month"));
+    } else {
+      releaseDate.setMonth(null);
     }
 
-    if (!releaseDateJson.getJSONObject("date").isNullObject()) {
-      releaseDate.setDate(releaseDateJson.getInt("date"));
+    if (releaseDateJson.has("day") && !releaseDateJson.get("day").equals("null")) {
+      releaseDate.setDate(releaseDateJson.getInt("day"));
+    } else {
+      releaseDate.setDate(null);
     }
 
     return releaseDate;
@@ -191,7 +195,7 @@ public  static SimpleAlbum createSimpleAlbum(JSONObject simpleAlbumJson) {
     simpleAlbum.setImages(createImages(simpleAlbumJson.getJSONArray("images")));
     simpleAlbum.setName(simpleAlbumJson.getString("name"));
     simpleAlbum.setType(createSpotifyEntityType(simpleAlbumJson.getString("type")));
-    simpleAlbum.setUri(simpleAlbumJson.getString("type"));
+    simpleAlbum.setUri(simpleAlbumJson.getString("uri"));
 
     return simpleAlbum;
   }
@@ -211,6 +215,14 @@ public static List<Album> createAlbums(JSONArray jsonArray) {
     return returnedAlbums;
   }
 
+  public static List<SimpleAlbum> createSimpleAlbums(JSONArray jsonArray) {
+    List<SimpleAlbum> returnedAlbums = new ArrayList<SimpleAlbum>();
+    for (int i = 0; i < jsonArray.size(); i++) {
+      returnedAlbums.add(createSimpleAlbum(jsonArray.getJSONObject(i)));
+    }
+    return returnedAlbums;
+  }
+
   public static SimpleArtist createSimpleArtist(JSONObject simpleArtistJson) {
     if (simpleArtistJson == null || simpleArtistJson.isNullObject()) {
       return null;
@@ -303,8 +315,8 @@ public static Page<Album> createAlbumPage(String albumPageJson) {
   }
 
   public static Page<Album> createAlbumPage(JSONObject albumPageJson) {
-    Page page = createItemlessPage(albumPageJson);
-    page.setItems(createAlbums(albumPageJson.getJSONArray("items")));
+    Page page = createItemlessPage(albumPageJson.getJSONObject("albums"));
+    page.setItems(createAlbums(albumPageJson.getJSONObject("albums").getJSONArray("items")));
     return page;
   }
 
@@ -328,8 +340,8 @@ public static Page<Track> createTrackPage(String trackPageJson) {
   }
 
   public static Page<Track> createTrackPage(JSONObject trackPageJson) {
-    Page page = createItemlessPage(trackPageJson);
-    page.setItems(createTracks(trackPageJson.getJSONArray("items")));
+    Page page = createItemlessPage(trackPageJson.getJSONObject("tracks"));
+    page.setItems(createTracks(trackPageJson.getJSONObject("tracks").getJSONArray("items")));
     return page;
   }
 
@@ -343,6 +355,22 @@ public static Page<Artist> createArtistPage(JSONObject artistPageJson) {
     return page;
   }
 
+  private static Page<SimpleTrack> createSimpleTrackPage(JSONObject simpleTrackPageJson) {
+    Page page = createItemlessPage(simpleTrackPageJson);
+    page.setItems(createSimpleTracks(simpleTrackPageJson.getJSONArray("items")));
+    return page;
+  }
+
+  public static Page<SimpleAlbum> createSimpleAlbumPage(String simpleAlbumPageJson) {
+    return createSimpleAlbumPage(JSONObject.fromObject(simpleAlbumPageJson));
+  }
+
+  public static Page<SimpleAlbum> createSimpleAlbumPage(JSONObject simpleAlbumPageJson) {
+    Page page = createItemlessPage(simpleAlbumPageJson);
+    page.setItems(createSimpleAlbums(simpleAlbumPageJson.getJSONArray("items")));
+    return page;
+  }
+
   public static User createUser(String userJson) {
     return createUser(JSONObject.fromObject(userJson));
   }
@@ -376,4 +404,5 @@ public static User createUser(JSONObject userJson) {
   private static Product createProduct(String product) {
     return Product.valueOf(product.toUpperCase());
   }
+
 }
diff --git a/src/main/java/se/michaelthelin/spotify/methods/AlbumSearchRequest.java b/src/main/java/se/michaelthelin/spotify/methods/AlbumSearchRequest.java
@@ -6,6 +6,7 @@
 import se.michaelthelin.spotify.exceptions.UnexpectedResponseException;
 import se.michaelthelin.spotify.models.Album;
 import se.michaelthelin.spotify.models.Page;
+import se.michaelthelin.spotify.models.SimpleAlbum;
 
 import java.io.IOException;
 
@@ -15,13 +16,13 @@ protected AlbumSearchRequest(Builder builder) {
     super(builder);
   }
 
-  public SettableFuture<Page<Album>> getAlbumsPageAsync() {
-    SettableFuture<Page<Album>> searchResultFuture = SettableFuture.create();
+  public SettableFuture<Page<SimpleAlbum>> getAsync() {
+    SettableFuture<Page<SimpleAlbum>> searchResultFuture = SettableFuture.create();
 
     try {
       String jsonString = getJson();
       JSONObject jsonObject = JSONObject.fromObject(jsonString);
-      searchResultFuture.set(JsonUtil.createAlbumPage(jsonObject));
+      searchResultFuture.set(JsonUtil.createSimpleAlbumPage(jsonObject.getJSONObject("albums")));
     } catch (IOException e) {
       searchResultFuture.setException(e);
     } catch (UnexpectedResponseException e) {
@@ -31,8 +32,8 @@ public SettableFuture<Page<Album>> getAlbumsPageAsync() {
     return searchResultFuture;
   }
 
-  public Page<Album> getAlbumsPage() throws IOException, UnexpectedResponseException {
-    return JsonUtil.createAlbumPage(getJson());
+  public Page<SimpleAlbum> get() throws IOException, UnexpectedResponseException {
+    return JsonUtil.createSimpleAlbumPage(JSONObject.fromObject(getJson()).getJSONObject("albums"));
   }
 
   public static Builder builder() {
@@ -43,9 +44,9 @@ public static final class Builder extends AbstractRequest.Builder<Builder> {
 
     public Builder query(String query) {
       assert (query != null);
-      path("/v1/albums/search");
-      String massagedQuery = query.replace(" ", "+");
-      return parameter("q", massagedQuery);
+      path("/v1/search");
+      parameter("type","album");
+      return parameter("q", query);
     }
 
     public Builder limit(int limit) {

diff --git a/src/main/java/se/michaelthelin/spotify/methods/AlbumsForArtistRequest.java b/src/main/java/se/michaelthelin/spotify/methods/AlbumsForArtistRequest.java
@@ -10,6 +10,7 @@
 import se.michaelthelin.spotify.models.Album;
 import se.michaelthelin.spotify.models.AlbumType;
 import se.michaelthelin.spotify.models.Page;
+import se.michaelthelin.spotify.models.SimpleAlbum;
 
 import java.io.IOException;
 
@@ -19,13 +20,13 @@ public AlbumsForArtistRequest(Builder builder) {
     super(builder);
   }
 
-  public SettableFuture<Page<Album>> getAsync() {
-    SettableFuture<Page<Album>> searchResultFuture = SettableFuture.create();
+  public SettableFuture<Page<SimpleAlbum>> getAsync() {
+    SettableFuture<Page<SimpleAlbum>> searchResultFuture = SettableFuture.create();
 
     try {
       String jsonString = getJson();
       JSONObject jsonObject = JSONObject.fromObject(jsonString);
-      searchResultFuture.set(JsonUtil.createAlbumPage(jsonObject));
+      searchResultFuture.set(JsonUtil.createSimpleAlbumPage(jsonObject));
     } catch (IOException e) {
       searchResultFuture.setException(e);
     } catch (UnexpectedResponseException e) {
@@ -35,8 +36,8 @@ public SettableFuture<Page<Album>> getAsync() {
     return searchResultFuture;
   }
 
-  public Page<Album> get() throws IOException, UnexpectedResponseException, NotFoundException, BadFieldException {
-    return JsonUtil.createAlbumPage(getJson());
+  public Page<SimpleAlbum> get() throws IOException, UnexpectedResponseException, NotFoundException, BadFieldException {
+    return JsonUtil.createSimpleAlbumPage(getJson());
   }
 
   public static Builder builder() {

diff --git a/src/main/java/se/michaelthelin/spotify/methods/ArtistSearchRequest.java b/src/main/java/se/michaelthelin/spotify/methods/ArtistSearchRequest.java
@@ -22,7 +22,7 @@ public SettableFuture<Page<Artist>> getAsync() {
     try {
       String jsonString = getJson();
       JSONObject jsonObject = JSONObject.fromObject(jsonString);
-      searchResultFuture.set(JsonUtil.createArtistPage(jsonObject));
+      searchResultFuture.set(JsonUtil.createArtistPage(jsonObject.getJSONObject("artists")));
     } catch (IOException e) {
       searchResultFuture.setException(e);
     } catch (UnexpectedResponseException e) {
@@ -33,7 +33,7 @@ public SettableFuture<Page<Artist>> getAsync() {
   }
 
   public Page<Artist> get() throws IOException, UnexpectedResponseException {
-    return JsonUtil.createArtistPage(getJson());
+    return JsonUtil.createArtistPage(JSONObject.fromObject(getJson()).getJSONObject("artists"));
   }
 
   public static Builder builder() {
@@ -44,9 +44,9 @@ public static final class Builder extends AbstractRequest.Builder<Builder> {
 
     public Builder query(String query) {
       assert (query != null);
-      path("/v1/artists/search");
-      String massagedQuery = query.replace(" ", "+");
-      return parameter("q", massagedQuery);
+      path("/v1/search");
+      parameter("type","artist");
+      return parameter("q", query);
     }
 
     public Builder limit(int limit) {

diff --git a/src/main/java/se/michaelthelin/spotify/methods/TrackSearchRequest.java b/src/main/java/se/michaelthelin/spotify/methods/TrackSearchRequest.java
@@ -43,9 +43,9 @@ public static final class Builder extends AbstractRequest.Builder<Builder> {
 
     public Builder query(String query) {
       assert (query != null);
-      path("/v1/tracks/search");
-      String massagedQuery = query.replace(" ", "+");
-      return parameter("q", massagedQuery);
+      path("/v1/search");
+      parameter("type","track");
+      return parameter("q", query);
     }
 
     public Builder limit(int limit) {

diff --git a/src/main/java/se/michaelthelin/spotify/models/Album.java b/src/main/java/se/michaelthelin/spotify/models/Album.java
@@ -16,7 +16,7 @@ public class Album {
   private String name;
   private int popularity;
   private ReleaseDate releaseDate;
-  private List<SimpleTrack> tracks;
+  private Page<SimpleTrack> tracks;
   private SpotifyEntityType type = SpotifyEntityType.ALBUM;
   private String uri;
 
@@ -116,11 +116,11 @@ public void setReleaseDate(ReleaseDate releaseDate) {
     this.releaseDate = releaseDate;
   }
 
-  public List<SimpleTrack> getTracks() {
+  public Page<SimpleTrack> getTracks() {
     return tracks;
   }
 
-  public void setTracks(List<SimpleTrack> tracks) {
+  public void setTracks(Page<SimpleTrack> tracks) {
     this.tracks = tracks;
   }
 

diff --git a/src/main/java/se/michaelthelin/spotify/models/ExternalUrls.java b/src/main/java/se/michaelthelin/spotify/models/ExternalUrls.java
@@ -11,4 +11,8 @@ public Map<String, String> getExternalUrls() {
     return externalUrls;
   }
 
+  public String get(String key) {
+    return externalUrls.get(key);
+  }
+
 }
diff --git a/src/main/java/se/michaelthelin/spotify/models/Followers.java b/src/main/java/se/michaelthelin/spotify/models/Followers.java
@@ -0,0 +1,15 @@
+package se.michaelthelin.spotify.models;
+
+public class Followers {
+
+  private String href;
+  private int total;
+
+  public String getHref() {
+    return href;
+  }
+
+  public void setHref(String href) {
+    this.href = href;
+  }
+}
diff --git a/src/main/java/se/michaelthelin/spotify/models/Playlist.java b/src/main/java/se/michaelthelin/spotify/models/Playlist.java
@@ -7,14 +7,14 @@ public class Playlist {
   private boolean collaborative;
   private String description;
   private ExternalUrls externalUrls;
-  private int followersCount;
+  private Followers followers;
   private String href;
   private String id;
   private List<Image> images;
   private User owner;
   private String name;
   private boolean publicAccess;
-  private int tracksCount;
+  private Page<PlaylistTrack> tracks;
   private SpotifyEntityType type = SpotifyEntityType.PLAYLIST;
   private String uri;
 
@@ -42,12 +42,12 @@ public void setExternalUrls(ExternalUrls externalUrls) {
     this.externalUrls = externalUrls;
   }
 
-  public int getFollowersCount() {
-    return followersCount;
+  public Followers getFollowers() {
+    return followers;
   }
 
-  public void setFollowersCount(int followersCount) {
-    this.followersCount = followersCount;
+  public void setFollowers(Followers followers) {
+    this.followers = followers;
   }
 
   public String getHref() {
@@ -90,14 +90,6 @@ public void setName(String name) {
     this.name = name;
   }
 
-  public int getTracksCount() {
-    return tracksCount;
-  }
-
-  public void setTracksCount(int tracksCount) {
-    this.tracksCount = tracksCount;
-  }
-
   public SpotifyEntityType getType() {
     return type;
   }

diff --git a/src/main/java/se/michaelthelin/spotify/models/PlaylistTrack.java b/src/main/java/se/michaelthelin/spotify/models/PlaylistTrack.java
@@ -0,0 +1,34 @@
+package se.michaelthelin.spotify.models;
+
+import java.util.Date;
+
+public class PlaylistTrack {
+
+  private Date addedAt;
+  private User addedBy;
+  private SimpleTrack track;
+
+  public Date getAddedAt() {
+    return addedAt;
+  }
+
+  public void setAddedAt(Date addedAt) {
+    this.addedAt = addedAt;
+  }
+
+  public User getAddedBy() {
+    return addedBy;
+  }
+
+  public void setAddedBy(User addedBy) {
+    this.addedBy = addedBy;
+  }
+
+  public SimpleTrack getTrack() {
+    return track;
+  }
+
+  public void setTrack(SimpleTrack track) {
+    this.track = track;
+  }
+}
diff --git a/src/main/java/se/michaelthelin/spotify/models/PlaylistTracksInformation.java b/src/main/java/se/michaelthelin/spotify/models/PlaylistTracksInformation.java
@@ -0,0 +1,23 @@
+package se.michaelthelin.spotify.models;
+
+public class PlaylistTracksInformation {
+
+  private String href;
+  private int total;
+
+  public String getHref() {
+    return href;
+  }
+
+  public void setHref(String href) {
+    this.href = href;
+  }
+
+  public int getTotal() {
+    return total;
+  }
+
+  public void setTotal(int total) {
+    this.total = total;
+  }
+}