items) {
+ this.items = items;
return this;
}
@@ -473,10 +473,10 @@ public Playlist createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "snapshot_id")
? jsonObject.get("snapshot_id").getAsString()
: null)
- .setTracks(
- hasAndNotNull(jsonObject, "tracks")
+ .setItems(
+ hasAndNotNull(jsonObject, "items")
? new PlaylistTrack.JsonUtil().createModelObjectPaging(
- jsonObject.getAsJsonObject("tracks"))
+ jsonObject.getAsJsonObject("items"))
: null)
.setType(
hasAndNotNull(jsonObject, "type")
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistSimplified.java b/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistSimplified.java
index 01cda2407..aca5c348b 100644
--- a/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistSimplified.java
+++ b/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistSimplified.java
@@ -38,7 +38,7 @@ public class PlaylistSimplified extends AbstractModelObject implements ISearchMo
/** The version identifier for the current playlist. */
private final String snapshotId;
/** Information about the tracks of the playlist. */
- private final PlaylistTracksInformation tracks;
+ private final PlaylistTracksInformation items;
/** The object type. */
private final ModelObjectType type;
/** The Spotify URI for the playlist. */
@@ -57,7 +57,7 @@ private PlaylistSimplified(final Builder builder) {
this.owner = builder.owner;
this.publicAccess = builder.publicAccess;
this.snapshotId = builder.snapshotId;
- this.tracks = builder.tracks;
+ this.items = builder.items;
this.type = builder.type;
this.uri = builder.uri;
}
@@ -172,8 +172,8 @@ public String getSnapshotId() {
*
* @return Information about the tracks of the playlist.
*/
- public PlaylistTracksInformation getTracks() {
- return tracks;
+ public PlaylistTracksInformation getItems() {
+ return items;
}
/**
@@ -197,7 +197,7 @@ public String getUri() {
@Override
public String toString() {
- return "PlaylistSimplified(name=" + name + ", tracks=" + tracks + ", collaborative=" + collaborative
+ return "PlaylistSimplified(name=" + name + ", items=" + items + ", collaborative=" + collaborative
+ ", description=" + description + ", externalUrls=" + externalUrls + ", href=" + href + ", id=" + id
+ ", images=" + Arrays.toString(images) + ", owner=" + owner + ", publicAccess=" + publicAccess
+ ", snapshotId=" + snapshotId + ", type=" + type + ", uri=" + uri + ")";
@@ -222,7 +222,7 @@ public static final class Builder extends AbstractModelObject.Builder {
private User owner;
private Boolean publicAccess;
private String snapshotId;
- private PlaylistTracksInformation tracks;
+ private PlaylistTracksInformation items;
private ModelObjectType type;
private String uri;
@@ -345,13 +345,13 @@ public Builder setSnapshotId(String snapshotId) {
}
/**
- * Set some track information of the playlist to be built.
+ * Set some item information of the playlist to be built.
*
- * @param tracks A playlist tracks information object.
+ * @param items A playlist tracks information object.
* @return A {@link PlaylistSimplified.Builder}.
*/
- public Builder setTracks(PlaylistTracksInformation tracks) {
- this.tracks = tracks;
+ public Builder setItems(PlaylistTracksInformation items) {
+ this.items = items;
return this;
}
@@ -445,10 +445,10 @@ public PlaylistSimplified createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "snapshot_id")
? jsonObject.get("snapshot_id").getAsString()
: null)
- .setTracks(
- hasAndNotNull(jsonObject, "tracks")
+ .setItems(
+ hasAndNotNull(jsonObject, "items")
? new PlaylistTracksInformation.JsonUtil().createModelObject(
- jsonObject.getAsJsonObject("tracks"))
+ jsonObject.getAsJsonObject("items"))
: null)
.setType(
hasAndNotNull(jsonObject, "type")
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistTrack.java b/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistTrack.java
index f249c5ce8..f3f59b923 100644
--- a/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistTrack.java
+++ b/src/main/java/se/michaelthelin/spotify/model_objects/specification/PlaylistTrack.java
@@ -24,7 +24,7 @@ public class PlaylistTrack extends AbstractModelObject {
/** Whether the track is a local file. */
private final Boolean isLocal;
/** The track or episode information. */
- private final IPlaylistItem track;
+ private final IPlaylistItem item;
private PlaylistTrack(final Builder builder) {
super(builder);
@@ -32,7 +32,7 @@ private PlaylistTrack(final Builder builder) {
this.addedAt = builder.addedAt;
this.addedBy = builder.addedBy;
this.isLocal = builder.isLocal;
- this.track = builder.track;
+ this.item = builder.item;
}
/**
@@ -70,13 +70,13 @@ public Boolean getIsLocal() {
*
* @return Information about the track.
*/
- public IPlaylistItem getTrack() {
- return track;
+ public IPlaylistItem getItem() {
+ return item;
}
@Override
public String toString() {
- return "PlaylistTrack(track=" + track + ", addedAt=" + addedAt + ", addedBy=" + addedBy + ", isLocal=" + isLocal
+ return "PlaylistTrack(item=" + item + ", addedAt=" + addedAt + ", addedBy=" + addedBy + ", isLocal=" + isLocal
+ ")";
}
@@ -92,7 +92,7 @@ public static final class Builder extends AbstractModelObject.Builder {
private Date addedAt;
private User addedBy;
private Boolean isLocal;
- private IPlaylistItem track;
+ private IPlaylistItem item;
/**
* Default constructor.
@@ -135,13 +135,13 @@ public Builder setIsLocal(Boolean isLocal) {
}
/**
- * Set the full track or episode object of the playlist track to be built.
+ * Set the full track or episode object of the playlist item to be built.
*
- * @param track Information about the track.
+ * @param item Information about the item.
* @return A {@link PlaylistTrack.Builder}.
*/
- public Builder setTrack(IPlaylistItem track) {
- this.track = track;
+ public Builder setItem(IPlaylistItem item) {
+ this.item = item;
return this;
}
@@ -169,12 +169,12 @@ public PlaylistTrack createModelObject(JsonObject jsonObject) {
}
try {
- IPlaylistItem track = null;
+ IPlaylistItem item = null;
- if (hasAndNotNull(jsonObject, "track")) {
- final JsonObject trackObj = jsonObject.getAsJsonObject("track");
+ if (hasAndNotNull(jsonObject, "item")) {
+ final JsonObject trackObj = jsonObject.getAsJsonObject("item");
- track = PlaylistItemFactory.createPlaylistItem(trackObj);
+ item = PlaylistItemFactory.createPlaylistItem(trackObj);
}
return new Builder()
@@ -191,7 +191,7 @@ public PlaylistTrack createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "is_local")
? jsonObject.get("is_local").getAsBoolean()
: null)
- .setTrack(track)
+ .setItem(item)
.build();
} catch (ParseException e) {
SpotifyApi.LOGGER.log(Level.SEVERE, e.getMessage());
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/specification/Show.java b/src/main/java/se/michaelthelin/spotify/model_objects/specification/Show.java
index 78369c9a8..20eaf802a 100644
--- a/src/main/java/se/michaelthelin/spotify/model_objects/specification/Show.java
+++ b/src/main/java/se/michaelthelin/spotify/model_objects/specification/Show.java
@@ -3,7 +3,6 @@
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
-import com.neovisionaries.i18n.CountryCode;
import se.michaelthelin.spotify.enums.ModelObjectType;
import se.michaelthelin.spotify.model_objects.AbstractModelObject;
@@ -16,8 +15,6 @@
*/
@JsonDeserialize(builder = Show.Builder.class)
public class Show extends AbstractModelObject {
- /** A list of the countries in which the show can be played. */
- private final CountryCode[] availableMarkets;
/** The copyright statements of the show. */
private final Copyright[] copyrights;
/** A description of the show. */
@@ -42,8 +39,6 @@ public class Show extends AbstractModelObject {
private final String mediaType;
/** The name of the show. */
private final String name;
- /** The publisher of the show. */
- private final String publisher;
/** The object type. */
private final ModelObjectType type;
/** The Spotify URI for the show. */
@@ -56,7 +51,6 @@ public class Show extends AbstractModelObject {
*/
public Show(Builder builder) {
super(builder);
- this.availableMarkets = builder.availableMarkets;
this.copyrights = builder.copyrights;
this.description = builder.description;
this.explicit = builder.explicit;
@@ -69,21 +63,10 @@ public Show(Builder builder) {
this.languages = builder.languages;
this.mediaType = builder.mediaType;
this.name = builder.name;
- this.publisher = builder.publisher;
this.type = builder.type;
this.uri = builder.uri;
}
- /**
- * Get a list of the countries in which the show can be played.
- *
- * @return An array of ISO 3166-1 alpha-2 country
- * * codes.
- */
- public CountryCode[] getAvailableMarkets() {
- return availableMarkets;
- }
-
/**
* Get the copyright statements of the show.
*
@@ -194,15 +177,6 @@ public String getName() {
return name;
}
- /**
- * Get the publisher of the show.
- *
- * @return The publisher of the show.
- */
- public String getPublisher() {
- return publisher;
- }
-
/**
* Get the model object type. In this case "show".
*
@@ -223,11 +197,11 @@ public String getUri() {
@Override
public String toString() {
- return "Show(availableMarkets=" + Arrays.toString(availableMarkets) + ", copyrights=" + Arrays.toString(copyrights)
+ return "Show(copyrights=" + Arrays.toString(copyrights)
+ ", description=" + description + ", explicit=" + explicit + ", episodes=" + episodes + ", externalUrls="
+ externalUrls + ", href=" + href + ", id=" + id + ", images=" + Arrays.toString(images)
+ ", isExternallyHosted=" + isExternallyHosted + ", languages=" + Arrays.toString(languages) + ", mediaType="
- + mediaType + ", name=" + name + ", publisher=" + publisher + ", type=" + type + ", uri=" + uri + ")";
+ + mediaType + ", name=" + name + ", type=" + type + ", uri=" + uri + ")";
}
@Override
@@ -239,7 +213,6 @@ public Builder builder() {
* Builder class for building {@link Show} instances.
*/
public static final class Builder extends AbstractModelObject.Builder {
- private CountryCode[] availableMarkets;
private Copyright[] copyrights;
private String description;
private Boolean explicit;
@@ -252,7 +225,6 @@ public static final class Builder extends AbstractModelObject.Builder {
private String[] languages;
private String mediaType;
private String name;
- private String publisher;
private ModelObjectType type;
private String uri;
@@ -263,18 +235,6 @@ public Builder() {
super();
}
- /**
- * Set the available markets of the show to be built.
- *
- * @param availableMarkets A list of the countries in which the show can be played, identified by their
- * ISO 3166-1 alpha-2 code.
- * @return A {@link Show.Builder}.
- */
- public Builder setAvailableMarkets(CountryCode... availableMarkets) {
- this.availableMarkets = availableMarkets;
- return this;
- }
-
/**
* Set the copyrights of the show to be built.
*
@@ -407,17 +367,6 @@ public Builder setName(String name) {
return this;
}
- /**
- * Set the publisher for the show to be built.
- *
- * @param publisher The publisher of the show.
- * @return A {@link Show.Builder}.
- */
- public Builder setPublisher(String publisher) {
- this.publisher = publisher;
- return this;
- }
-
/**
* Set the type of the model object. In this case "show".
*
@@ -465,11 +414,6 @@ public Show createModelObject(JsonObject jsonObject) {
}
return new Builder()
- .setAvailableMarkets(
- hasAndNotNull(jsonObject, "available_markets")
- ? new Gson().fromJson(
- jsonObject.getAsJsonArray("available_markets"), CountryCode[].class)
- : null)
.setCopyrights(
hasAndNotNull(jsonObject, "copyrights")
? new Gson().fromJson(
@@ -523,10 +467,6 @@ public Show createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "name")
? jsonObject.get("name").getAsString()
: null)
- .setPublisher(
- hasAndNotNull(jsonObject, "publisher")
- ? jsonObject.get("publisher").getAsString()
- : null)
.setType(
hasAndNotNull(jsonObject, "type")
? ModelObjectType.keyOf(
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/specification/ShowSimplified.java b/src/main/java/se/michaelthelin/spotify/model_objects/specification/ShowSimplified.java
index 1c8cc29d4..f9372f42a 100644
--- a/src/main/java/se/michaelthelin/spotify/model_objects/specification/ShowSimplified.java
+++ b/src/main/java/se/michaelthelin/spotify/model_objects/specification/ShowSimplified.java
@@ -3,7 +3,6 @@
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
-import com.neovisionaries.i18n.CountryCode;
import se.michaelthelin.spotify.enums.ModelObjectType;
import se.michaelthelin.spotify.model_objects.AbstractModelObject;
import se.michaelthelin.spotify.requests.data.search.interfaces.ISearchModelObject;
@@ -17,8 +16,6 @@
*/
@JsonDeserialize(builder = ShowSimplified.Builder.class)
public class ShowSimplified extends AbstractModelObject implements ISearchModelObject {
- /** A list of the countries in which the show can be played. */
- private final CountryCode[] availableMarkets;
/** The copyright statements of the show. */
private final Copyright[] copyrights;
/** A description of the show. */
@@ -41,8 +38,6 @@ public class ShowSimplified extends AbstractModelObject implements ISearchModelO
private final String mediaType;
/** The name of the show. */
private final String name;
- /** The publisher of the show. */
- private final String publisher;
/** The object type. */
private final ModelObjectType type;
/** The Spotify URI for the show. */
@@ -55,7 +50,6 @@ public class ShowSimplified extends AbstractModelObject implements ISearchModelO
*/
public ShowSimplified(Builder builder) {
super(builder);
- this.availableMarkets = builder.availableMarkets;
this.copyrights = builder.copyrights;
this.description = builder.description;
this.explicit = builder.explicit;
@@ -67,21 +61,10 @@ public ShowSimplified(Builder builder) {
this.languages = builder.languages;
this.mediaType = builder.mediaType;
this.name = builder.name;
- this.publisher = builder.publisher;
this.type = builder.type;
this.uri = builder.uri;
}
- /**
- * Get a list of the countries in which the show can be played.
- *
- * @return An array of ISO 3166-1 alpha-2 country
- * * codes.
- */
- public CountryCode[] getAvailableMarkets() {
- return availableMarkets;
- }
-
/**
* Get the copyright statements of the show.
*
@@ -183,15 +166,6 @@ public String getName() {
return name;
}
- /**
- * Get the publisher of the show.
- *
- * @return The publisher of the show.
- */
- public String getPublisher() {
- return publisher;
- }
-
/**
* Get the model object type. In this case "show".
*
@@ -212,11 +186,11 @@ public String getUri() {
@Override
public String toString() {
- return "ShowSimplified(availableMarkets=" + Arrays.toString(availableMarkets) + ", copyrights="
+ return "ShowSimplified(copyrights="
+ Arrays.toString(copyrights) + ", description=" + description + ", explicit=" + explicit + ", externalUrls="
+ externalUrls + ", href=" + href + ", id=" + id + ", images=" + Arrays.toString(images)
+ ", isExternallyHosted=" + isExternallyHosted + ", languages=" + Arrays.toString(languages) + ", mediaType="
- + mediaType + ", name=" + name + ", publisher=" + publisher + ", type=" + type + ", uri=" + uri + ")";
+ + mediaType + ", name=" + name + ", type=" + type + ", uri=" + uri + ")";
}
@Override
@@ -228,7 +202,6 @@ public Builder builder() {
* Builder class for building {@link ShowSimplified} instances.
*/
public static final class Builder extends AbstractModelObject.Builder {
- private CountryCode[] availableMarkets;
private Copyright[] copyrights;
private String description;
private Boolean explicit;
@@ -240,7 +213,6 @@ public static final class Builder extends AbstractModelObject.Builder {
private String[] languages;
private String mediaType;
private String name;
- private String publisher;
private ModelObjectType type;
private String uri;
@@ -251,18 +223,6 @@ public Builder() {
super();
}
- /**
- * Set the available markets of the show to be built.
- *
- * @param availableMarkets A list of the countries in which the show can be played, identified by their
- * ISO 3166-1 alpha-2 code.
- * @return A {@link ShowSimplified.Builder}.
- */
- public Builder setAvailableMarkets(CountryCode... availableMarkets) {
- this.availableMarkets = availableMarkets;
- return this;
- }
-
/**
* Set the copyrights of the show to be built.
*
@@ -384,17 +344,6 @@ public Builder setName(String name) {
return this;
}
- /**
- * Set the publisher for the show to be built.
- *
- * @param publisher The publisher of the show.
- * @return A {@link ShowSimplified.Builder}.
- */
- public Builder setPublisher(String publisher) {
- this.publisher = publisher;
- return this;
- }
-
/**
* Set the type of the model object. In this case "show".
*
@@ -442,11 +391,6 @@ public ShowSimplified createModelObject(JsonObject jsonObject) {
}
return new Builder()
- .setAvailableMarkets(
- hasAndNotNull(jsonObject, "available_markets")
- ? new Gson().fromJson(
- jsonObject.getAsJsonArray("available_markets"), CountryCode[].class)
- : null)
.setCopyrights(
hasAndNotNull(jsonObject, "copyrights")
? new Gson().fromJson(
@@ -495,10 +439,6 @@ public ShowSimplified createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "name")
? jsonObject.get("name").getAsString()
: null)
- .setPublisher(
- hasAndNotNull(jsonObject, "publisher")
- ? jsonObject.get("publisher").getAsString()
- : null)
.setType(
hasAndNotNull(jsonObject, "type")
? ModelObjectType.keyOf(
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/specification/Track.java b/src/main/java/se/michaelthelin/spotify/model_objects/specification/Track.java
index 0386f325e..64cdf541a 100644
--- a/src/main/java/se/michaelthelin/spotify/model_objects/specification/Track.java
+++ b/src/main/java/se/michaelthelin/spotify/model_objects/specification/Track.java
@@ -1,9 +1,7 @@
package se.michaelthelin.spotify.model_objects.specification;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.Gson;
import com.google.gson.JsonObject;
-import com.neovisionaries.i18n.CountryCode;
import se.michaelthelin.spotify.enums.ModelObjectType;
import se.michaelthelin.spotify.model_objects.AbstractModelObject;
import se.michaelthelin.spotify.model_objects.IPlaylistItem;
@@ -24,16 +22,12 @@ public class Track extends AbstractModelObject implements IArtistTrackModelObjec
private final AlbumSimplified album;
/** The artists who performed the track. */
private final ArtistSimplified[] artists;
- /** A list of the countries in which the track can be played. */
- private final CountryCode[] availableMarkets;
/** The disc number. */
private final Integer discNumber;
/** The track length in milliseconds. */
private final Integer durationMs;
/** Whether the track is explicit. */
private final Boolean explicit;
- /** External IDs for the track. */
- private final ExternalId externalIds;
/** External URLs for the track. */
private final ExternalUrl externalUrls;
/** The Spotify Web API endpoint URL for the track. */
@@ -42,14 +36,10 @@ public class Track extends AbstractModelObject implements IArtistTrackModelObjec
private final String id;
/** Whether the track is playable. */
private final Boolean isPlayable;
- /** Information about the original track. */
- private final TrackLink linkedFrom;
/** Restrictions on the track. */
private final Restrictions restrictions;
/** The name of the track. */
private final String name;
- /** The popularity of the track. */
- private final Integer popularity;
/** A link to a 30 second preview of the track. */
private final String previewUrl;
/** The number of the track. */
@@ -64,19 +54,15 @@ private Track(final Builder builder) {
this.album = builder.album;
this.artists = builder.artists;
- this.availableMarkets = builder.availableMarkets;
this.discNumber = builder.discNumber;
this.durationMs = builder.durationMs;
this.explicit = builder.explicit;
- this.externalIds = builder.externalIds;
this.externalUrls = builder.externalUrls;
this.href = builder.href;
this.id = builder.id;
this.isPlayable = builder.isPlayable;
- this.linkedFrom = builder.linkedFrom;
this.restrictions = builder.restrictions;
this.name = builder.name;
- this.popularity = builder.popularity;
this.previewUrl = builder.previewUrl;
this.trackNumber = builder.trackNumber;
this.type = builder.type;
@@ -103,16 +89,6 @@ public ArtistSimplified[] getArtists() {
return artists;
}
- /**
- * Get the country codes of all countries, in which the track is available.
- *
- * @return A list of the countries in which the track can be played, identified by their
- * ISO 3166-1 alpha-2 code.
- */
- public CountryCode[] getAvailableMarkets() {
- return availableMarkets;
- }
-
/**
* Get the disc number of the track in its album.
*
@@ -142,16 +118,6 @@ public Boolean getIsExplicit() {
return explicit;
}
- /**
- * Get the external IDs of the track.
- * Example: isrc -> "International Standard Recording Code".
- *
- * @return Known external IDs for the track.
- */
- public ExternalId getExternalIds() {
- return externalIds;
- }
-
/**
* Get the external URLs of the track.
* Example: Spotify-URL.
@@ -195,17 +161,6 @@ public Boolean getIsPlayable() {
return isPlayable;
}
- /**
- * Get the track link object of the track if
- * Track Relinking was applied and the requested track has been replaced with a different track. The track in the
- * {@code linked_from} object contains information about the originally requested track.
- *
- * @return The track in the {@code linked_from} object contains information about the originally requested track.
- */
- public TrackLink getLinkedFrom() {
- return linkedFrom;
- }
-
/**
* Get the restrictions of the track. Part of the response when
* Track Relinking is applied, the original
@@ -231,24 +186,6 @@ public String getName() {
return name;
}
- /**
- * Get the popularity of the track. The value will be between 0 and 100, with 100 being the most popular.
- *
- * The popularity of a track is a value between 0 and 100, with 100 being the most popular. The popularity is
- * calculated by algorithm and is based, in the most part, on the total number of plays the track has had and how
- * recent those plays are.
- *
- * Generally speaking, songs that are being played a lot now will have a higher popularity than songs that were played
- * a lot in the past. Duplicate tracks (e.g. the same track from a single and an album) are rated independently.
- * Artist and album popularity is derived mathematically from track popularity. Note that the popularity value may lag
- * actual popularity by a few days: the value is not updated in real time.
- *
- * @return The popularity of the track. The value will be between 0 and 100, with 100 being the most popular.
- */
- public Integer getPopularity() {
- return popularity;
- }
-
/**
* Get a link to a 30 second preview (MP3 format) of the track. {@code null} if not available.
*
@@ -291,11 +228,11 @@ public String getUri() {
@Override
public String toString() {
- return "Track(name=" + name + ", artists=" + Arrays.toString(artists) + ", album=" + album + ", availableMarkets="
- + Arrays.toString(availableMarkets) + ", discNumber=" + discNumber + ", durationMs=" + durationMs
- + ", explicit=" + explicit + ", externalIds=" + externalIds + ", externalUrls=" + externalUrls + ", href="
- + href + ", id=" + id + ", isPlayable=" + isPlayable + ", linkedFrom=" + linkedFrom + ", restrictions="
- + restrictions + ", popularity=" + popularity + ", previewUrl=" + previewUrl + ", trackNumber=" + trackNumber
+ return "Track(name=" + name + ", artists=" + Arrays.toString(artists) + ", album=" + album
+ + ", discNumber=" + discNumber + ", durationMs=" + durationMs
+ + ", explicit=" + explicit + ", externalUrls=" + externalUrls + ", href="
+ + href + ", id=" + id + ", isPlayable=" + isPlayable + ", restrictions="
+ + restrictions + ", previewUrl=" + previewUrl + ", trackNumber=" + trackNumber
+ ", type=" + type + ", uri=" + uri + ")";
}
@@ -310,19 +247,15 @@ public Builder builder() {
public static final class Builder extends AbstractModelObject.Builder {
private AlbumSimplified album;
private ArtistSimplified[] artists;
- private CountryCode[] availableMarkets;
private Integer discNumber;
private Integer durationMs;
private Boolean explicit;
- private ExternalId externalIds;
private ExternalUrl externalUrls;
private String href;
private String id;
private Boolean isPlayable;
- private TrackLink linkedFrom;
private Restrictions restrictions;
private String name;
- private Integer popularity;
private String previewUrl;
private Integer trackNumber;
private ModelObjectType type;
@@ -357,18 +290,6 @@ public Builder setArtists(ArtistSimplified... artists) {
return this;
}
- /**
- * Set the available markets of the track to be built.
- *
- * @param availableMarkets A list of the countries in which the track can be played, identified by their
- * ISO 3166-1 alpha-2 code.
- * @return A {@link Track.Builder}.
- */
- public Builder setAvailableMarkets(CountryCode... availableMarkets) {
- this.availableMarkets = availableMarkets;
- return this;
- }
-
/**
* Set the disc number of the track to be built.
*
@@ -403,17 +324,6 @@ public Builder setExplicit(Boolean explicit) {
return this;
}
- /**
- * Set the external IDs of the track to be built.
- *
- * @param externalIds Known external IDs for the track.
- * @return A {@link Track.Builder}.
- */
- public Builder setExternalIds(ExternalId externalIds) {
- this.externalIds = externalIds;
- return this;
- }
-
/**
* Set external URLs of the track to be built.
*
@@ -458,18 +368,6 @@ public Builder setIsPlayable(Boolean isPlayable) {
return this;
}
- /**
- * Set the track link object of the track to be built.
- *
- * @param linkedFrom The track in the {@code linked_from} object contains information about the originally requested
- * track.
- * @return A {@link Track.Builder}.
- */
- public Builder setLinkedFrom(TrackLink linkedFrom) {
- this.linkedFrom = linkedFrom;
- return this;
- }
-
/**
* Set the restrictions object of the track to be built.
*
@@ -493,18 +391,6 @@ public Builder setName(String name) {
return this;
}
- /**
- * Set the popularity of the track to be built.
- *
- * @param popularity The popularity of the track. The value will be between 0 and 100, with 100 being the most
- * popular.
- * @return A {@link Track.Builder}.
- */
- public Builder setPopularity(Integer popularity) {
- this.popularity = popularity;
- return this;
- }
-
/**
* Set the preview URL of the track to be built.
*
@@ -584,11 +470,6 @@ public Track createModelObject(JsonObject jsonObject) {
? new ArtistSimplified.JsonUtil().createModelObjectArray(
jsonObject.getAsJsonArray("artists"))
: null)
- .setAvailableMarkets(
- hasAndNotNull(jsonObject, "available_markets")
- ? new Gson().fromJson(
- jsonObject.getAsJsonArray("available_markets"), CountryCode[].class)
- : null)
.setDiscNumber(
hasAndNotNull(jsonObject, "disc_number")
? jsonObject.get("disc_number").getAsInt()
@@ -601,11 +482,6 @@ public Track createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "explicit")
? jsonObject.get("explicit").getAsBoolean()
: null)
- .setExternalIds(
- hasAndNotNull(jsonObject, "external_ids")
- ? new ExternalId.JsonUtil().createModelObject(
- jsonObject.getAsJsonObject("external_ids"))
- : null)
.setExternalUrls(
hasAndNotNull(jsonObject, "external_urls")
? new ExternalUrl.JsonUtil().createModelObject(
@@ -623,11 +499,6 @@ public Track createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "is_playable")
? jsonObject.get("is_playable").getAsBoolean()
: null)
- .setLinkedFrom(
- hasAndNotNull(jsonObject, "linked_from")
- ? new TrackLink.JsonUtil().createModelObject(
- jsonObject.get("linked_from").getAsJsonObject())
- : null)
.setRestrictions(
hasAndNotNull(jsonObject, "restrictions")
? new Restrictions.JsonUtil().createModelObject(
@@ -637,10 +508,6 @@ public Track createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "name")
? jsonObject.get("name").getAsString()
: null)
- .setPopularity(
- hasAndNotNull(jsonObject, "popularity")
- ? jsonObject.get("popularity").getAsInt()
- : null)
.setPreviewUrl(
hasAndNotNull(jsonObject, "preview_url")
? jsonObject.get("preview_url").getAsString()
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/specification/TrackSimplified.java b/src/main/java/se/michaelthelin/spotify/model_objects/specification/TrackSimplified.java
index c715cb510..5393cd865 100644
--- a/src/main/java/se/michaelthelin/spotify/model_objects/specification/TrackSimplified.java
+++ b/src/main/java/se/michaelthelin/spotify/model_objects/specification/TrackSimplified.java
@@ -1,9 +1,7 @@
package se.michaelthelin.spotify.model_objects.specification;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.Gson;
import com.google.gson.JsonObject;
-import com.neovisionaries.i18n.CountryCode;
import se.michaelthelin.spotify.enums.ModelObjectType;
import se.michaelthelin.spotify.model_objects.AbstractModelObject;
@@ -18,8 +16,6 @@
public class TrackSimplified extends AbstractModelObject {
/** The artists who performed the track. */
private final ArtistSimplified[] artists;
- /** A list of the countries in which the track can be played. */
- private final CountryCode[] availableMarkets;
/** The disc number. */
private final Integer discNumber;
/** The track length in milliseconds. */
@@ -34,8 +30,6 @@ public class TrackSimplified extends AbstractModelObject {
private final String id;
/** Whether the track is playable. */
private final Boolean isPlayable;
- /** Information about the original track. */
- private final TrackLink linkedFrom;
/** The name of the track. */
private final String name;
/** A link to a 30 second preview of the track. */
@@ -51,7 +45,6 @@ private TrackSimplified(final Builder builder) {
super(builder);
this.artists = builder.artists;
- this.availableMarkets = builder.availableMarkets;
this.discNumber = builder.discNumber;
this.durationMs = builder.durationMs;
this.explicit = builder.explicit;
@@ -59,7 +52,6 @@ private TrackSimplified(final Builder builder) {
this.href = builder.href;
this.id = builder.id;
this.isPlayable = builder.isPlayable;
- this.linkedFrom = builder.linkedFrom;
this.name = builder.name;
this.previewUrl = builder.previewUrl;
this.trackNumber = builder.trackNumber;
@@ -77,16 +69,6 @@ public ArtistSimplified[] getArtists() {
return artists;
}
- /**
- * Get the country codes of all countries, in which the track is available.
- *
- * @return A list of the countries in which the track can be played, identified by their
- * ISO 3166-1 alpha-2 code.
- */
- public CountryCode[] getAvailableMarkets() {
- return availableMarkets;
- }
-
/**
* Get the disc number of the track in its album.
*
@@ -155,17 +137,6 @@ public Boolean getIsPlayable() {
return isPlayable;
}
- /**
- * Get the track link object of the track if
- * Track Relinking was applied and the requested track has been replaced with a different track. The track in the
- * {@code linked_from} object contains information about the originally requested track.
- *
- * @return The track in the {@code linked_from} object contains information about the originally requested track.
- */
- public TrackLink getLinkedFrom() {
- return linkedFrom;
- }
-
/**
* Get the name of a track.
*
@@ -215,10 +186,9 @@ public String getUri() {
@Override
public String toString() {
- return "TrackSimplified(name=" + name + ", artists=" + Arrays.toString(artists) + ", availableMarkets="
- + Arrays.toString(availableMarkets) + ", discNumber=" + discNumber + ", durationMs=" + durationMs
+ return "TrackSimplified(name=" + name + ", artists=" + Arrays.toString(artists) + ", discNumber=" + discNumber + ", durationMs=" + durationMs
+ ", explicit=" + explicit + ", externalUrls=" + externalUrls + ", href=" + href + ", id=" + id
- + ", isPlayable=" + isPlayable + ", linkedFrom=" + linkedFrom + ", previewUrl=" + previewUrl + ", trackNumber="
+ + ", isPlayable=" + isPlayable + ", previewUrl=" + previewUrl + ", trackNumber="
+ trackNumber + ", type=" + type + ", uri=" + uri + ")";
}
@@ -232,7 +202,6 @@ public Builder builder() {
*/
public static final class Builder extends AbstractModelObject.Builder {
private ArtistSimplified[] artists;
- private CountryCode[] availableMarkets;
private Integer discNumber;
private Integer durationMs;
private Boolean explicit;
@@ -240,7 +209,6 @@ public static final class Builder extends AbstractModelObject.Builder {
private String href;
private String id;
private Boolean isPlayable;
- private TrackLink linkedFrom;
private String name;
private String previewUrl;
private Integer trackNumber;
@@ -265,18 +233,6 @@ public Builder setArtists(ArtistSimplified... artists) {
return this;
}
- /**
- * Set the available markets of the track to be built.
- *
- * @param availableMarkets A list of the countries in which the track can be played, identified by their
- * ISO 3166-1 alpha-2 code.
- * @return A {@link TrackSimplified.Builder}.
- */
- public Builder setAvailableMarkets(CountryCode... availableMarkets) {
- this.availableMarkets = availableMarkets;
- return this;
- }
-
/**
* Set the disc number of the track to be built.
*
@@ -355,18 +311,6 @@ public Builder setIsPlayable(Boolean isPlayable) {
return this;
}
- /**
- * Set the track link object of the track to be built.
- *
- * @param linkedFrom The track in the {@code linked_from} object contains information about the originally requested
- * track.
- * @return A {@link TrackSimplified.Builder}.
- */
- public Builder setLinkedFrom(TrackLink linkedFrom) {
- this.linkedFrom = linkedFrom;
- return this;
- }
-
/**
* Set the name of the track to be built.
*
@@ -452,11 +396,6 @@ public TrackSimplified createModelObject(JsonObject jsonObject) {
? new ArtistSimplified.JsonUtil().createModelObjectArray(
jsonObject.getAsJsonArray("artists"))
: null)
- .setAvailableMarkets(
- hasAndNotNull(jsonObject, "available_markets")
- ? new Gson().fromJson(jsonObject.getAsJsonArray(
- "available_markets"), CountryCode[].class)
- : null)
.setDiscNumber(
hasAndNotNull(jsonObject, "disc_number")
? jsonObject.get("disc_number").getAsInt()
@@ -486,11 +425,6 @@ public TrackSimplified createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "is_playable")
? jsonObject.get("is_playable").getAsBoolean()
: null)
- .setLinkedFrom(
- hasAndNotNull(jsonObject, "linked_from")
- ? new TrackLink.JsonUtil().createModelObject(
- jsonObject.get("linked_from").getAsJsonObject())
- : null)
.setName(
hasAndNotNull(jsonObject, "name")
? jsonObject.get("name").getAsString()
diff --git a/src/main/java/se/michaelthelin/spotify/model_objects/specification/User.java b/src/main/java/se/michaelthelin/spotify/model_objects/specification/User.java
index d502fdd3a..d09c3bc29 100644
--- a/src/main/java/se/michaelthelin/spotify/model_objects/specification/User.java
+++ b/src/main/java/se/michaelthelin/spotify/model_objects/specification/User.java
@@ -2,9 +2,7 @@
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.google.gson.JsonObject;
-import com.neovisionaries.i18n.CountryCode;
import se.michaelthelin.spotify.enums.ModelObjectType;
-import se.michaelthelin.spotify.enums.ProductType;
import se.michaelthelin.spotify.model_objects.AbstractModelObject;
import java.util.Arrays;
@@ -22,24 +20,16 @@
public class User extends AbstractModelObject {
/** The user's birthdate. */
private final String birthdate;
- /** The country of the user. */
- private final CountryCode country;
/** The name displayed on the user's profile. */
private final String displayName;
- /** The user's email address. */
- private final String email;
/** External URLs for the user. */
private final ExternalUrl externalUrls;
- /** Information about the followers of the user. */
- private final Followers followers;
/** The Spotify Web API endpoint URL for the user. */
private final String href;
/** The Spotify user ID for the user. */
private final String id;
/** The user's profile image. */
private final Image[] images;
- /** The user's Spotify subscription level. */
- private final ProductType product;
/** The object type. */
private final ModelObjectType type;
/** The Spotify URI for the user. */
@@ -49,15 +39,11 @@ private User(final Builder builder) {
super(builder);
this.birthdate = builder.birthdate;
- this.country = builder.country;
this.displayName = builder.displayName;
- this.email = builder.email;
this.externalUrls = builder.externalUrls;
- this.followers = builder.followers;
this.href = builder.href;
this.id = builder.id;
this.images = builder.images;
- this.product = builder.product;
this.type = builder.type;
this.uri = builder.uri;
}
@@ -74,18 +60,6 @@ public String getBirthdate() {
return birthdate;
}
- /**
- * Get the country code of the users set home country.
- * Note: This field is only available when the current user has granted access to the {@code user-read-private}
- * scope.
- *
- * @return An ISO 3166-1 alpha-2 country code.
- * @see Spotify: Using Scopes
- */
- public CountryCode getCountry() {
- return country;
- }
-
/**
* Get the users display name if available.
* If the display name is not available, {@code null} will be returned.
@@ -96,19 +70,6 @@ public String getDisplayName() {
return displayName;
}
- /**
- * Get the users email address.
- * Important! This email address is unverified; there is no proof that it actually belongs to the user.
- * Note: This field is only available when the current user has granted access to the {@code user-read-email}
- * scope.
- *
- * @return The user's email address, as entered by the user when creating their account.
- * @see Spotify: Using Scopes
- */
- public String getEmail() {
- return email;
- }
-
/**
* Get the external URLs of the user.
* Example: Spotify-URL.
@@ -119,16 +80,6 @@ public ExternalUrl getExternalUrls() {
return externalUrls;
}
- /**
- * Get information about the followers of the user.
- * Example: Follower count.
- *
- * @return Information about the followers of the user.
- */
- public Followers getFollowers() {
- return followers;
- }
-
/**
* Get the Spotify Web API endpoint URL of the user.
*
@@ -157,19 +108,6 @@ public Image[] getImages() {
return images;
}
- /**
- * Get the product type of the users account.
- * Product type refers to premium account, free account, etc.
- * Note: This field is only available when the current user has granted access to the {@code user-read-private}
- * scope.
- *
- * @return The user's Spotify subscription level: "premium", "free", etc.
- * @see Spotify: Using Scopes
- */
- public ProductType getProduct() {
- return product;
- }
-
/**
* Get the model object type. In this case "user".
*
@@ -191,9 +129,9 @@ public String getUri() {
@Override
public String toString() {
- return "User(birthdate=" + birthdate + ", country=" + country + ", displayName=" + displayName + ", email=" + email
- + ", externalUrls=" + externalUrls + ", followers=" + followers + ", href=" + href + ", id=" + id + ", images="
- + Arrays.toString(images) + ", product=" + product + ", type=" + type + ", uri=" + uri + ")";
+ return "User(birthdate=" + birthdate + ", displayName=" + displayName
+ + ", externalUrls=" + externalUrls + ", href=" + href + ", id=" + id + ", images="
+ + Arrays.toString(images) + ", type=" + type + ", uri=" + uri + ")";
}
@Override
@@ -206,15 +144,11 @@ public Builder builder() {
*/
public static final class Builder extends AbstractModelObject.Builder {
private String birthdate;
- private CountryCode country;
private String displayName;
- private String email;
private ExternalUrl externalUrls;
- private Followers followers;
private String href;
private String id;
private Image[] images;
- private ProductType product;
private ModelObjectType type;
private String uri;
@@ -236,17 +170,6 @@ public Builder setBirthdate(String birthdate) {
return this;
}
- /**
- * Set the home country of the user object to be built.
- *
- * @param country An ISO 3166-1 alpha-2 country code.
- * @return A {@link User.Builder}.
- */
- public Builder setCountry(CountryCode country) {
- this.country = country;
- return this;
- }
-
/**
* Set the display name of the user to be built. If the user hasn't a display name, set {@code null} instead.
*
@@ -258,17 +181,6 @@ public Builder setDisplayName(String displayName) {
return this;
}
- /**
- * Set the email address of the user to be built.
- *
- * @param email The user's email address, as entered by the user when creating their account.
- * @return A {@link User.Builder}.
- */
- public Builder setEmail(String email) {
- this.email = email;
- return this;
- }
-
/**
* Set external urls of the user to be built.
*
@@ -280,17 +192,6 @@ public Builder setExternalUrls(ExternalUrl externalUrls) {
return this;
}
- /**
- * Set the followers object of the user to be built.
- *
- * @param followers Information about the followers of the user.
- * @return A {@link User.Builder}.
- */
- public Builder setFollowers(Followers followers) {
- this.followers = followers;
- return this;
- }
-
/**
* Set href of Spotify api endpoint of the user to be built.
*
@@ -325,17 +226,6 @@ public Builder setImages(Image... images) {
return this;
}
- /**
- * Set the product type of the user to be built.
- *
- * @param product The user's Spotify subscription level: "premium", "free", etc.
- * @return A {@link User.Builder}.
- */
- public Builder setProduct(ProductType product) {
- this.product = product;
- return this;
- }
-
/**
* Set the type of the model object. In this case "user".
*
@@ -386,29 +276,15 @@ public User createModelObject(JsonObject jsonObject) {
hasAndNotNull(jsonObject, "birthdate")
? jsonObject.get("birthdate").getAsString()
: null)
- .setCountry(
- hasAndNotNull(jsonObject, "country")
- ? CountryCode.getByCode(
- jsonObject.get("country").getAsString())
- : null)
.setDisplayName(
hasAndNotNull(jsonObject, "display_name")
? jsonObject.get("display_name").getAsString()
: null)
- .setEmail(
- hasAndNotNull(jsonObject, "email")
- ? jsonObject.get("email").getAsString()
- : null)
.setExternalUrls(
hasAndNotNull(jsonObject, "external_urls")
? new ExternalUrl.JsonUtil().createModelObject(
jsonObject.getAsJsonObject("external_urls"))
: null)
- .setFollowers(
- hasAndNotNull(jsonObject, "followers")
- ? new Followers.JsonUtil().createModelObject(
- jsonObject.getAsJsonObject("followers"))
- : null)
.setHref(
hasAndNotNull(jsonObject, "href")
? jsonObject.get("href").getAsString()
@@ -422,11 +298,6 @@ public User createModelObject(JsonObject jsonObject) {
? new Image.JsonUtil().createModelObjectArray(
jsonObject.getAsJsonArray("images"))
: null)
- .setProduct(
- hasAndNotNull(jsonObject, "product")
- ? ProductType.keyOf(
- jsonObject.get("product").getAsString().toLowerCase())
- : null)
.setType(
hasAndNotNull(jsonObject, "type")
? ModelObjectType.keyOf(
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/albums/GetSeveralAlbumsRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/albums/GetSeveralAlbumsRequest.java
deleted file mode 100644
index 4047b38f3..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/albums/GetSeveralAlbumsRequest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package se.michaelthelin.spotify.requests.data.albums;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Album;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get Spotify catalog information for multiple albums identified by their Spotify IDs.
- */
-@JsonDeserialize(builder = GetSeveralAlbumsRequest.Builder.class)
-public class GetSeveralAlbumsRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetSeveralAlbumsRequest} constructor.
- *
- * @param builder A {@link GetSeveralAlbumsRequest.Builder}.
- */
- private GetSeveralAlbumsRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get multiple albums.
- *
- * @return An array containing albums.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Album[] execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Album.JsonUtil().createModelObjectArray(getJson(), "albums");
- }
-
- /**
- * Builder class for building a {@link GetSeveralAlbumsRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetSeveralAlbumsRequest.Builder} instance.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The IDs query parameter setter.
- *
- * @param ids Required. A comma-separated list of the Spotify IDs for the albums. Maximum: 20 IDs.
- * @return A {@link GetSeveralAlbumsRequest.Builder}.
- * @see Spotify URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 20);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The market query parameter setter.
- *
- * @param market Optional. An ISO 3166-1 alpha-2 country code. Provide this parameter if you want to apply Track
- * Relinking.
- * @return A {@link GetSeveralAlbumsRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- * @see Spotify: Track Relinking Guide
- */
- public Builder market(final CountryCode market) {
- assert (market != null);
- return setQueryParameter("market", market);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetSeveralAlbumsRequest}.
- */
- @Override
- public GetSeveralAlbumsRequest build() {
- setPath("/v1/albums");
- return new GetSeveralAlbumsRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsTopTracksRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsTopTracksRequest.java
deleted file mode 100644
index a819cbdb2..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsTopTracksRequest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package se.michaelthelin.spotify.requests.data.artists;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Track;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get Spotify catalog information about an artist’s top tracks by country.
- */
-@JsonDeserialize(builder = GetArtistsTopTracksRequest.Builder.class)
-public class GetArtistsTopTracksRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetArtistsTopTracksRequest} constructor.
- *
- * @param builder A {@link GetArtistsTopTracksRequest.Builder}.
- */
- private GetArtistsTopTracksRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get the top {@link Track} objects.
- *
- * @return An array of {@link Track} objects.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Track[] execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Track.JsonUtil().createModelObjectArray(getJson(), "tracks");
- }
-
- /**
- * Builder class for building a {@link GetArtistsTopTracksRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetArtistsTopTracksRequest.Builder} instance.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The artist ID setter.
- *
- * @param id The Spotify ID for the artist.
- * @return A {@link GetArtistsTopTracksRequest.Builder}.
- * @see Spotify URIs & IDs
- */
- public Builder id(final String id) {
- assert (id != null);
- assert (!id.isEmpty());
- return setPathParameter("id", id);
- }
-
- /**
- * The country code setter.
- *
- * @param country Required. The country: an ISO 3166-1 alpha-2 country code.
- * @return A {@link GetArtistsTopTracksRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- */
- public Builder country(final CountryCode country) {
- assert (country != null);
- return setQueryParameter("country", country);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetArtistsTopTracksRequest}.
- */
- @Override
- public GetArtistsTopTracksRequest build() {
- setPath("/v1/artists/{id}/top-tracks");
- return new GetArtistsTopTracksRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/artists/GetSeveralArtistsRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/artists/GetSeveralArtistsRequest.java
deleted file mode 100644
index 653574812..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/artists/GetSeveralArtistsRequest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package se.michaelthelin.spotify.requests.data.artists;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Artist;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get Spotify catalog information for several artists based on their Spotify IDs.
- */
-@JsonDeserialize(builder = GetSeveralArtistsRequest.Builder.class)
-public class GetSeveralArtistsRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetSeveralArtistsRequest} constructor.
- *
- * @param builder A {@link GetSeveralArtistsRequest.Builder}.
- */
- private GetSeveralArtistsRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get several {@link Artist} objects.
- *
- * @return An array with {@link Artist} objects.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Artist[] execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Artist.JsonUtil().createModelObjectArray(getJson(), "artists");
- }
-
- /**
- * Builder class for building a {@link GetSeveralArtistsRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetSeveralArtistsRequest.Builder} instance.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The artist IDs setter.
- *
- * @param ids Required. A comma-separated list of the Spotify IDs for the artists. Maximum: 50 IDs.
- * @return A {@link GetSeveralArtistsRequest.Builder}.
- * @see Spotify URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetSeveralArtistsRequest}.
- */
- @Override
- public GetSeveralArtistsRequest build() {
- setPath("/v1/artists");
- return new GetSeveralArtistsRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetCategoryRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetCategoryRequest.java
deleted file mode 100644
index a40f060bf..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetCategoryRequest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package se.michaelthelin.spotify.requests.data.browse;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import com.neovisionaries.i18n.LanguageCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Category;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get a single category used to tag items in Spotify (on, for example, the Spotify player’s "Browse" tab).
- */
-@JsonDeserialize(builder = GetCategoryRequest.Builder.class)
-public class GetCategoryRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetCategoryRequest} constructor.
- *
- * @param builder A {@link GetCategoryRequest.Builder}.
- */
- private GetCategoryRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get a {@link Category}.
- *
- * @return A {@link Category}.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Category execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Category.JsonUtil().createModelObject(getJson());
- }
-
- /**
- * Builder class for building a {@link GetCategoryRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetCategoryRequest.Builder} instance.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The category ID setter.
- *
- * @param category_id The Spotify category ID for the category.
- * @return A {@link GetCategoryRequest.Builder}.
- * @see Spotify URIs & IDs
- */
- public Builder category_id(final String category_id) {
- assert (category_id != null);
- assert (category_id.matches("^[a-z]+$"));
- return setPathParameter("category_id", category_id);
- }
-
- /**
- * The country code setter.
- *
- * @param country Optional. A country: an ISO 3166-1 alpha-2 country code. Provide this parameter if you want to
- * narrow the list of returned categories to those relevant to a particular country. If omitted, the
- * returned items will be globally relevant.
- * @return A {@link GetCategoryRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- */
- public Builder country(final CountryCode country) {
- assert (country != null);
- return setQueryParameter("country", country);
- }
-
- /**
- * The language code setter.
- *
- * @param locale Optional. The desired language, consisting of an ISO 639 language code and an ISO 3166-1 alpha-2
- * country code, joined by an underscore. For example: es_MX, meaning "Spanish (Mexico)". Provide this
- * parameter if you want the category metadata returned in a particular language. Note that, if locale
- * is not supplied, or if the specified language is not available, all strings will be returned in the
- * Spotify default language (American English). The locale parameter, combined with the country
- * parameter, may give odd results if not carefully matched. For example
- * {@code country=SE&locale=de_DE} will return a list of categories relevant to Sweden but as German
- * language strings.
- * @return A {@link GetCategoryRequest.Builder}
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- * @see Wikipedia: ISO 639 language code
- */
- public Builder locale(final String locale) {
- assert (locale != null);
- assert (locale.contains("_"));
- String[] localeParts = locale.split("_");
- assert (localeParts.length == 2);
- assert (LanguageCode.getByCode(localeParts[0]) != null);
- assert (CountryCode.getByCode(localeParts[1]) != null);
- return setQueryParameter("locale", locale);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetCategoryRequest}.
- */
- @Override
- public GetCategoryRequest build() {
- setPath("/v1/browse/categories/{category_id}");
- return new GetCategoryRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetListOfCategoriesRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetListOfCategoriesRequest.java
deleted file mode 100644
index 64a89e9d5..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetListOfCategoriesRequest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package se.michaelthelin.spotify.requests.data.browse;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import com.neovisionaries.i18n.LanguageCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Category;
-import se.michaelthelin.spotify.model_objects.specification.Paging;
-import se.michaelthelin.spotify.requests.data.AbstractDataPagingRequest;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get a list of categories used to tag items in Spotify (on, for example, the Spotify player’s "Browse" tab).
- */
-@JsonDeserialize(builder = GetListOfCategoriesRequest.Builder.class)
-public class GetListOfCategoriesRequest extends AbstractDataRequest> {
-
- /**
- * The private {@link GetListOfCategoriesRequest} constructor.
- *
- * @param builder A {@link GetListOfCategoriesRequest.Builder}.
- */
- private GetListOfCategoriesRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get a paging of {@link Category} objects.
- *
- * @return A {@link Category} paging.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Paging execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Category.JsonUtil().createModelObjectPaging(getJson(), "categories");
- }
-
- /**
- * Builder class for building a {@link GetListOfCategoriesRequest}.
- */
- public static final class Builder extends AbstractDataPagingRequest.Builder {
-
- /**
- * Create a new {@link GetListOfCategoriesRequest.Builder} instance.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The country code setter.
- *
- * @param country Optional. A country: an ISO 3166-1 alpha-2 country code. Provide this parameter if you want to
- * narrow the list of returned categories to those relevant to a particular country. If omitted, the
- * returned items will be globally relevant.
- * @return A {@link GetListOfCategoriesRequest.Builder}
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- */
- public Builder country(final CountryCode country) {
- assert (country != null);
- return setQueryParameter("country", country);
- }
-
- /**
- * The language code setter.
- *
- * @param locale Optional. The desired language, consisting of an ISO 639 language code and an ISO 3166-1 alpha-2
- * country code, joined by an underscore. For example: es_MX, meaning "Spanish (Mexico)". Provide this
- * parameter if you want the category metadata returned in a particular language. Note that, if locale
- * is not supplied, or if the specified language is not available, all strings will be returned in the
- * Spotify default language (American English). The locale parameter, combined with the country
- * parameter, may give odd results if not carefully matched. For example
- * {@code country=SE&locale=de_DE} will return a list of categories relevant to Sweden but as German
- * language strings.
- * @return A {@link GetListOfCategoriesRequest.Builder}
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- * @see Wikipedia: ISO 639 language code
- */
- public Builder locale(final String locale) {
- assert (locale != null);
- assert (locale.contains("_"));
- String[] localeParts = locale.split("_");
- assert (localeParts.length == 2);
- assert (LanguageCode.getByCode(localeParts[0]) != null);
- assert (CountryCode.getByCode(localeParts[1]) != null);
- return setQueryParameter("locale", locale);
- }
-
- /**
- * The limit setter.
- *
- * @param limit Optional. The maximum number of categories to return. Default: 20. Minimum: 1. Maximum: 50.
- * @return A {@link GetListOfCategoriesRequest.Builder}.
- */
- @Override
- public Builder limit(Integer limit) {
- assert (1 <= limit && limit <= 50);
- return setQueryParameter("limit", limit);
- }
-
- /**
- * The offset setter.
- *
- * @param offset Optional. The index of the first item to return. Default: 0 (the first object). Use with
- * {@link #limit(Integer)} to get the next set of categories.
- * @return A {@link GetListOfCategoriesRequest.Builder}.
- */
- @Override
- public Builder offset(Integer offset) {
- assert (offset >= 0);
- return setQueryParameter("offset", offset);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetListOfCategoriesRequest}.
- */
- @Override
- public GetListOfCategoriesRequest build() {
- setPath("/v1/browse/categories");
- return new GetListOfCategoriesRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetListOfNewReleasesRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetListOfNewReleasesRequest.java
deleted file mode 100644
index f32094517..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/browse/GetListOfNewReleasesRequest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package se.michaelthelin.spotify.requests.data.browse;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.AlbumSimplified;
-import se.michaelthelin.spotify.model_objects.specification.Paging;
-import se.michaelthelin.spotify.requests.data.AbstractDataPagingRequest;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get a list of new album releases featured in Spotify (shown, for example, on a Spotify player’s "Browse" tab).
- */
-@JsonDeserialize(builder = GetListOfNewReleasesRequest.Builder.class)
-public class GetListOfNewReleasesRequest extends AbstractDataRequest> {
-
- /**
- * The private {@link GetListOfNewReleasesRequest} constructor.
- *
- * @param builder A {@link GetListOfNewReleasesRequest.Builder}.
- */
- private GetListOfNewReleasesRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get a paging of new {@link AlbumSimplified} releases.
- *
- * @return An {@link AlbumSimplified} paging.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Paging execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new AlbumSimplified.JsonUtil().createModelObjectPaging(getJson(), "albums");
- }
-
- /**
- * Builder class for building a {@link GetListOfNewReleasesRequest}.
- */
- public static final class Builder extends AbstractDataPagingRequest.Builder {
-
- /**
- * Create a new {@link GetListOfNewReleasesRequest.Builder} instance.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The country code setter.
- *
- * @param country Optional. A country: an ISO 3166-1 alpha-2 country code. Provide this parameter if you want the
- * list of returned items to be relevant to a particular country. If omitted, the returned items will
- * be relevant to all countries.
- * @return A {@link GetListOfNewReleasesRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- */
- public Builder country(final CountryCode country) {
- assert (country != null);
- return setQueryParameter("country", country);
- }
-
- /**
- * The limit setter.
- *
- * @param limit Optional. The maximum number of items to return. Default: 20. Minimum: 1. Maximum: 50.
- * @return A {@link GetListOfNewReleasesRequest.Builder}.
- */
- @Override
- public Builder limit(final Integer limit) {
- assert (1 <= limit && limit <= 50);
- return setQueryParameter("limit", limit);
- }
-
- /**
- * The offset setter.
- *
- * @param offset Optional. The index of the first item to return. Default: 0 (the first object). Use with
- * {@link #limit(Integer)} to get the next set of items.
- * @return A {@link GetListOfNewReleasesRequest.Builder}.
- */
- @Override
- public Builder offset(final Integer offset) {
- assert (offset >= 0);
- return setQueryParameter("offset", offset);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetListOfNewReleasesRequest}.
- */
- @Override
- public GetListOfNewReleasesRequest build() {
- setPath("/v1/browse/new-releases");
- return new GetListOfNewReleasesRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/episodes/GetSeveralEpisodesRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/episodes/GetSeveralEpisodesRequest.java
deleted file mode 100644
index 3d6d41d40..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/episodes/GetSeveralEpisodesRequest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package se.michaelthelin.spotify.requests.data.episodes;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Episode;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get Spotify catalog information for multiple episodes based on their Spotify IDs.
- */
-@JsonDeserialize(builder = GetSeveralEpisodesRequest.Builder.class)
-public class GetSeveralEpisodesRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetSeveralEpisodesRequest} constructor.
- *
- * @param builder A {@link GetSeveralEpisodesRequest.Builder}.
- */
- private GetSeveralEpisodesRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get several episodes.
- *
- * @return Multiple {@link Episode} objects.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- @Override
- public Episode[] execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Episode.JsonUtil().createModelObjectArray(getJson(), "episodes");
- }
-
- /**
- * Builder class for building a {@link GetSeveralEpisodesRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetSeveralEpisodesRequest.Builder}.
- *
- * Reading the user’s resume points on episode objects requires the {@code user-read-playback-position} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The episode IDs setter.
- *
- * @param ids Required. A comma-separated list of the Spotify IDs for the episodes. Maximum: 50 IDs.
- * @return A {@link GetSeveralEpisodesRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The market country code setter.
- * If a country code is specified, only shows and episodes that are available in that market will be returned.
- * If a valid user access token is specified in the request header, the country associated with the user account will take priority over this parameter.
- * Note: If neither market or user country are provided, the content is considered unavailable for the client.
- * Users can view the country that is associated with their account in the account settings.
- *
- * @param market Optional. An ISO 3166-1 alpha-2 country code.
- * @return A {@link GetSeveralEpisodesRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- */
- public Builder market(final CountryCode market) {
- assert (market != null);
- return setQueryParameter("market", market);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetSeveralEpisodesRequest}.
- */
- @Override
- public GetSeveralEpisodesRequest build() {
- setPath("/v1/episodes");
- return new GetSeveralEpisodesRequest(this);
- }
-
- @Override
- protected GetSeveralEpisodesRequest.Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveAlbumsForCurrentUserRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveAlbumsForCurrentUserRequest.java
deleted file mode 100644
index a07e32152..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveAlbumsForCurrentUserRequest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.JsonArray;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Remove one or more albums from the current user’s "Your Music" library.
- */
-@JsonDeserialize(builder = RemoveAlbumsForCurrentUserRequest.Builder.class)
-public class RemoveAlbumsForCurrentUserRequest extends AbstractDataRequest {
-
- /**
- * The private {@link RemoveAlbumsForCurrentUserRequest} constructor.
- *
- * @param builder A {@link RemoveAlbumsForCurrentUserRequest.Builder}.
- */
- private RemoveAlbumsForCurrentUserRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Remove one or more albums from the current user’s ‘Your Music’ library.
- *
- * @return A string. Note: This endpoint doesn't return something in its response body.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public String execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return deleteJson();
- }
-
- /**
- * Builder class for building a {@link RemoveAlbumsForCurrentUserRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link RemoveAlbumsForCurrentUserRequest.Builder} instance.
- *
- * Modification of the current user's "Your Music" collection requires authorization of the
- * {@code user-library-modify} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The album IDs setter.
- *
- * @param ids Optional. A comma-separated list of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link RemoveAlbumsForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The album IDs setter.
- *
- * Note: If the ids have already been set with {@link #ids(String)}, any ids added here will be ignored.
- * @param ids Optional. A JSON array of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link RemoveAlbumsForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link RemoveAlbumsForCurrentUserRequest.Builder}.
- */
- @Override
- public RemoveAlbumsForCurrentUserRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/albums");
- return new RemoveAlbumsForCurrentUserRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveTracksForUserRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveFromLibraryRequest.java
similarity index 50%
rename from src/main/java/se/michaelthelin/spotify/requests/data/library/SaveTracksForUserRequest.java
rename to src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveFromLibraryRequest.java
index 5bd446162..1116a95de 100644
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveTracksForUserRequest.java
+++ b/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveFromLibraryRequest.java
@@ -10,43 +10,44 @@
import java.io.IOException;
/**
- * Save one or more tracks to the current user’s "Your Music" library.
+ * Remove a list of Spotify URIs from the user's library.
*/
-@JsonDeserialize(builder = SaveTracksForUserRequest.Builder.class)
-public class SaveTracksForUserRequest extends AbstractDataRequest {
+@JsonDeserialize(builder = RemoveFromLibraryRequest.Builder.class)
+public class RemoveFromLibraryRequest extends AbstractDataRequest {
/**
- * The private {@link SaveTracksForUserRequest} constructor.
+ * The private {@link RemoveFromLibraryRequest} constructor.
*
- * @param builder A {@link SaveTracksForUserRequest.Builder}.
+ * @param builder A {@link RemoveFromLibraryRequest.Builder}.
*/
- private SaveTracksForUserRequest(final Builder builder) {
+ private RemoveFromLibraryRequest(final Builder builder) {
super(builder);
}
/**
- * Save one or more tracks.
+ * Remove items from the user's library.
*
* @return A string. Note: This endpoint doesn't return something in its response body.
* @throws IOException In case of networking issues.
* @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
*/
+ @Override
public String execute() throws
IOException,
SpotifyWebApiException,
ParseException {
- return putJson();
+ return deleteJson();
}
/**
- * Builder class for building a {@link SaveTracksForUserRequest}.
+ * Builder class for building a {@link RemoveFromLibraryRequest}.
*/
public static final class Builder extends AbstractDataRequest.Builder {
/**
- * Create a new {@link SaveTracksForUserRequest.Builder} instance.
+ * Create a new {@link RemoveFromLibraryRequest.Builder} instance.
*
- * Modification of the current user's "Your Music" collection requires authorization of the
+ * Modification of the current user's library requires authorization of the
* {@code user-library-modify} scope.
*
* @param accessToken Required. A valid access token from the Spotify Accounts service.
@@ -57,42 +58,29 @@ public Builder(final String accessToken) {
}
/**
- * The track IDs setter.
+ * The URIs setter.
*
- * @param ids Optional. A comma-separated list of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link SaveTracksForUserRequest.Builder}.
+ * @param uris Required. A JSON array of Spotify URIs to remove. Maximum: 50 URIs.
+ * @return A {@link RemoveFromLibraryRequest.Builder}.
* @see Spotify: URIs & IDs
*/
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The track IDs setter.
- *
- * @param ids Optional. A json array consisting of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link SaveTracksForUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
+ public Builder uris(final JsonArray uris) {
+ assert (uris != null);
+ assert (!uris.isJsonNull());
+ assert (uris.size() <= 50);
+ return setBodyParameter("uris", uris);
}
/**
* The request build method.
*
- * @return A custom {@link SaveTracksForUserRequest}.
+ * @return A custom {@link RemoveFromLibraryRequest}.
*/
@Override
- public SaveTracksForUserRequest build() {
+ public RemoveFromLibraryRequest build() {
setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/tracks");
- return new SaveTracksForUserRequest(this);
+ setPath("/v1/me/library");
+ return new RemoveFromLibraryRequest(this);
}
@Override
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedEpisodesRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedEpisodesRequest.java
deleted file mode 100644
index 2f2f70967..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedEpisodesRequest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.JsonArray;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Remove one or more episodes from the current user's library.
- */
-@JsonDeserialize(builder = RemoveUsersSavedEpisodesRequest.Builder.class)
-public class RemoveUsersSavedEpisodesRequest extends AbstractDataRequest {
-
- /**
- * The private {@link RemoveUsersSavedEpisodesRequest} constructor.
- *
- * @param builder A {@link RemoveUsersSavedEpisodesRequest.Builder}.
- */
- private RemoveUsersSavedEpisodesRequest(final RemoveUsersSavedEpisodesRequest.Builder builder) {
- super(builder);
- }
-
- /**
- * Remove one or more episodes from current Spotify user’s library.
- *
- * @return A string. Note: This endpoint doesn't return something in its response body.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- @Override
- public String execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return deleteJson();
- }
-
- /**
- * Builder class for building a {@link RemoveUsersSavedEpisodesRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link RemoveUsersSavedEpisodesRequest.Builder} instance.
- *
- * Modification of the current user's "Your Music" collection requires authorization of the
- * {@code user-library-modify} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The episode IDs setter.
- *
- * @param ids Optional. A comma-separated list of Spotify IDs for the episodes to be deleted from the user’s library. Maximum: 50 IDs.
- * @return A {@link RemoveUsersSavedEpisodesRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public RemoveUsersSavedEpisodesRequest.Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The episode IDs setter.
- *
- * Note: If the ids have already been set with {@link #ids(String)}, any ids added here will be ignored.
- *
- * @param ids Optional. A JSON array of Spotify IDs for the episodes to be deleted from the user’s library. Maximum: 50 IDs.
- * @return A {@link RemoveUsersSavedEpisodesRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public RemoveUsersSavedEpisodesRequest.Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link RemoveUsersSavedEpisodesRequest}.
- */
- @Override
- public RemoveUsersSavedEpisodesRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/episodes");
- return new RemoveUsersSavedEpisodesRequest(this);
- }
-
- @Override
- protected RemoveUsersSavedEpisodesRequest.Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedShowsRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedShowsRequest.java
deleted file mode 100644
index 305271bdd..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedShowsRequest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.JsonArray;
-import com.neovisionaries.i18n.CountryCode;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Delete one or more shows from current Spotify user’s library.
- */
-@JsonDeserialize(builder = RemoveUsersSavedShowsRequest.Builder.class)
-public class RemoveUsersSavedShowsRequest extends AbstractDataRequest {
-
- /**
- * The private {@link RemoveUsersSavedShowsRequest} constructor.
- *
- * @param builder A {@link RemoveUsersSavedShowsRequest.Builder}.
- */
- private RemoveUsersSavedShowsRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Delete one or more shows from current Spotify user’s library.
- *
- * @return A string. Note: This endpoint doesn't return something in its response body.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- @Override
- public String execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return deleteJson();
- }
-
- /**
- * Builder class for building a {@link RemoveUsersSavedShowsRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link RemoveUsersSavedShowsRequest.Builder} instance.
- *
- * Modification of the current user's "Your Music" collection requires authorization of the
- * {@code user-library-modify} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The show IDs setter.
- *
- * @param ids Optional. A comma-separated list of Spotify IDs for the shows to be deleted from the user’s library. Maximum: 50 IDs.
- * @return A {@link RemoveUsersSavedShowsRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The market country code setter.
- * If a country code is specified, only shows that are available in that market will be removed.
- * If a valid user access token is specified in the request header, the country associated with the user account will take priority over this parameter.
- * Note: If neither market or user country are provided, the content is considered unavailable for the client.
- * Users can view the country that is associated with their account in the account settings.
- *
- * @param market Optional. An ISO 3166-1 alpha-2 country code.
- * @return A {@link RemoveUsersSavedShowsRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- */
- public Builder market(final CountryCode market) {
- assert (market != null);
- return setQueryParameter("market", market);
- }
-
- /**
- * The show IDs setter.
- *
- * Note: If the ids have already been set with {@link #ids(String)}, any ids added here will be ignored.
- * @param ids Optional. A JSON array of Spotify IDs for the shows to be deleted from the user’s library. Maximum: 50 IDs.
- * @return A {@link RemoveUsersSavedShowsRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link RemoveUsersSavedShowsRequest}.
- */
- @Override
- public RemoveUsersSavedShowsRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/shows");
- return new RemoveUsersSavedShowsRequest(this);
- }
-
- @Override
- protected RemoveUsersSavedShowsRequest.Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedTracksRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedTracksRequest.java
deleted file mode 100644
index 1d7dc8aba..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedTracksRequest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.JsonArray;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Remove one or more tracks from the current user’s "Your Music" library.
- */
-@JsonDeserialize(builder = RemoveUsersSavedTracksRequest.Builder.class)
-public class RemoveUsersSavedTracksRequest extends AbstractDataRequest {
-
- /**
- * The private {@link RemoveUsersSavedTracksRequest} constructor.
- *
- * @param builder A {@link RemoveUsersSavedTracksRequest.Builder}.
- */
- private RemoveUsersSavedTracksRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Remove one or more tracks from the current user’s ‘Your Music’ library.
- *
- * @return A string. Note: This endpoint doesn't return something in its response body.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public String execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return deleteJson();
- }
-
- /**
- * Builder class for building a {@link RemoveUsersSavedTracksRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link RemoveUsersSavedTracksRequest.Builder} instance.
- *
- * Modification of the current user's "Your Music" collection requires authorization of the
- * {@code user-library-modify} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The track IDs setter.
- *
- * @param ids Optional. A comma-separated list of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link RemoveUsersSavedTracksRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The track IDs setter.
- *
- * Note: If the ids have already been set with {@link #ids(String)}, any ids added here will be ignored.
- * @param ids Optional. A JSON array of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link RemoveUsersSavedTracksRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link RemoveUsersSavedTracksRequest}.
- */
- @Override
- public RemoveUsersSavedTracksRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/tracks");
- return new RemoveUsersSavedTracksRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveAlbumsForCurrentUserRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveAlbumsForCurrentUserRequest.java
deleted file mode 100644
index 224497c21..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveAlbumsForCurrentUserRequest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.JsonArray;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Save one or more albums to the current user’s "Your Music" library.
- */
-@JsonDeserialize(builder = SaveAlbumsForCurrentUserRequest.Builder.class)
-public class SaveAlbumsForCurrentUserRequest extends AbstractDataRequest {
-
- /**
- * The private {@link SaveAlbumsForCurrentUserRequest} constructor.
- *
- * @param builder A {@link SaveAlbumsForCurrentUserRequest.Builder}.
- */
- private SaveAlbumsForCurrentUserRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Save an album to the "Your Music" library.
- *
- * @return A string. Note: This endpoint doesn't return something in its response body.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public String execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return putJson();
- }
-
- /**
- * Builder class for building a {@link SaveAlbumsForCurrentUserRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link SaveAlbumsForCurrentUserRequest.Builder} instance.
- *
- * Modification of the current user's "Your Music" collection requires authorization of the
- * {@code user-library-modify} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The album IDs setter.
- *
- * @param ids Optional. A comma-separated list of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link SaveAlbumsForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The album IDs setter.
- *
- * @param ids Optional. A json array consisting of the Spotify IDs. Maximum: 50 IDs.
- * @return A {@link SaveAlbumsForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link SaveAlbumsForCurrentUserRequest}.
- */
- @Override
- public SaveAlbumsForCurrentUserRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/albums");
- return new SaveAlbumsForCurrentUserRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveEpisodesForCurrentUserRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveEpisodesForCurrentUserRequest.java
deleted file mode 100644
index e96c10e40..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveEpisodesForCurrentUserRequest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.JsonArray;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Save one or more episodes to the current user's library.
- */
-@JsonDeserialize(builder = SaveEpisodesForCurrentUserRequest.Builder.class)
-public class SaveEpisodesForCurrentUserRequest extends AbstractDataRequest {
-
- /**
- * The private {@link SaveEpisodesForCurrentUserRequest} constructor.
- *
- * @param builder A {@link SaveEpisodesForCurrentUserRequest.Builder}.
- */
- private SaveEpisodesForCurrentUserRequest(final SaveEpisodesForCurrentUserRequest.Builder builder) {
- super(builder);
- }
-
- /**
- * Save one or more episodes.
- *
- * @return A string. Note: This endpoint doesn't return something in its response body.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- @Override
- public String execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return putJson();
- }
-
- /**
- * Builder class for building a {@link SaveEpisodesForCurrentUserRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link SaveEpisodesForCurrentUserRequest.Builder} instance.
- *
- * Modification of the current user's "Your Music" collection requires authorization of the
- * {@code user-library-modify} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Scopes
- */
- public Builder(String accessToken) {
- super(accessToken);
- }
-
- /**
- * The episode IDs setter.
- *
- * @param ids Optional. A comma-separated list of Spotify IDs for the episodes to be added to the user’s library.
- * @return A {@link SaveEpisodesForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public SaveEpisodesForCurrentUserRequest.Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The episode IDs setter.
- *
- * Note: If the ids have already been set with {@link #ids(String)}, any ids added here will be ignored.
- *
- * @param ids Optional. A JSON array of Spotify IDs for the episodes to be added to the user’s library.
- * @return A {@link SaveEpisodesForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public SaveEpisodesForCurrentUserRequest.Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link SaveEpisodesForCurrentUserRequest}.
- */
- @Override
- public SaveEpisodesForCurrentUserRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/episodes");
- return new SaveEpisodesForCurrentUserRequest(this);
- }
-
- @Override
- protected SaveEpisodesForCurrentUserRequest.Builder self() {
- return this;
- }
- }
-
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveShowsForCurrentUserRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveShowsForCurrentUserRequest.java
deleted file mode 100644
index 795436b25..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveShowsForCurrentUserRequest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.gson.JsonArray;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Save one or more shows to current Spotify user’s library.
- */
-@JsonDeserialize(builder = SaveShowsForCurrentUserRequest.Builder.class)
-public class SaveShowsForCurrentUserRequest extends AbstractDataRequest {
-
- /**
- * The private {@link SaveShowsForCurrentUserRequest} constructor.
- *
- * @param builder A {@link SaveShowsForCurrentUserRequest.Builder}.
- */
- private SaveShowsForCurrentUserRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Save one or more shows.
- *
- * @return A string. Note: This endpoint doesn't return something in its response body.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- @Override
- public String execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return putJson();
- }
-
- /**
- * Builder class for building a {@link SaveShowsForCurrentUserRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link SaveShowsForCurrentUserRequest.Builder} instance.
- *
- * Modification of the current user's "Your Music" collection requires authorization of the
- * {@code user-library-modify} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(String accessToken) {
- super(accessToken);
- }
-
- /**
- * The show IDs setter.
- *
- * @param ids Optional. A comma-separated list of Spotify IDs for the shows to be added to the user’s library.
- * @return A {@link SaveShowsForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The show IDs setter.
- *
- * Note: If the ids have already been set with {@link #ids(String)}, any ids added here will be ignored.
- * @param ids Optional. A JSON array of Spotify IDs for the shows to be added to the user’s library.
- * @return A {@link SaveShowsForCurrentUserRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final JsonArray ids) {
- assert (ids != null);
- assert (!ids.isJsonNull());
- assert (ids.size() <= 50);
- return setBodyParameter("ids", ids);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link SaveShowsForCurrentUserRequest}.
- */
- @Override
- public SaveShowsForCurrentUserRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/me/shows");
- return new SaveShowsForCurrentUserRequest(this);
- }
-
- @Override
- protected SaveShowsForCurrentUserRequest.Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveToLibraryRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveToLibraryRequest.java
new file mode 100644
index 000000000..264a4f722
--- /dev/null
+++ b/src/main/java/se/michaelthelin/spotify/requests/data/library/SaveToLibraryRequest.java
@@ -0,0 +1,91 @@
+package se.michaelthelin.spotify.requests.data.library;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.google.gson.JsonArray;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.ParseException;
+import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
+import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
+
+import java.io.IOException;
+
+/**
+ * Save a list of Spotify URIs to the user's library.
+ */
+@JsonDeserialize(builder = SaveToLibraryRequest.Builder.class)
+public class SaveToLibraryRequest extends AbstractDataRequest {
+
+ /**
+ * The private {@link SaveToLibraryRequest} constructor.
+ *
+ * @param builder A {@link SaveToLibraryRequest.Builder}.
+ */
+ private SaveToLibraryRequest(final Builder builder) {
+ super(builder);
+ }
+
+ /**
+ * Save items to the user's library.
+ *
+ * @return A string. Note: This endpoint doesn't return something in its response body.
+ * @throws IOException In case of networking issues.
+ * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
+ */
+ @Override
+ public String execute() throws
+ IOException,
+ SpotifyWebApiException,
+ ParseException {
+ return putJson();
+ }
+
+ /**
+ * Builder class for building a {@link SaveToLibraryRequest}.
+ */
+ public static final class Builder extends AbstractDataRequest.Builder {
+
+ /**
+ * Create a new {@link SaveToLibraryRequest.Builder} instance.
+ *
+ * Modification of the current user's library requires authorization of the
+ * {@code user-library-modify} scope.
+ *
+ * @param accessToken Required. A valid access token from the Spotify Accounts service.
+ * @see Spotify: Using Scopes
+ */
+ public Builder(final String accessToken) {
+ super(accessToken);
+ }
+
+ /**
+ * The URIs setter.
+ *
+ * @param uris Required. A JSON array of Spotify URIs to save. Maximum: 50 URIs.
+ * @return A {@link SaveToLibraryRequest.Builder}.
+ * @see Spotify: URIs & IDs
+ */
+ public Builder uris(final JsonArray uris) {
+ assert (uris != null);
+ assert (!uris.isJsonNull());
+ assert (uris.size() <= 50);
+ return setBodyParameter("uris", uris);
+ }
+
+ /**
+ * The request build method.
+ *
+ * @return A custom {@link SaveToLibraryRequest}.
+ */
+ @Override
+ public SaveToLibraryRequest build() {
+ setContentType(ContentType.APPLICATION_JSON);
+ setPath("/v1/me/library");
+ return new SaveToLibraryRequest(this);
+ }
+
+ @Override
+ protected Builder self() {
+ return this;
+ }
+ }
+}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequest.java
deleted file mode 100644
index ebc4f4170..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package se.michaelthelin.spotify.requests.data.playlists;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Playlist;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Create a playlist for a Spotify user. (The playlist will be empty until you add tracks
- * with an {@link AddItemsToPlaylistRequest}.)
- */
-@JsonDeserialize(builder = CreatePlaylistRequest.Builder.class)
-public class CreatePlaylistRequest extends AbstractDataRequest {
-
- /**
- * The private {@link CreatePlaylistRequest} constructor.
- *
- * @param builder A {@link CreatePlaylistRequest.Builder}.
- */
- private CreatePlaylistRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Create a new playlist.
- *
- * @return The newly created {@link Playlist}.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Playlist execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Playlist.JsonUtil().createModelObject(postJson());
- }
-
- /**
- * Builder class for building a {@link CreatePlaylistRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link CreatePlaylistRequest.Builder}.
- *
- * Creating a public playlists requires authorization of the {@code playlist-modify-public}
- * scope; Creating a private playlist requires the {@code playlist-modify-private} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The user ID setter.
- *
- * @param user_id The user's Spotify user ID.
- * @return A {@link CreatePlaylistRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder user_id(final String user_id) {
- assert (user_id != null);
- assert (!user_id.isEmpty());
- return setPathParameter("user_id", user_id);
- }
-
- /**
- * The playlist name setter.
- *
- * @param name Optional. The name for the playlist. This name does not need
- * to be unique; a user may have several playlists with the same name.
- * @return A {@link CreatePlaylistRequest.Builder}.
- */
- public Builder name(final String name) {
- assert (name != null);
- assert (!name.isEmpty());
- return setBodyParameter("name", name);
- }
-
- /**
- * The public status setter.
- *
- * Note: To be able to create private playlists, the user must have
- * granted the {@code playlist-modify-private} scope.
- *
- * @param public_ Optional. If {@code true} the playlist will be public, if {@code false} it will be private.
- * @return A {@link CreatePlaylistRequest.Builder}.
- */
- public Builder public_(final Boolean public_) {
- return setBodyParameter("public", public_);
- }
-
- /**
- * The collaborative state setter.
- *
- * @param collaborative Optional, default {@code false}. If {@code true} the playlist will be collaborative.
- * Note: To create a collaborative playlist you must also set {@link #public_(Boolean)}
- * to {@code false}. To create collaborative playlists you must have granted
- * {@code playlist-modify-private} and {@code playlist-modify-public} scopes.
- * @return A {@link CreatePlaylistRequest.Builder}.
- */
- public Builder collaborative(final Boolean collaborative) {
- return setBodyParameter("collaborative", collaborative);
- }
-
- /**
- * The playlist description setter.
- *
- * @param description Optional, value for playlist description as displayed in Spotify Clients and in the Web API.
- * @return A {@link CreatePlaylistRequest.Builder}.
- */
- public Builder description(final String description) {
- assert (description != null);
- assert (!description.isEmpty());
- return setBodyParameter("description", description);
- }
-
- /**
- * the request build method.
- *
- * @return A custom {@link CreatePlaylistRequest}.
- */
- @Override
- public CreatePlaylistRequest build() {
- setContentType(ContentType.APPLICATION_JSON);
- setPath("/v1/users/{user_id}/playlists");
- return new CreatePlaylistRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/playlists/GetListOfUsersPlaylistsRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/playlists/GetListOfUsersPlaylistsRequest.java
deleted file mode 100644
index d06cdb92d..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/playlists/GetListOfUsersPlaylistsRequest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package se.michaelthelin.spotify.requests.data.playlists;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Paging;
-import se.michaelthelin.spotify.model_objects.specification.PlaylistSimplified;
-import se.michaelthelin.spotify.requests.data.AbstractDataPagingRequest;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get a list of the playlists owned or followed by a Spotify user.
- */
-@JsonDeserialize(builder = GetListOfUsersPlaylistsRequest.Builder.class)
-public class GetListOfUsersPlaylistsRequest extends AbstractDataRequest> {
-
- /**
- * The private {@link GetListOfUsersPlaylistsRequest} constructor.
- *
- * @param builder A {@link GetListOfUsersPlaylistsRequest.Builder}.
- */
- private GetListOfUsersPlaylistsRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get an user's playlists.
- *
- * @return A {@link PlaylistSimplified} paging.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Paging execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new PlaylistSimplified.JsonUtil().createModelObjectPaging(getJson());
- }
-
- /**
- * Builder class for building a {@link GetListOfUsersPlaylistsRequest}.
- */
- public static final class Builder extends AbstractDataPagingRequest.Builder {
-
- /**
- * Create a new {@link GetListOfUsersPlaylistsRequest.Builder}.
- *
- * Private playlists are only retrievable for the current user and requires the {@code playlist-read-private}
- * scope to have been authorized by the user. Note: This scope alone will not return collaborative playlists,
- * even though they are always private.
- *
- * Collaborative playlists are only retrievable for the current user and requires the
- * {@code playlist-read-collaborative} scope to have been authorized by the user.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- * @see Spotify: Using Scopes
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The user ID setter.
- *
- * @param user_id The user's Spotify user ID.
- * @return A {@link GetListOfUsersPlaylistsRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder user_id(final String user_id) {
- assert (user_id != null);
- assert (!user_id.isEmpty());
- return setPathParameter("user_id", user_id);
- }
-
- /**
- * The limit setter.
- *
- * @param limit Optional. The maximum number of playlists to return. Default: 20. Minimum: 1. Maximum: 50.
- * @return A {@link GetListOfUsersPlaylistsRequest.Builder}.
- */
- @Override
- public Builder limit(final Integer limit) {
- assert (1 <= limit && limit <= 50);
- return setQueryParameter("limit", limit);
- }
-
- /**
- * The offset setter.
- *
- * @param offset Optional. The index of the first playlist to return. Default: 0 (the first object). Maximum offset:
- * 100.000. Use with {@link #limit(Integer)} to get the next set of playlists.
- * @return A {@link GetListOfUsersPlaylistsRequest.Builder}.
- */
- @Override
- public Builder offset(final Integer offset) {
- assert (0 <= offset && offset <= 100000);
- return setQueryParameter("offset", offset);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetListOfUsersPlaylistsRequest}.
- */
- @Override
- public GetListOfUsersPlaylistsRequest build() {
- setPath("/v1/users/{user_id}/playlists");
- return new GetListOfUsersPlaylistsRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/shows/GetSeveralShowsRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/shows/GetSeveralShowsRequest.java
deleted file mode 100644
index d2355125c..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/shows/GetSeveralShowsRequest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package se.michaelthelin.spotify.requests.data.shows;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.ShowSimplified;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get Spotify catalog information for multiple shows based on their Spotify IDs.
- */
-@JsonDeserialize(builder = GetSeveralShowsRequest.Builder.class)
-public class GetSeveralShowsRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetSeveralShowsRequest} constructor.
- *
- * @param builder A {@link GetSeveralShowsRequest.Builder}.
- */
- private GetSeveralShowsRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get several shows.
- *
- * @return Multiple {@link ShowSimplified} objects.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- @Override
- public ShowSimplified[] execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new ShowSimplified.JsonUtil().createModelObjectArray(getJson(), "shows");
- }
-
- /**
- * Builder class for building a {@link GetSeveralShowsRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetSeveralShowsRequest.Builder}.
- *
- * Reading the user’s resume points on episode objects requires the {@code user-read-playback-position} scope.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The show IDs setter.
- *
- * @param ids Required. A comma-separated list of the Spotify IDs for the shows. Maximum: 50 IDs.
- * @return A {@link GetSeveralShowsRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public GetSeveralShowsRequest.Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The market country code setter.
- * If a country code is specified, only shows and episodes that are available in that market will be returned.
- * If a valid user access token is specified in the request header, the country associated with the user account will take priority over this parameter.
- * Note: If neither market or user country are provided, the content is considered unavailable for the client.
- * Users can view the country that is associated with their account in the account settings.
- *
- * @param market Optional. An ISO 3166-1 alpha-2 country code.
- * @return A {@link GetSeveralShowsRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- */
- public GetSeveralShowsRequest.Builder market(final CountryCode market) {
- assert (market != null);
- return setQueryParameter("market", market);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetSeveralShowsRequest}.
- */
- @Override
- public GetSeveralShowsRequest build() {
- setPath("/v1/shows");
- return new GetSeveralShowsRequest(this);
- }
-
- @Override
- protected GetSeveralShowsRequest.Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/tracks/GetSeveralTracksRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/tracks/GetSeveralTracksRequest.java
deleted file mode 100644
index e0027ebb0..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/tracks/GetSeveralTracksRequest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package se.michaelthelin.spotify.requests.data.tracks;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.neovisionaries.i18n.CountryCode;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Track;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get Spotify catalog information for multiple tracks based on their Spotify IDs.
- */
-@JsonDeserialize(builder = GetSeveralTracksRequest.Builder.class)
-public class GetSeveralTracksRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetSeveralTracksRequest} constructor.
- *
- * @param builder A {@link GetSeveralTracksRequest.Builder}.
- */
- private GetSeveralTracksRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get several tracks.
- *
- * @return Multiple {@link Track} objects.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public Track[] execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new Track.JsonUtil().createModelObjectArray(getJson(), "tracks");
- }
-
- /**
- * Builder class for building a {@link GetSeveralTracksRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetSeveralTracksRequest.Builder}.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The track IDs setter.
- *
- * @param ids Required. A comma-separated list of the Spotify IDs for the tracks. Maximum: 50 IDs.
- * @return A {@link GetSeveralTracksRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder ids(final String ids) {
- assert (ids != null);
- assert (ids.split(",").length <= 50);
- return setQueryParameter("ids", ids);
- }
-
- /**
- * The market country code setter.
- *
- * @param market Optional. An ISO 3166-1 alpha-2 country code. Provide this
- * parameter if you want to apply Track Relinking.
- * @return A {@link GetSeveralTracksRequest.Builder}.
- * @see Wikipedia: ISO 3166-1 alpha-2 country codes
- * @see Spotify: Track Relinking Guide
- */
- public Builder market(final CountryCode market) {
- assert (market != null);
- return setQueryParameter("market", market);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetSeveralTracksRequest}.
- */
- @Override
- public GetSeveralTracksRequest build() {
- setPath("/v1/tracks");
- return new GetSeveralTracksRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/users_profile/GetUsersProfileRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/users_profile/GetUsersProfileRequest.java
deleted file mode 100644
index ac4581bbf..000000000
--- a/src/main/java/se/michaelthelin/spotify/requests/data/users_profile/GetUsersProfileRequest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package se.michaelthelin.spotify.requests.data.users_profile;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.hc.core5.http.ParseException;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.User;
-import se.michaelthelin.spotify.requests.data.AbstractDataRequest;
-
-import java.io.IOException;
-
-/**
- * Get public profile information about a Spotify user.
- */
-@JsonDeserialize(builder = GetUsersProfileRequest.Builder.class)
-public class GetUsersProfileRequest extends AbstractDataRequest {
-
- /**
- * The private {@link GetUsersProfileRequest} constructor.
- *
- * @param builder A {@link GetUsersProfileRequest.Builder}.
- */
- private GetUsersProfileRequest(final Builder builder) {
- super(builder);
- }
-
- /**
- * Get the profile of a current user.
- *
- * @return A {@link User}.
- * @throws IOException In case of networking issues.
- * @throws SpotifyWebApiException The Web API returned an error further specified in this exception's root cause.
- */
- public User execute() throws
- IOException,
- SpotifyWebApiException,
- ParseException {
- return new User.JsonUtil().createModelObject(getJson());
- }
-
- /**
- * Builder class for building a {@link GetUsersProfileRequest}.
- */
- public static final class Builder extends AbstractDataRequest.Builder {
-
- /**
- * Create a new {@link GetUsersProfileRequest.Builder}.
- *
- * @param accessToken Required. A valid access token from the Spotify Accounts service.
- */
- public Builder(final String accessToken) {
- super(accessToken);
- }
-
- /**
- * The user ID setter.
- *
- * @param user_id The user's Spotify user ID.
- * @return A {@link GetUsersProfileRequest.Builder}.
- * @see Spotify: URIs & IDs
- */
- public Builder user_id(final String user_id) {
- assert (user_id != null);
- assert (!user_id.isEmpty());
- return setPathParameter("user_id", user_id);
- }
-
- /**
- * The request build method.
- *
- * @return A custom {@link GetUsersProfileRequest}.
- */
- @Override
- public GetUsersProfileRequest build() {
- setPath("/v1/users/{user_id}");
- return new GetUsersProfileRequest(this);
- }
-
- @Override
- protected Builder self() {
- return this;
- }
- }
-}
diff --git a/src/test/fixtures/requests/data/albums/GetSeveralAlbumsRequest.json b/src/test/fixtures/requests/data/albums/GetSeveralAlbumsRequest.json
deleted file mode 100644
index 931d6b33d..000000000
--- a/src/test/fixtures/requests/data/albums/GetSeveralAlbumsRequest.json
+++ /dev/null
@@ -1,302 +0,0 @@
-{
- "albums": [
- {
- "album_type": "album",
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/53A0W3U0s8diEn9RhXQhVz"
- },
- "href": "https://api.spotify.com/v1/artists/53A0W3U0s8diEn9RhXQhVz",
- "id": "53A0W3U0s8diEn9RhXQhVz",
- "name": "Keane",
- "type": "artist",
- "uri": "spotify:artist:53A0W3U0s8diEn9RhXQhVz"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "IE",
- "IS",
- "IT",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "RO",
- "SE",
- "SG",
- "SI",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "copyrights": [
- {
- "text": "(C) 2013 Universal Island Records, a division of Universal Music Operations Limited",
- "type": "C"
- },
- {
- "text": "(P) 2013 Universal Island Records, a division of Universal Music Operations Limited",
- "type": "P"
- }
- ],
- "external_ids": {
- "upc": "00602537518357"
- },
- "external_urls": {
- "spotify": "https://open.spotify.com/album/41MnTivkwTO3UUJ8DrqEJJ"
- },
- "genres": [],
- "href": "https://api.spotify.com/v1/albums/41MnTivkwTO3UUJ8DrqEJJ",
- "id": "41MnTivkwTO3UUJ8DrqEJJ",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/89b92c6b59131776c0cd8e5df46301ffcf36ed69",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/eb6f0b2594d81f8d9dced193f3e9a3bc4318aedc",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/21e1ebcd7ebd3b679d9d5084bba1e163638b103a",
- "width": 64
- }
- ],
- "name": "The Best Of Keane (Deluxe Edition)",
- "popularity": 65,
- "release_date": "2013-11-08",
- "release_date_precision": "day",
- "tracks": {
- "href": "https://api.spotify.com/v1/albums/41MnTivkwTO3UUJ8DrqEJJ/tracks?offset=0&limit=50",
- "items": [
- {
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/53A0W3U0s8diEn9RhXQhVz"
- },
- "href": "https://api.spotify.com/v1/artists/53A0W3U0s8diEn9RhXQhVz",
- "id": "53A0W3U0s8diEn9RhXQhVz",
- "name": "Keane",
- "type": "artist",
- "uri": "spotify:artist:53A0W3U0s8diEn9RhXQhVz"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "IE",
- "IS",
- "IT",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "RO",
- "SE",
- "SG",
- "SI",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "disc_number": 1,
- "duration_ms": 215986,
- "explicit": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/track/4r9PmSmbAOOWqaGWLf6M9Q"
- },
- "href": "https://api.spotify.com/v1/tracks/4r9PmSmbAOOWqaGWLf6M9Q",
- "id": "4r9PmSmbAOOWqaGWLf6M9Q",
- "name": "Everybody's Changing",
- "preview_url": "https://p.scdn.co/mp3-preview/641fd877ee0f42f3713d1649e20a9734cc64b8f9",
- "track_number": 1,
- "type": "track",
- "uri": "spotify:track:4r9PmSmbAOOWqaGWLf6M9Q"
- },
- {
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/53A0W3U0s8diEn9RhXQhVz"
- },
- "href": "https://api.spotify.com/v1/artists/53A0W3U0s8diEn9RhXQhVz",
- "id": "53A0W3U0s8diEn9RhXQhVz",
- "name": "Keane",
- "type": "artist",
- "uri": "spotify:artist:53A0W3U0s8diEn9RhXQhVz"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "IE",
- "IS",
- "IT",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "RO",
- "SE",
- "SG",
- "SI",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "disc_number": 1,
- "duration_ms": 235880,
- "explicit": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/track/0HJQD8uqX2Bq5HVdLnd3ep"
- },
- "href": "https://api.spotify.com/v1/tracks/0HJQD8uqX2Bq5HVdLnd3ep",
- "id": "0HJQD8uqX2Bq5HVdLnd3ep",
- "name": "Somewhere Only We Know",
- "preview_url": "https://p.scdn.co/mp3-preview/e001676375ea2b4807cee2f98b51f2f3fe0d109b",
- "track_number": 2,
- "type": "track",
- "uri": "spotify:track:0HJQD8uqX2Bq5HVdLnd3ep"
- }
- ],
- "limit": 50,
- "next": null,
- "offset": 0,
- "previous": null,
- "total": 9
- },
- "type": "album",
- "uri": "spotify:album:6UXCm6bOO4gFlDQZV5yL37"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/test/fixtures/requests/data/artists/GetArtistsTopTracksRequest.json b/src/test/fixtures/requests/data/artists/GetArtistsTopTracksRequest.json
deleted file mode 100644
index dca621cd3..000000000
--- a/src/test/fixtures/requests/data/artists/GetArtistsTopTracksRequest.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
- "tracks": [
- {
- "album": {
- "album_type": "album",
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/43ZHCT0cAZBISjO8DG9PnE"
- },
- "href": "https://api.spotify.com/v1/artists/43ZHCT0cAZBISjO8DG9PnE",
- "id": "43ZHCT0cAZBISjO8DG9PnE",
- "name": "Elvis Presley",
- "type": "artist",
- "uri": "spotify:artist:43ZHCT0cAZBISjO8DG9PnE"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CA",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MX",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "US",
- "UY"
- ],
- "external_urls": {
- "spotify": "https://open.spotify.com/album/7xe8VI48TxUpU1IIo0RfGi"
- },
- "href": "https://api.spotify.com/v1/albums/7xe8VI48TxUpU1IIo0RfGi",
- "id": "7xe8VI48TxUpU1IIo0RfGi",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/4295b5ff74d4f944367144acbe616b6f62d20b17",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/203104e5843248c700b078f391d4bc759c5d7f47",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/0c0a172373b0211c590b241270d05b70889075a1",
- "width": 64
- }
- ],
- "name": "Blue Hawaii",
- "type": "album",
- "uri": "spotify:album:7xe8VI48TxUpU1IIo0RfGi"
- },
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/43ZHCT0cAZBISjO8DG9PnE"
- },
- "href": "https://api.spotify.com/v1/artists/43ZHCT0cAZBISjO8DG9PnE",
- "id": "43ZHCT0cAZBISjO8DG9PnE",
- "name": "Elvis Presley",
- "type": "artist",
- "uri": "spotify:artist:43ZHCT0cAZBISjO8DG9PnE"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CA",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MX",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "US",
- "UY"
- ],
- "disc_number": 1,
- "duration_ms": 179773,
- "explicit": false,
- "external_ids": {
- "isrc": "USRC16101350"
- },
- "external_urls": {
- "spotify": "https://open.spotify.com/track/44AyOl4qVkzS48vBsbNXaC"
- },
- "href": "https://api.spotify.com/v1/tracks/44AyOl4qVkzS48vBsbNXaC",
- "id": "44AyOl4qVkzS48vBsbNXaC",
- "name": "Can't Help Falling in Love",
- "popularity": 70,
- "preview_url": "https://p.scdn.co/mp3-preview/26e409b39a2da6dc18fab61020c90be2938dc0e9",
- "track_number": 5,
- "type": "track",
- "uri": "spotify:track:44AyOl4qVkzS48vBsbNXaC"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/test/fixtures/requests/data/artists/GetSeveralArtistsRequest.json b/src/test/fixtures/requests/data/artists/GetSeveralArtistsRequest.json
deleted file mode 100644
index efffd7ffb..000000000
--- a/src/test/fixtures/requests/data/artists/GetSeveralArtistsRequest.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/0oSGxfWSnnOXhD2fKuz2Gy"
- },
- "followers": {
- "href": null,
- "total": 633494
- },
- "genres": [
- "art rock",
- "glam rock",
- "permanent wave"
- ],
- "href": "https://api.spotify.com/v1/artists/0oSGxfWSnnOXhD2fKuz2Gy",
- "id": "0oSGxfWSnnOXhD2fKuz2Gy",
- "images": [
- {
- "height": 1000,
- "url": "https://i.scdn.co/image/32bd9707b42a2c081482ec9cd3ffa8879f659f95",
- "width": 1000
- },
- {
- "height": 640,
- "url": "https://i.scdn.co/image/865f24753e5e4f40a383bf24a9cdda598a4559a8",
- "width": 640
- },
- {
- "height": 200,
- "url": "https://i.scdn.co/image/7ddd6fa5cf78aee2f2e8b347616151393022b7d9",
- "width": 200
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/c8dc28c191432862afce298216458a6f00bbfbd8",
- "width": 64
- }
- ],
- "name": "David Bowie",
- "popularity": 77,
- "type": "artist",
- "uri": "spotify:artist:0oSGxfWSnnOXhD2fKuz2Gy"
- },
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/3dBVyJ7JuOMt4GE9607Qin"
- },
- "followers": {
- "href": null,
- "total": 52338
- },
- "genres": [
- "glam rock",
- "protopunk"
- ],
- "href": "https://api.spotify.com/v1/artists/3dBVyJ7JuOMt4GE9607Qin",
- "id": "3dBVyJ7JuOMt4GE9607Qin",
- "images": [
- {
- "height": 1300,
- "url": "https://i.scdn.co/image/5515a710c94ccd4edd8b9a0587778ed5e3f997da",
- "width": 1000
- },
- {
- "height": 832,
- "url": "https://i.scdn.co/image/c990e667b4ca8240c73b0db06e6d76a3b27ce929",
- "width": 640
- },
- {
- "height": 260,
- "url": "https://i.scdn.co/image/de2fa1d11c59e63143117d44ec9990b9e40451a2",
- "width": 200
- },
- {
- "height": 83,
- "url": "https://i.scdn.co/image/b39638735adb4a4a54621293b99ab65c546f605e",
- "width": 64
- }
- ],
- "name": "T. Rex",
- "popularity": 58,
- "type": "artist",
- "uri": "spotify:artist:3dBVyJ7JuOMt4GE9607Qin"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/test/fixtures/requests/data/browse/GetCategoryRequest.json b/src/test/fixtures/requests/data/browse/GetCategoryRequest.json
deleted file mode 100644
index 1f85a526d..000000000
--- a/src/test/fixtures/requests/data/browse/GetCategoryRequest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "href": "https://api.spotify.com/v1/browse/categories/party",
- "icons": [
- {
- "height": 274,
- "url": "https://datsnxq1rwndn.cloudfront.net/media/derived/party-274x274_73d1907a7371c3bb96a288390a96ee27_0_0_274_274.jpg",
- "width": 274
- }
- ],
- "id": "party",
- "name": "Party"
-}
\ No newline at end of file
diff --git a/src/test/fixtures/requests/data/browse/GetCategorysPlaylistsRequest.json b/src/test/fixtures/requests/data/browse/GetCategorysPlaylistsRequest.json
index 534847fed..35c226c58 100644
--- a/src/test/fixtures/requests/data/browse/GetCategorysPlaylistsRequest.json
+++ b/src/test/fixtures/requests/data/browse/GetCategorysPlaylistsRequest.json
@@ -28,7 +28,7 @@
},
"public": null,
"snapshot_id": "PULvu1V2Ps8lzCxNXfNZTw4QbhBpaV0ZORc03Mw6oj6kQw9Ks2REwhL5Xcw/74wL",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/spotifybrazilian/playlists/4k7EZPI3uKMz4aRRrLVfen/tracks",
"total": 100
},
@@ -61,7 +61,7 @@
},
"public": null,
"snapshot_id": "V66hh9k2HnLCdzHvtoXPv+tm0jp3ODM63SZ0oISfGnlHQxwG/scupDbKgIo99Zfz",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/spotifybrazilian/playlists/4HZh0C9y80GzHDbHZyX770/tracks",
"total": 74
},
diff --git a/src/test/fixtures/requests/data/browse/GetListOfCategoriesRequest.json b/src/test/fixtures/requests/data/browse/GetListOfCategoriesRequest.json
deleted file mode 100644
index 2f6f91e6d..000000000
--- a/src/test/fixtures/requests/data/browse/GetListOfCategoriesRequest.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
- "categories": {
- "href": "https://api.spotify.com/v1/browse/categories?offset=0&limit=20",
- "items": [
- {
- "href": "https://api.spotify.com/v1/browse/categories/toplists",
- "icons": [
- {
- "height": 275,
- "url": "https://datsnxq1rwndn.cloudfront.net/media/derived/toplists_11160599e6a04ac5d6f2757f5511778f_0_0_275_275.jpg",
- "width": 275
- }
- ],
- "id": "toplists",
- "name": "Top Lists"
- },
- {
- "href": "https://api.spotify.com/v1/browse/categories/mood",
- "icons": [
- {
- "height": 274,
- "url": "https://datsnxq1rwndn.cloudfront.net/media/original/mood-274x274_976986a31ac8c49794cbdc7246fd5ad7_274x274.jpg",
- "width": 274
- }
- ],
- "id": "mood",
- "name": "Mood"
- },
- {
- "href": "https://api.spotify.com/v1/browse/categories/party",
- "icons": [
- {
- "height": 274,
- "url": "https://datsnxq1rwndn.cloudfront.net/media/derived/party-274x274_73d1907a7371c3bb96a288390a96ee27_0_0_274_274.jpg",
- "width": 274
- }
- ],
- "id": "party",
- "name": "Party"
- },
- {
- "href": "https://api.spotify.com/v1/browse/categories/pop",
- "icons": [
- {
- "height": 274,
- "url": "https://datsnxq1rwndn.cloudfront.net/media/derived/pop-274x274_447148649685019f5e2a03a39e78ba52_0_0_274_274.jpg",
- "width": 274
- }
- ],
- "id": "pop",
- "name": "Pop"
- },
- {
- "href": "https://api.spotify.com/v1/browse/categories/workout",
- "icons": [
- {
- "height": 275,
- "url": "https://datsnxq1rwndn.cloudfront.net/media/derived/workout_856581c1c545a5305e49a3cd8be804a0_0_0_275_275.jpg",
- "width": 275
- }
- ],
- "id": "workout",
- "name": "Workout"
- }
- ],
- "limit": 20,
- "next": "https://api.spotify.com/v1/browse/categories?offset=20&limit=20",
- "offset": 0,
- "previous": null,
- "total": 31
- }
-}
\ No newline at end of file
diff --git a/src/test/fixtures/requests/data/browse/GetListOfFeaturedPlaylistsRequest.json b/src/test/fixtures/requests/data/browse/GetListOfFeaturedPlaylistsRequest.json
index e06588090..61bfdc279 100644
--- a/src/test/fixtures/requests/data/browse/GetListOfFeaturedPlaylistsRequest.json
+++ b/src/test/fixtures/requests/data/browse/GetListOfFeaturedPlaylistsRequest.json
@@ -29,7 +29,7 @@
},
"public": null,
"snapshot_id": "WwGvSIVUkUvGvqjgj/bQHlRycYmJ2TkoIxYfoalWlmIZT6TvsgvGMgtQ2dGbkrAW",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/spotify/playlists/6ftJBzU2LLQcaKefMi7ee7/tracks",
"total": 245
},
@@ -62,7 +62,7 @@
},
"public": null,
"snapshot_id": "0j9Rcbt2KtCXEXKtKy/tnSL5r4byjDBOIVY1dn4S6GV73EEUgNuK2hU+QyDuNnXz",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/spotify__sverige/playlists/4uOEx4OUrkoGNZoIlWMUbO/tracks",
"total": 38
},
diff --git a/src/test/fixtures/requests/data/browse/GetListOfNewReleasesRequest.json b/src/test/fixtures/requests/data/browse/GetListOfNewReleasesRequest.json
deleted file mode 100644
index 86817ef3c..000000000
--- a/src/test/fixtures/requests/data/browse/GetListOfNewReleasesRequest.json
+++ /dev/null
@@ -1,213 +0,0 @@
-{
- "albums": {
- "href": "https://api.spotify.com/v1/browse/new-releases?country=SE&offset=0&limit=20",
- "items": [
- {
- "album_type": "single",
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/2RdwBSPQiwcmiDo9kixcl8"
- },
- "href": "https://api.spotify.com/v1/artists/2RdwBSPQiwcmiDo9kixcl8",
- "id": "2RdwBSPQiwcmiDo9kixcl8",
- "name": "Pharrell Williams",
- "type": "artist",
- "uri": "spotify:artist:2RdwBSPQiwcmiDo9kixcl8"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CA",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MX",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "US",
- "UY"
- ],
- "external_urls": {
- "spotify": "https://open.spotify.com/album/5ZX4m5aVSmWQ5iHAPQpT71"
- },
- "href": "https://api.spotify.com/v1/albums/5ZX4m5aVSmWQ5iHAPQpT71",
- "id": "5ZX4m5aVSmWQ5iHAPQpT71",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/e6b635ebe3ef4ba22492f5698a7b5d417f78b88a",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/92ae5b0fe64870c09004dd2e745a4fb1bf7de39d",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/8a7ab6fc2c9f678308ba0f694ecd5718dc6bc930",
- "width": 64
- }
- ],
- "name": "Runnin'",
- "type": "album",
- "uri": "spotify:album:5ZX4m5aVSmWQ5iHAPQpT71"
- },
- {
- "album_type": "single",
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/3TVXtAsR1Inumwj472S9r4"
- },
- "href": "https://api.spotify.com/v1/artists/3TVXtAsR1Inumwj472S9r4",
- "id": "3TVXtAsR1Inumwj472S9r4",
- "name": "Drake",
- "type": "artist",
- "uri": "spotify:artist:3TVXtAsR1Inumwj472S9r4"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "external_urls": {
- "spotify": "https://open.spotify.com/album/0geTzdk2InlqIoB16fW9Nd"
- },
- "href": "https://api.spotify.com/v1/albums/0geTzdk2InlqIoB16fW9Nd",
- "id": "0geTzdk2InlqIoB16fW9Nd",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/d40e9c3d22bde2fbdb2ecc03cccd7a0e77f42e4c",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/dff06a3375f6d9b32ecb081eb9a60bbafecb5731",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/808a02bd7fc59b0652c9df9f68675edbffe07a79",
- "width": 64
- }
- ],
- "name": "Sneakin’",
- "type": "album",
- "uri": "spotify:album:0geTzdk2InlqIoB16fW9Nd"
- }
- ],
- "limit": 20,
- "next": "https://api.spotify.com/v1/browse/new-releases?country=SE&offset=20&limit=20",
- "offset": 0,
- "previous": null,
- "total": 500
- }
-}
\ No newline at end of file
diff --git a/src/test/fixtures/requests/data/episodes/GetSeveralEpisodesRequest.json b/src/test/fixtures/requests/data/episodes/GetSeveralEpisodesRequest.json
deleted file mode 100644
index 94eafe406..000000000
--- a/src/test/fixtures/requests/data/episodes/GetSeveralEpisodesRequest.json
+++ /dev/null
@@ -1,320 +0,0 @@
-{
- "episodes": [
- {
- "audio_preview_url": "https://p.scdn.co/mp3-preview/9b0ebffde166917f35f9eab25af874e765261776",
- "description": "We try to convince CNET's Jeff Bakalar that the Witcher's extended universe is amazing while he clues us in on where the real money is made. We've also got updates on the Grand Theft Auto movie, Splatoon, Alex's Mad Max impressions, and hot New York real ",
- "duration_ms": 8052140,
- "explicit": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/episode/4GI3dxEafwap1sFiTGPKd1"
- },
- "href": "https://api.spotify.com/v1/episodes/4GI3dxEafwap1sFiTGPKd1",
- "id": "4GI3dxEafwap1sFiTGPKd1",
- "images": [
- {
- "height": 327,
- "url": "https://i.scdn.co/image/207663099fe4dab2eafbc2b52813d283e80be07a",
- "width": 580
- },
- {
- "height": 169,
- "url": "https://i.scdn.co/image/156b88e30fbeb1864e75401b619e53238e252dd5",
- "width": 300
- },
- {
- "height": 36,
- "url": "https://i.scdn.co/image/e96c7aa1c2415e29a68d93f4089c8add48b29984",
- "width": 64
- }
- ],
- "is_externally_hosted": false,
- "is_playable": true,
- "language": "en-US",
- "languages": [
- "en-US"
- ],
- "name": "The Giant Beastcast: Episode 0",
- "release_date": "2015-05-22",
- "release_date_precision": "day",
- "resume_point": {
- "fully_played": false,
- "resume_position_ms": 3579000
- },
- "show": {
- "available_markets": [
- "AD",
- "AE",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BH",
- "BO",
- "BR",
- "CA",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "DZ",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IL",
- "IN",
- "IS",
- "IT",
- "JO",
- "JP",
- "KW",
- "LB",
- "LI",
- "LT",
- "LU",
- "LV",
- "MA",
- "MC",
- "MT",
- "MX",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "OM",
- "PA",
- "PE",
- "PH",
- "PL",
- "PS",
- "PT",
- "PY",
- "QA",
- "RO",
- "SE",
- "SG",
- "SK",
- "SV",
- "TH",
- "TN",
- "TR",
- "TW",
- "US",
- "UY",
- "VN",
- "ZA"
- ],
- "copyrights": [],
- "description": "The Giant Bomb East team gathers to talk about the week in video games, their lives, and basically anything that interests them. All from New York City!",
- "explicit": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/show/5AvwZVawapvyhJUIx71pdJ"
- },
- "href": "https://api.spotify.com/v1/shows/5AvwZVawapvyhJUIx71pdJ",
- "id": "5AvwZVawapvyhJUIx71pdJ",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/1ddf77cc09b21b34b9536f76794b43bac7240688",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/b96bc3c4b41162cf3dbec9f66cd0ba63fde47849",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/e699a95e7494c7c898a85f3676572b71faecf032",
- "width": 64
- }
- ],
- "is_externally_hosted": false,
- "languages": [
- "en-US"
- ],
- "media_type": "audio",
- "name": "The Giant Beastcast",
- "publisher": "Giant Bomb",
- "type": "show",
- "uri": "spotify:show:5AvwZVawapvyhJUIx71pdJ"
- },
- "type": "episode",
- "uri": "spotify:episode:4GI3dxEafwap1sFiTGPKd1"
- },
- {
- "audio_preview_url": "https://p.scdn.co/mp3-preview/09cec54c8e55316a020ca988888ff95a59fdd664",
- "description": "Austin Walker joins us as we deliver updates on Splatoon, Danny Trejo, and Jeff's Australian accent. We also dig into topics ranging from streaming Adult Only games to the current online gaming environment.",
- "duration_ms": 6817880,
- "explicit": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/episode/1rcYQNrhIqpG3eJyRlRuKJ"
- },
- "href": "https://api.spotify.com/v1/episodes/1rcYQNrhIqpG3eJyRlRuKJ",
- "id": "1rcYQNrhIqpG3eJyRlRuKJ",
- "images": [
- {
- "height": 237,
- "url": "https://i.scdn.co/image/9f158e066a07176a943278775ecd0da7136dfbd8",
- "width": 640
- },
- {
- "height": 111,
- "url": "https://i.scdn.co/image/ca24d4363195b14aa0b1e1d370643f1d3d76243d",
- "width": 300
- },
- {
- "height": 24,
- "url": "https://i.scdn.co/image/59bc0c009b3fe8903aac2a9113307bd66208faf4",
- "width": 64
- }
- ],
- "is_externally_hosted": false,
- "is_playable": true,
- "language": "en-US",
- "languages": [
- "en-US"
- ],
- "name": "The Giant Beastcast: Episode 01",
- "release_date": "2015-05-29",
- "release_date_precision": "day",
- "resume_point": {
- "fully_played": false,
- "resume_position_ms": 0
- },
- "show": {
- "available_markets": [
- "AD",
- "AE",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BH",
- "BO",
- "BR",
- "CA",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "DZ",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IL",
- "IN",
- "IS",
- "IT",
- "JO",
- "JP",
- "KW",
- "LB",
- "LI",
- "LT",
- "LU",
- "LV",
- "MA",
- "MC",
- "MT",
- "MX",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "OM",
- "PA",
- "PE",
- "PH",
- "PL",
- "PS",
- "PT",
- "PY",
- "QA",
- "RO",
- "SE",
- "SG",
- "SK",
- "SV",
- "TH",
- "TN",
- "TR",
- "TW",
- "US",
- "UY",
- "VN",
- "ZA"
- ],
- "copyrights": [],
- "description": "The Giant Bomb East team gathers to talk about the week in video games, their lives, and basically anything that interests them. All from New York City!",
- "explicit": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/show/5AvwZVawapvyhJUIx71pdJ"
- },
- "href": "https://api.spotify.com/v1/shows/5AvwZVawapvyhJUIx71pdJ",
- "id": "5AvwZVawapvyhJUIx71pdJ",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/1ddf77cc09b21b34b9536f76794b43bac7240688",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/b96bc3c4b41162cf3dbec9f66cd0ba63fde47849",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/e699a95e7494c7c898a85f3676572b71faecf032",
- "width": 64
- }
- ],
- "is_externally_hosted": false,
- "languages": [
- "en-US"
- ],
- "media_type": "audio",
- "name": "The Giant Beastcast",
- "publisher": "Giant Bomb",
- "type": "show",
- "uri": "spotify:show:5AvwZVawapvyhJUIx71pdJ"
- },
- "type": "episode",
- "uri": "spotify:episode:1rcYQNrhIqpG3eJyRlRuKJ"
- }
- ]
-}
diff --git a/src/test/fixtures/requests/data/playlists/CreatePlaylistRequest.json b/src/test/fixtures/requests/data/playlists/CreatePlaylistRequest.json
deleted file mode 100644
index ddeb6e010..000000000
--- a/src/test/fixtures/requests/data/playlists/CreatePlaylistRequest.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "collaborative": false,
- "description": null,
- "external_urls": {
- "spotify": "https://open.spotify.com/user/thelinmichael/playlist/7d2D2S200NyUE5KYs80PwO"
- },
- "followers": {
- "href": null,
- "total": 0
- },
- "href": "https://api.spotify.com/v1/users/thelinmichael/playlists/7d2D2S200NyUE5KYs80PwO",
- "id": "7d2D2S200NyUE5KYs80PwO",
- "images": [],
- "name": "A New Playlist",
- "owner": {
- "external_urls": {
- "spotify": "https://open.spotify.com/user/thelinmichael"
- },
- "href": "https://api.spotify.com/v1/users/thelinmichael",
- "id": "thelinmichael",
- "type": "user",
- "uri": "spotify:user:thelinmichael"
- },
- "public": false,
- "snapshot_id": "s0o3TSuYnRLl2jch+oA4OEbKwq/fNxhGBkSPnvhZdmWjNV0q3uCAWuGIhEx8SHIx",
- "tracks": {
- "href": "https://api.spotify.com/v1/users/thelinmichael/playlists/7d2D2S200NyUE5KYs80PwO/tracks",
- "items": [],
- "limit": 100,
- "next": null,
- "offset": 0,
- "previous": null,
- "total": 0
- },
- "type": "playlist",
- "uri": "spotify:user:thelinmichael:playlist:7d2D2S200NyUE5KYs80PwO"
-}
diff --git a/src/test/fixtures/requests/data/playlists/GetListOfCurrentUsersPlaylistsRequest.json b/src/test/fixtures/requests/data/playlists/GetListOfCurrentUsersPlaylistsRequest.json
index a49622131..9cbf910a5 100644
--- a/src/test/fixtures/requests/data/playlists/GetListOfCurrentUsersPlaylistsRequest.json
+++ b/src/test/fixtures/requests/data/playlists/GetListOfCurrentUsersPlaylistsRequest.json
@@ -21,7 +21,7 @@
},
"public": true,
"snapshot_id": "bNLWdmhh+HDsbHzhckXeDC0uyKyg4FjPI/KEsKjAE526usnz2LxwgyBoMShVL+z+",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/wizzler/playlists/53Y8wT46QIMz5H4WQ8O22c/tracks",
"total": 30
},
@@ -48,7 +48,7 @@
},
"public": true,
"snapshot_id": "Y0qg/IT5T02DKpw4uQKc/9RUrqQJ07hbTKyEeDRPOo9LU0g0icBrIXwVkHfQZ/aD",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/wizzlersmate/playlists/1AVZz0mBuGbCEoNRQdYQju/tracks",
"total": 58
},
diff --git a/src/test/fixtures/requests/data/playlists/GetListOfUsersPlaylistsRequest.json b/src/test/fixtures/requests/data/playlists/GetListOfUsersPlaylistsRequest.json
deleted file mode 100644
index a49622131..000000000
--- a/src/test/fixtures/requests/data/playlists/GetListOfUsersPlaylistsRequest.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "href": "https://api.spotify.com/v1/users/wizzler/playlists",
- "items": [
- {
- "collaborative": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/user/wizzler/playlists/53Y8wT46QIMz5H4WQ8O22c"
- },
- "href": "https://api.spotify.com/v1/users/wizzler/playlists/53Y8wT46QIMz5H4WQ8O22c",
- "id": "53Y8wT46QIMz5H4WQ8O22c",
- "images": [],
- "name": "Wizzlers Big Playlist",
- "owner": {
- "external_urls": {
- "spotify": "https://open.spotify.com/user/wizzler"
- },
- "href": "https://api.spotify.com/v1/users/wizzler",
- "id": "wizzler",
- "type": "user",
- "uri": "spotify:user:wizzler"
- },
- "public": true,
- "snapshot_id": "bNLWdmhh+HDsbHzhckXeDC0uyKyg4FjPI/KEsKjAE526usnz2LxwgyBoMShVL+z+",
- "tracks": {
- "href": "https://api.spotify.com/v1/users/wizzler/playlists/53Y8wT46QIMz5H4WQ8O22c/tracks",
- "total": 30
- },
- "type": "playlist",
- "uri": "spotify:user:wizzler:playlist:53Y8wT46QIMz5H4WQ8O22c"
- },
- {
- "collaborative": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/user/wizzlersmate/playlists/1AVZz0mBuGbCEoNRQdYQju"
- },
- "href": "https://api.spotify.com/v1/users/wizzlersmate/playlists/1AVZz0mBuGbCEoNRQdYQju",
- "id": "1AVZz0mBuGbCEoNRQdYQju",
- "images": [],
- "name": "Another Playlist",
- "owner": {
- "external_urls": {
- "spotify": "https://open.spotify.com/user/wizzlersmate"
- },
- "href": "https://api.spotify.com/v1/users/wizzlersmate",
- "id": "wizzlersmate",
- "type": "user",
- "uri": "spotify:user:wizzlersmate"
- },
- "public": true,
- "snapshot_id": "Y0qg/IT5T02DKpw4uQKc/9RUrqQJ07hbTKyEeDRPOo9LU0g0icBrIXwVkHfQZ/aD",
- "tracks": {
- "href": "https://api.spotify.com/v1/users/wizzlersmate/playlists/1AVZz0mBuGbCEoNRQdYQju/tracks",
- "total": 58
- },
- "type": "playlist",
- "uri": "spotify:user:wizzlersmate:playlist:1AVZz0mBuGbCEoNRQdYQju"
- }
- ],
- "limit": 9,
- "next": null,
- "offset": 0,
- "previous": null,
- "total": 9
-}
diff --git a/src/test/fixtures/requests/data/playlists/GetListOfUsersPlaylistsRequest_UserWith$.json b/src/test/fixtures/requests/data/playlists/GetListOfUsersPlaylistsRequest_UserWith$.json
index ac6ab3046..095712593 100644
--- a/src/test/fixtures/requests/data/playlists/GetListOfUsersPlaylistsRequest_UserWith$.json
+++ b/src/test/fixtures/requests/data/playlists/GetListOfUsersPlaylistsRequest_UserWith$.json
@@ -21,7 +21,7 @@
},
"public": true,
"snapshot_id": "bNLWdmhh+HDsbHzhckXeDC0uyKyg4FjPI/KEsKjAE526usnz2LxwgyBoMShVL+z+",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/wizzler/playlists/53Y8wT46QIMz5H4WQ8O22c/tracks",
"total": 30
},
@@ -48,7 +48,7 @@
},
"public": true,
"snapshot_id": "Y0qg/IT5T02DKpw4uQKc/9RUrqQJ07hbTKyEeDRPOo9LU0g0icBrIXwVkHfQZ/aD",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/wizzlersmate/playlists/1AVZz0mBuGbCEoNRQdYQju/tracks",
"total": 58
},
diff --git a/src/test/fixtures/requests/data/playlists/GetPlaylistRequest.json b/src/test/fixtures/requests/data/playlists/GetPlaylistRequest.json
index 7ea8c4c1f..3cd58ef4e 100644
--- a/src/test/fixtures/requests/data/playlists/GetPlaylistRequest.json
+++ b/src/test/fixtures/requests/data/playlists/GetPlaylistRequest.json
@@ -27,7 +27,7 @@
},
"public": null,
"snapshot_id": "bNLWdmhh+HDsbHzhckXeDC0uyKyg4FjPI/KEsKjAE526usnz2LxwgyBoMShVL+z+",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/spotify/playlists/59ZbFPES4DQwEjBpWHzrtC/tracks",
"items": [
{
@@ -42,7 +42,7 @@
"uri": "spotify:user:spotify"
},
"is_local": false,
- "track": {
+ "item": {
"album": {
"album_type": "single",
"available_markets": [
diff --git a/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest.json b/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest.json
index f29f6207b..6de02153c 100644
--- a/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest.json
+++ b/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest.json
@@ -13,7 +13,7 @@
"uri": "spotify:user:spotify_espa%C3%B1a"
},
"is_local": false,
- "track": {
+ "item": {
"album": {
"album_type": "single",
"artists": [
diff --git a/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest_Episode.json b/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest_Episode.json
index e68d03b89..77afccf23 100644
--- a/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest_Episode.json
+++ b/src/test/fixtures/requests/data/playlists/GetPlaylistsItemsRequest_Episode.json
@@ -14,7 +14,7 @@
},
"is_local": false,
"primary_color": null,
- "track": {
+ "item": {
"audio_preview_url": "https://p.scdn.co/mp3-preview/9b0ebffde166917f35f9eab25af874e765261776",
"description": "We try to convince CNET's Jeff Bakalar that the Witcher's extended universe is amazing while he clues us in on where the real money is made. We've also got updates on the Grand Theft Auto movie, Splatoon, Alex's Mad Max impressions, and hot New York real ",
"duration_ms": 8052140,
diff --git a/src/test/fixtures/requests/data/search/simplified/SearchPlaylistsRequest.json b/src/test/fixtures/requests/data/search/simplified/SearchPlaylistsRequest.json
index dd7619d6a..70e23ae16 100644
--- a/src/test/fixtures/requests/data/search/simplified/SearchPlaylistsRequest.json
+++ b/src/test/fixtures/requests/data/search/simplified/SearchPlaylistsRequest.json
@@ -29,7 +29,7 @@
},
"public": null,
"snapshot_id": "+NTCFqkUdkOXYFUWvU5WKt6UZ6qCjYLaW46lrg5CKNo9jA8/UaTlAiKhjjCSWvNX0t0RI5UlgN0=",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/spotify/playlists/37i9dQZF1DWT6VDwxLyl0W/tracks",
"total": 50
},
@@ -73,7 +73,7 @@
},
"public": null,
"snapshot_id": "JtRnjv1ZOAMvfIzydGLUSYFsny/ClfCjg2CRusVZlsBhxamdGMXstAMmA5uVcjLo",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/22sf74of2vex22mbg4jglkugy/playlists/3l5sfazmY1FP0wDlNCUunG/tracks",
"total": 76
},
@@ -117,7 +117,7 @@
},
"public": null,
"snapshot_id": "eNUie5w8PrXk1g+LaoRsXrTEVNbaH5CkETcyiIY1ukv4gD94c/OoCPPepydX5eVl",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/22aood6wrht2pipht3ukvoyxa/playlists/1d2XIviyWqrmbxZBQKy8C8/tracks",
"total": 34
},
@@ -161,7 +161,7 @@
},
"public": null,
"snapshot_id": "F4fBgK1AbQUKcirEYoYa+pvNkM7dFnffYJyGDU1TyuJDkCrMkt0eR8kE5Ln00Mhd",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/anoymusid/playlists/0qyro9Fdqr1wNcGQjzDh3e/tracks",
"total": 164
},
@@ -205,7 +205,7 @@
},
"public": null,
"snapshot_id": "epniUoKVG+Rz1xbNOSv9/5OuV8fav1ZW8oZz6mzJb+hpSrSdh1I+O+VQDluQBYVP",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/musicdeche/playlists/4YUo5t8gIhxtGFl8tT3Ovq/tracks",
"total": 170
},
@@ -249,7 +249,7 @@
},
"public": null,
"snapshot_id": "71QE8VXYJz54pM7SnFpQDuC8hF/kZ9gc4s9hUT1keV1+QKQDUiIH7zg0OtYhRV3X",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/22fkrew4v2cs7zc6uwii76i4a/playlists/7qlkRPYzSxw24oD83dntuk/tracks",
"total": 357
},
@@ -283,7 +283,7 @@
},
"public": null,
"snapshot_id": "6QMBjA/Eh/AvQQVNYBZQcCFcw4gqHIPNTxplTZJ9FAnv0JNNuUeFjlMKZyvwamB5",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/muse_official/playlists/2zNu81WarotkZVGvMApl7y/tracks",
"total": 38
},
@@ -317,7 +317,7 @@
},
"public": null,
"snapshot_id": "+/D264YZcuccEbR9ZBdRcZtC9Ugm06mrNvTvv2QeLLEcK2jd93gDlRf8t7dApev2",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/tyronecleggburrell/playlists/4hBO5JpMRFdkWY7KIycz81/tracks",
"total": 3
},
@@ -361,7 +361,7 @@
},
"public": null,
"snapshot_id": "cGFAdwLhD1jVsVNulBWuKbCw0/s7e3xEtH6uqRHac4tiUuSq+o4woxPUBCZZDErc",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/eaglestormcatcher/playlists/4dCdOaKewZr04ZiBr1kwbd/tracks",
"total": 61
},
@@ -405,7 +405,7 @@
},
"public": null,
"snapshot_id": "wuTDlZGdSLWmfVZIftV5rODduEgWuYJmyeS8wi572QeBdHZOhupfmH5k+k8Ia/EU",
- "tracks": {
+ "items": {
"href": "https://api.spotify.com/v1/users/doggybluescarf/playlists/1EWgI1FFh0fjZTbCrMUULt/tracks",
"total": 86
},
diff --git a/src/test/fixtures/requests/data/shows/GetSeveralShowsRequest.json b/src/test/fixtures/requests/data/shows/GetSeveralShowsRequest.json
deleted file mode 100644
index 2429dc38c..000000000
--- a/src/test/fixtures/requests/data/shows/GetSeveralShowsRequest.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
- "shows": [
- {
- "available_markets": [
- "AD",
- "AE",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BH",
- "BO",
- "BR",
- "CA",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "DZ",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IL",
- "IN",
- "IS",
- "IT",
- "JO",
- "JP",
- "KW",
- "LB",
- "LI",
- "LT",
- "LU",
- "LV",
- "MA",
- "MC",
- "MT",
- "MX",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "OM",
- "PA",
- "PE",
- "PH",
- "PL",
- "PS",
- "PT",
- "PY",
- "QA",
- "RO",
- "SE",
- "SG",
- "SK",
- "SV",
- "TH",
- "TN",
- "TR",
- "TW",
- "US",
- "UY",
- "VN",
- "ZA"
- ],
- "copyrights": [],
- "description": "Candid conversations with entrepreneurs, artists, athletes, visionaries of all kinds—about their successes, and their failures, and what they learned from both. Hosted by Alex Blumberg, from Gimlet Media.",
- "explicit": true,
- "external_urls": {
- "spotify": "https://open.spotify.com/show/5CfCWKI5pZ28U0uOzXkDHe"
- },
- "href": "https://api.spotify.com/v1/shows/5CfCWKI5pZ28U0uOzXkDHe",
- "id": "5CfCWKI5pZ28U0uOzXkDHe",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/12903409b9e5dd26f2a41e401cd7fcabd5164ed4",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/4f19eb7986a7c2246d713dcc46684e2187ccea4f",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/c0b072976a28792a4b451dfc7011a2176ec8cd34",
- "width": 64
- }
- ],
- "is_externally_hosted": false,
- "languages": [
- "en"
- ],
- "media_type": "audio",
- "name": "Without Fail",
- "publisher": "Gimlet",
- "type": "show",
- "uri": "spotify:show:5CfCWKI5pZ28U0uOzXkDHe"
- },
- {
- "available_markets": [
- "AD",
- "AE",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BH",
- "BO",
- "BR",
- "CA",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "DZ",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IL",
- "IN",
- "IS",
- "IT",
- "JO",
- "JP",
- "KW",
- "LB",
- "LI",
- "LT",
- "LU",
- "LV",
- "MA",
- "MC",
- "MT",
- "MX",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "OM",
- "PA",
- "PE",
- "PH",
- "PL",
- "PS",
- "PT",
- "PY",
- "QA",
- "RO",
- "SE",
- "SG",
- "SK",
- "SV",
- "TH",
- "TN",
- "TR",
- "TW",
- "US",
- "UY",
- "VN",
- "ZA"
- ],
- "copyrights": [],
- "description": "Giant Bomb discusses the latest video game news and new releases, taste-test questionable beverages, and get wildly off-topic in this weekly podcast.",
- "explicit": false,
- "external_urls": {
- "spotify": "https://open.spotify.com/show/5as3aKmN2k11yfDDDSrvaZ"
- },
- "href": "https://api.spotify.com/v1/shows/5as3aKmN2k11yfDDDSrvaZ",
- "id": "5as3aKmN2k11yfDDDSrvaZ",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/9bd9b3be1111810a91cd768115a57ee5a08c7145",
- "width": 640
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/1f5c122086aa4602742ba2301302f2f9bc1f0345",
- "width": 300
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/b97f288023e547f40862976c89a5c342eacaaac1",
- "width": 64
- }
- ],
- "is_externally_hosted": false,
- "languages": [
- "en-US"
- ],
- "media_type": "audio",
- "name": "Giant Bombcast",
- "publisher": "Giant Bomb",
- "type": "show",
- "uri": "spotify:show:5as3aKmN2k11yfDDDSrvaZ"
- }
- ]
-}
diff --git a/src/test/fixtures/requests/data/tracks/GetSeveralTracksRequest.json b/src/test/fixtures/requests/data/tracks/GetSeveralTracksRequest.json
deleted file mode 100644
index 74662de22..000000000
--- a/src/test/fixtures/requests/data/tracks/GetSeveralTracksRequest.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
- "tracks": [
- {
- "album": {
- "album_type": "album",
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/0C0XlULifJtAgn6ZNCW2eu"
- },
- "href": "https://api.spotify.com/v1/artists/0C0XlULifJtAgn6ZNCW2eu",
- "id": "0C0XlULifJtAgn6ZNCW2eu",
- "name": "The Killers",
- "type": "artist",
- "uri": "spotify:artist:0C0XlULifJtAgn6ZNCW2eu"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "external_urls": {
- "spotify": "https://open.spotify.com/album/4OHNH3sDzIxnmUADXzv2kT"
- },
- "href": "https://api.spotify.com/v1/albums/4OHNH3sDzIxnmUADXzv2kT",
- "id": "4OHNH3sDzIxnmUADXzv2kT",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/ac68a9e4a867ec3ce8249cd90a2d7c73755fb487",
- "width": 629
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/d0186ad64df7d6fc5f65c20c7d16f4279ffeb815",
- "width": 295
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/7c3ec33d478f5f517eeb5339c2f75f150e4d601e",
- "width": 63
- }
- ],
- "name": "Hot Fuss (Deluxe Version)",
- "type": "album",
- "uri": "spotify:album:4OHNH3sDzIxnmUADXzv2kT"
- },
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/0C0XlULifJtAgn6ZNCW2eu"
- },
- "href": "https://api.spotify.com/v1/artists/0C0XlULifJtAgn6ZNCW2eu",
- "id": "0C0XlULifJtAgn6ZNCW2eu",
- "name": "The Killers",
- "type": "artist",
- "uri": "spotify:artist:0C0XlULifJtAgn6ZNCW2eu"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "disc_number": 1,
- "duration_ms": 222200,
- "explicit": false,
- "external_ids": {
- "isrc": "GBFFP0300052"
- },
- "external_urls": {
- "spotify": "https://open.spotify.com/track/3n3Ppam7vgaVa1iaRUc9Lp"
- },
- "href": "https://api.spotify.com/v1/tracks/3n3Ppam7vgaVa1iaRUc9Lp",
- "id": "3n3Ppam7vgaVa1iaRUc9Lp",
- "name": "Mr. Brightside",
- "popularity": 73,
- "preview_url": "https://p.scdn.co/mp3-preview/4839b070015ab7d6de9fec1756e1f3096d908fba",
- "track_number": 2,
- "type": "track",
- "uri": "spotify:track:3n3Ppam7vgaVa1iaRUc9Lp"
- },
- {
- "album": {
- "album_type": "album",
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/0C0XlULifJtAgn6ZNCW2eu"
- },
- "href": "https://api.spotify.com/v1/artists/0C0XlULifJtAgn6ZNCW2eu",
- "id": "0C0XlULifJtAgn6ZNCW2eu",
- "name": "The Killers",
- "type": "artist",
- "uri": "spotify:artist:0C0XlULifJtAgn6ZNCW2eu"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "external_urls": {
- "spotify": "https://open.spotify.com/album/4OHNH3sDzIxnmUADXzv2kT"
- },
- "href": "https://api.spotify.com/v1/albums/4OHNH3sDzIxnmUADXzv2kT",
- "id": "4OHNH3sDzIxnmUADXzv2kT",
- "images": [
- {
- "height": 640,
- "url": "https://i.scdn.co/image/ac68a9e4a867ec3ce8249cd90a2d7c73755fb487",
- "width": 629
- },
- {
- "height": 300,
- "url": "https://i.scdn.co/image/d0186ad64df7d6fc5f65c20c7d16f4279ffeb815",
- "width": 295
- },
- {
- "height": 64,
- "url": "https://i.scdn.co/image/7c3ec33d478f5f517eeb5339c2f75f150e4d601e",
- "width": 63
- }
- ],
- "name": "Hot Fuss (Deluxe Version)",
- "type": "album",
- "uri": "spotify:album:4OHNH3sDzIxnmUADXzv2kT"
- },
- "artists": [
- {
- "external_urls": {
- "spotify": "https://open.spotify.com/artist/0C0XlULifJtAgn6ZNCW2eu"
- },
- "href": "https://api.spotify.com/v1/artists/0C0XlULifJtAgn6ZNCW2eu",
- "id": "0C0XlULifJtAgn6ZNCW2eu",
- "name": "The Killers",
- "type": "artist",
- "uri": "spotify:artist:0C0XlULifJtAgn6ZNCW2eu"
- }
- ],
- "available_markets": [
- "AD",
- "AR",
- "AT",
- "AU",
- "BE",
- "BG",
- "BO",
- "BR",
- "CH",
- "CL",
- "CO",
- "CR",
- "CY",
- "CZ",
- "DE",
- "DK",
- "DO",
- "EC",
- "EE",
- "ES",
- "FI",
- "FR",
- "GB",
- "GR",
- "GT",
- "HK",
- "HN",
- "HU",
- "ID",
- "IE",
- "IS",
- "IT",
- "JP",
- "LI",
- "LT",
- "LU",
- "LV",
- "MC",
- "MT",
- "MY",
- "NI",
- "NL",
- "NO",
- "NZ",
- "PA",
- "PE",
- "PH",
- "PL",
- "PT",
- "PY",
- "SE",
- "SG",
- "SK",
- "SV",
- "TR",
- "TW",
- "UY"
- ],
- "disc_number": 1,
- "duration_ms": 197280,
- "explicit": false,
- "external_ids": {
- "isrc": "GBFFP0300054"
- },
- "external_urls": {
- "spotify": "https://open.spotify.com/track/3twNvmDtFQtAd5gMKedhLD"
- },
- "href": "https://api.spotify.com/v1/tracks/3twNvmDtFQtAd5gMKedhLD",
- "id": "3twNvmDtFQtAd5gMKedhLD",
- "name": "Somebody Told Me",
- "popularity": 65,
- "preview_url": "https://p.scdn.co/mp3-preview/34470fdacaec1a5e9265d3d7c00c84804a9b564a",
- "track_number": 4,
- "type": "track",
- "uri": "spotify:track:3twNvmDtFQtAd5gMKedhLD"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/test/fixtures/requests/data/users_profile/GetUsersProfileRequest.json b/src/test/fixtures/requests/data/users_profile/GetUsersProfileRequest.json
deleted file mode 100644
index ea9de308a..000000000
--- a/src/test/fixtures/requests/data/users_profile/GetUsersProfileRequest.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "display_name": "Lilla Namo",
- "external_urls": {
- "spotify": "https://open.spotify.com/user/tuggareutangranser"
- },
- "followers": {
- "href": null,
- "total": 4561
- },
- "href": "https://api.spotify.com/v1/users/tuggareutangranser",
- "id": "tuggareutangranser",
- "images": [
- {
- "height": null,
- "url": "http://profile-images.scdn.co/artists/default/d4f208d4d49c6f3e1363765597d10c4277f5b74f",
- "width": null
- }
- ],
- "type": "user",
- "uri": "spotify:user:tuggareutangranser"
-}
\ No newline at end of file
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/albums/GetAlbumRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/albums/GetAlbumRequestTest.java
index e14a75f1d..3ad5d6f64 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/albums/GetAlbumRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/albums/GetAlbumRequestTest.java
@@ -50,17 +50,12 @@ public void shouldReturnDefault(final Album album) {
album.getAlbumType());
assertNotNull(
album.getArtists());
- assertEquals(
- 57,
- album.getAvailableMarkets().length);
assertEquals(
1,
album.getCopyrights().length);
assertEquals(
"P",
album.getCopyrights()[0].getType().toString());
- assertNotNull(
- album.getExternalIds());
assertNotNull(
album.getExternalUrls());
assertEquals(
@@ -75,14 +70,9 @@ public void shouldReturnDefault(final Album album) {
assertEquals(
3,
album.getImages().length);
- assertNull(
- album.getLabel());
assertEquals(
"She's So Unusual",
album.getName());
- assertEquals(
- 39,
- (int) album.getPopularity());
assertEquals(
"1983",
album.getReleaseDate());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/albums/GetSeveralAlbumsRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/albums/GetSeveralAlbumsRequestTest.java
deleted file mode 100644
index aff3987a3..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/albums/GetSeveralAlbumsRequestTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package se.michaelthelin.spotify.requests.data.albums;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Album;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GetSeveralAlbumsRequestTest extends AbstractDataTest {
-
- private final GetSeveralAlbumsRequest defaultRequest = SPOTIFY_API.getSeveralAlbums(ID_ALBUM, ID_ALBUM)
- .setHttpManager(TestUtil.MockedHttpManager.returningJson("requests/data/albums/GetSeveralAlbumsRequest.json"))
- .build();
-
- private final GetSeveralAlbumsRequest emptyRequest = SPOTIFY_API.getSeveralAlbums(ID_ALBUM, ID_ALBUM)
- .setHttpManager(TestUtil.MockedHttpManager.returningJson("requests/data/albums/GetSeveralAlbumsRequest_None.json"))
- .build();
-
- public GetSeveralAlbumsRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/albums?ids=5zT1JLIj9E57p3e1rFm9Uq%2C5zT1JLIj9E57p3e1rFm9Uq",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final Album[] albums) {
- assertEquals(
- 1,
- albums.length);
- }
-
- @Test
- public void shouldReturnEmpty_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnEmpty(emptyRequest.execute());
- }
-
- @Test
- public void shouldReturnEmpty_async() throws ExecutionException, InterruptedException {
- shouldReturnEmpty(emptyRequest.executeAsync().get());
- }
-
- public void shouldReturnEmpty(final Album[] albums) {
- assertEquals(
- 0,
- albums.length);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistRequestTest.java
index 50e4272c3..189177a7b 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistRequestTest.java
@@ -47,8 +47,6 @@ public void shouldReturnDefault(final Artist artist) {
assertEquals(
"https://open.spotify.com/artist/0OdUWJ0sBjDrqHygGUXeCF",
artist.getExternalUrls().get("spotify"));
- assertNotNull(
- artist.getFollowers());
assertEquals(
"indie folk",
artist.getGenres()[0]);
@@ -64,9 +62,6 @@ public void shouldReturnDefault(final Artist artist) {
assertEquals(
"Band of Horses",
artist.getName());
- assertEquals(
- 59,
- (int) artist.getPopularity());
assertEquals(
ModelObjectType.ARTIST,
artist.getType());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsAlbumsRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsAlbumsRequestTest.java
index c1bd4fde5..51c473bc3 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsAlbumsRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsAlbumsRequestTest.java
@@ -4,7 +4,6 @@
import org.junit.jupiter.api.Test;
import se.michaelthelin.spotify.ITest;
import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.enums.AlbumGroup;
import se.michaelthelin.spotify.enums.AlbumType;
import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
import se.michaelthelin.spotify.model_objects.specification.AlbumSimplified;
@@ -56,9 +55,6 @@ public void shouldReturnDefault(final Paging albumSimplifiedPag
assertEquals(
2,
albumSimplifiedPaging.getItems().length);
- assertEquals(
- AlbumGroup.SINGLE,
- albumSimplifiedPaging.getItems()[0].getAlbumGroup());
assertEquals(
AlbumType.SINGLE,
albumSimplifiedPaging.getItems()[0].getAlbumType());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetSeveralArtistsRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetSeveralArtistsRequestTest.java
deleted file mode 100644
index 599ec618b..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetSeveralArtistsRequestTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package se.michaelthelin.spotify.requests.data.artists;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Artist;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GetSeveralArtistsRequestTest extends AbstractDataTest {
- private final GetSeveralArtistsRequest defaultRequest = ITest.SPOTIFY_API.getSeveralArtists(ITest.ID_ARTIST, ITest.ID_ARTIST)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/artists/GetSeveralArtistsRequest.json"))
- .build();
-
- public GetSeveralArtistsRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/artists?ids=0LcJLqbBmaGUft1e9Mm8HV%2C0LcJLqbBmaGUft1e9Mm8HV",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final Artist[] artists) {
- assertEquals(
- 2,
- artists.length);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetCategoryRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetCategoryRequestTest.java
deleted file mode 100644
index d35cb0839..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetCategoryRequestTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package se.michaelthelin.spotify.requests.data.browse;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Category;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GetCategoryRequestTest extends AbstractDataTest {
- private final GetCategoryRequest defaultRequest = SPOTIFY_API.getCategory(CATEGORY_ID)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/browse/GetCategoryRequest.json"))
- .country(COUNTRY)
- .locale(LOCALE)
- .build();
-
- public GetCategoryRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/browse/categories/dinner?country=SE&locale=sv_SE",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final Category category) {
- assertEquals(
- "https://api.spotify.com/v1/browse/categories/party",
- category.getHref());
- assertEquals(
- 1,
- category.getIcons().length);
- assertEquals(
- "party",
- category.getId());
- assertEquals(
- "Party",
- category.getName());
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetListOfCategoriesRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetListOfCategoriesRequestTest.java
deleted file mode 100644
index 766c9c539..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetListOfCategoriesRequestTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package se.michaelthelin.spotify.requests.data.browse;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Category;
-import se.michaelthelin.spotify.model_objects.specification.Paging;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-public class GetListOfCategoriesRequestTest extends AbstractDataTest> {
- private final GetListOfCategoriesRequest defaultRequest = SPOTIFY_API.getListOfCategories()
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/browse/GetListOfCategoriesRequest.json"))
- .country(COUNTRY)
- .limit(LIMIT)
- .locale(LOCALE)
- .offset(OFFSET)
- .build();
-
- public GetListOfCategoriesRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/browse/categories?country=SE&limit=10&locale=sv_SE&offset=0",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final Paging categoryPaging) {
- assertEquals(
- "https://api.spotify.com/v1/browse/categories?offset=0&limit=20",
- categoryPaging.getHref());
- assertEquals(
- 5,
- categoryPaging.getItems().length);
- assertEquals(
- 20,
- (int) categoryPaging.getLimit());
- assertEquals(
- "https://api.spotify.com/v1/browse/categories?offset=20&limit=20",
- categoryPaging.getNext());
- assertEquals(
- 0,
- (int) categoryPaging.getOffset());
- assertNull(
- categoryPaging.getPrevious());
- assertEquals(
- 31,
- (int) categoryPaging.getTotal());
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetListOfNewReleasesRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetListOfNewReleasesRequestTest.java
deleted file mode 100644
index addba1d09..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/browse/GetListOfNewReleasesRequestTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package se.michaelthelin.spotify.requests.data.browse;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.AlbumSimplified;
-import se.michaelthelin.spotify.model_objects.specification.Paging;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-public class GetListOfNewReleasesRequestTest extends AbstractDataTest> {
- private final GetListOfNewReleasesRequest defaultRequest = SPOTIFY_API.getListOfNewReleases()
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/browse/GetListOfNewReleasesRequest.json"))
- .country(COUNTRY)
- .limit(LIMIT)
- .offset(OFFSET)
- .build();
-
- public GetListOfNewReleasesRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/browse/new-releases?country=SE&limit=10&offset=0",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final Paging albumSimplifiedPaging) {
- assertEquals(
- "https://api.spotify.com/v1/browse/new-releases?country=SE&offset=0&limit=20",
- albumSimplifiedPaging.getHref());
- assertEquals(
- 2,
- albumSimplifiedPaging.getItems().length);
- assertEquals(
- 20,
- (int) albumSimplifiedPaging.getLimit());
- assertEquals(
- "https://api.spotify.com/v1/browse/new-releases?country=SE&offset=20&limit=20",
- albumSimplifiedPaging.getNext());
- assertEquals(
- 0,
- (int) albumSimplifiedPaging.getOffset());
- assertNull(
- albumSimplifiedPaging.getPrevious());
- assertEquals(
- 500,
- (int) albumSimplifiedPaging.getTotal());
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/episodes/GetSeveralEpisodesRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/episodes/GetSeveralEpisodesRequestTest.java
deleted file mode 100644
index 5167e8b19..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/episodes/GetSeveralEpisodesRequestTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package se.michaelthelin.spotify.requests.data.episodes;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Episode;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GetSeveralEpisodesRequestTest extends AbstractDataTest {
- private final GetSeveralEpisodesRequest defaultRequest = ITest.SPOTIFY_API
- .getSeveralEpisodes(ITest.ID_EPISODE, ITest.ID_EPISODE)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/episodes/GetSeveralEpisodesRequest.json"))
- .market(ITest.MARKET)
- .build();
-
- public GetSeveralEpisodesRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/episodes?ids=4GI3dxEafwap1sFiTGPKd1%2C4GI3dxEafwap1sFiTGPKd1&market=SE",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final Episode[] episodes) {
- assertEquals(
- 2,
- episodes.length);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveAlbumsForCurrentUserRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveAlbumsForCurrentUserRequestTest.java
deleted file mode 100644
index 79e8e472f..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveAlbumsForCurrentUserRequestTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class RemoveAlbumsForCurrentUserRequestTest extends AbstractDataTest {
- private final RemoveAlbumsForCurrentUserRequest defaultRequest = ITest.SPOTIFY_API
- .removeAlbumsForCurrentUser(ITest.ID_ALBUM, ITest.ID_ALBUM)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
- private final RemoveAlbumsForCurrentUserRequest bodyRequest = ITest.SPOTIFY_API
- .removeAlbumsForCurrentUser(ITest.ALBUMS)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
-
- public RemoveAlbumsForCurrentUserRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/albums?ids=5zT1JLIj9E57p3e1rFm9Uq%2C5zT1JLIj9E57p3e1rFm9Uq",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(bodyRequest,
- "ids",
- ITest.ALBUMS);
- assertEquals("https://api.spotify.com:443/v1/me/albums",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/tracks/GetSeveralTracksRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveFromLibraryRequestTest.java
similarity index 58%
rename from src/test/java/se/michaelthelin/spotify/requests/data/tracks/GetSeveralTracksRequestTest.java
rename to src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveFromLibraryRequestTest.java
index 0a27f99c9..b5aa9e156 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/tracks/GetSeveralTracksRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveFromLibraryRequestTest.java
@@ -1,35 +1,32 @@
-package se.michaelthelin.spotify.requests.data.tracks;
+package se.michaelthelin.spotify.requests.data.library;
import org.apache.hc.core5.http.ParseException;
import org.junit.jupiter.api.Test;
import se.michaelthelin.spotify.ITest;
import se.michaelthelin.spotify.TestUtil;
import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Track;
import se.michaelthelin.spotify.requests.data.AbstractDataTest;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-public class GetSeveralTracksRequestTest extends AbstractDataTest {
- private final GetSeveralTracksRequest defaultRequest = ITest.SPOTIFY_API
- .getSeveralTracks(ITest.ID_TRACK)
+public class RemoveFromLibraryRequestTest extends AbstractDataTest {
+ private final RemoveFromLibraryRequest defaultRequest = ITest.SPOTIFY_API.removeFromLibrary(ITest.URIS)
.setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/tracks/GetSeveralTracksRequest.json"))
- .market(ITest.MARKET)
+ TestUtil.MockedHttpManager.returningJson(null))
.build();
- public GetSeveralTracksRequestTest() throws Exception {
+ public RemoveFromLibraryRequestTest() throws Exception {
}
@Test
public void shouldComplyWithReference() {
assertHasAuthorizationHeader(defaultRequest);
assertEquals(
- "https://api.spotify.com:443/v1/tracks?ids=01iyCAUm8EvOFqVWYJ3dVX&market=SE",
+ "https://api.spotify.com:443/v1/me/library",
defaultRequest.getUri().toString());
}
@@ -43,9 +40,7 @@ public void shouldReturnDefault_async() throws ExecutionException, InterruptedEx
shouldReturnDefault(defaultRequest.executeAsync().get());
}
- public void shouldReturnDefault(final Track[] tracks) {
- assertEquals(
- 2,
- tracks.length);
+ public void shouldReturnDefault(final String string) {
+ assertNull(string);
}
}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedEpisodesRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedEpisodesRequestTest.java
deleted file mode 100644
index 50853595c..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedEpisodesRequestTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class RemoveUsersSavedEpisodesRequestTest extends AbstractDataTest {
- private final RemoveUsersSavedEpisodesRequest defaultRequest = ITest.SPOTIFY_API
- .removeUsersSavedEpisodes(ITest.ID_EPISODE, ITest.ID_EPISODE)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
- private final RemoveUsersSavedEpisodesRequest bodyRequest = ITest.SPOTIFY_API
- .removeUsersSavedEpisodes(ITest.EPISODES)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
-
- public RemoveUsersSavedEpisodesRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/episodes?ids=4GI3dxEafwap1sFiTGPKd1%2C4GI3dxEafwap1sFiTGPKd1",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(bodyRequest,
- "ids",
- ITest.EPISODES);
- assertEquals("https://api.spotify.com:443/v1/me/episodes",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedShowsRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedShowsRequestTest.java
deleted file mode 100644
index e0c7712be..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedShowsRequestTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class RemoveUsersSavedShowsRequestTest extends AbstractDataTest {
- private final RemoveUsersSavedShowsRequest defaultRequest = ITest.SPOTIFY_API
- .removeUsersSavedShows(ITest.ID_SHOW, ITest.ID_SHOW)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .market(ITest.MARKET)
- .build();
- private final RemoveUsersSavedShowsRequest bodyRequest = ITest.SPOTIFY_API
- .removeUsersSavedShows(ITest.SHOWS)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .market(ITest.MARKET)
- .build();
-
- public RemoveUsersSavedShowsRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/shows?ids=5AvwZVawapvyhJUIx71pdJ%2C5AvwZVawapvyhJUIx71pdJ&market=SE",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(bodyRequest,
- "ids",
- ITest.SHOWS);
- assertEquals("https://api.spotify.com:443/v1/me/shows?market=SE",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedTracksRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedTracksRequestTest.java
deleted file mode 100644
index e3d44bdcc..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/RemoveUsersSavedTracksRequestTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class RemoveUsersSavedTracksRequestTest extends AbstractDataTest {
- private final RemoveUsersSavedTracksRequest defaultRequest = ITest.SPOTIFY_API
- .removeUsersSavedTracks(ITest.ID_TRACK, ITest.ID_TRACK)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
- private final RemoveUsersSavedTracksRequest bodyRequest = ITest.SPOTIFY_API
- .removeUsersSavedTracks(ITest.TRACKS)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
-
- public RemoveUsersSavedTracksRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/tracks?ids=01iyCAUm8EvOFqVWYJ3dVX%2C01iyCAUm8EvOFqVWYJ3dVX",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(bodyRequest,
- "ids",
- ITest.TRACKS);
- assertEquals("https://api.spotify.com:443/v1/me/tracks",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveAlbumsForCurrentUserRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveAlbumsForCurrentUserRequestTest.java
deleted file mode 100644
index e97102dc1..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveAlbumsForCurrentUserRequestTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class SaveAlbumsForCurrentUserRequestTest extends AbstractDataTest {
- private final SaveAlbumsForCurrentUserRequest defaultRequest = ITest.SPOTIFY_API
- .saveAlbumsForCurrentUser(ITest.ID_ALBUM, ITest.ID_ALBUM)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
- private final SaveAlbumsForCurrentUserRequest bodyRequest = ITest.SPOTIFY_API
- .saveAlbumsForCurrentUser(ITest.ALBUMS.getAsJsonArray())
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
-
- public SaveAlbumsForCurrentUserRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/albums?ids=5zT1JLIj9E57p3e1rFm9Uq%2C5zT1JLIj9E57p3e1rFm9Uq",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(
- bodyRequest,
- "ids",
- ITest.ALBUMS);
- assertEquals(
- "https://api.spotify.com:443/v1/me/albums",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveEpisodesForCurrentUserRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveEpisodesForCurrentUserRequestTest.java
deleted file mode 100644
index 424df69de..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveEpisodesForCurrentUserRequestTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class SaveEpisodesForCurrentUserRequestTest extends AbstractDataTest {
- private final SaveEpisodesForCurrentUserRequest defaultRequest = ITest.SPOTIFY_API
- .saveEpisodesForCurrentUser(ITest.ID_EPISODE, ITest.ID_EPISODE)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
- private final SaveEpisodesForCurrentUserRequest bodyRequest = ITest.SPOTIFY_API
- .saveEpisodesForCurrentUser(ITest.EPISODES)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
-
- public SaveEpisodesForCurrentUserRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/episodes?ids=4GI3dxEafwap1sFiTGPKd1%2C4GI3dxEafwap1sFiTGPKd1",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(bodyRequest,
- "ids",
- ITest.EPISODES);
- assertEquals("https://api.spotify.com:443/v1/me/episodes",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveShowsForCurrentUserRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveShowsForCurrentUserRequestTest.java
deleted file mode 100644
index ab208bc99..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveShowsForCurrentUserRequestTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class SaveShowsForCurrentUserRequestTest extends AbstractDataTest {
- private final SaveShowsForCurrentUserRequest defaultRequest = ITest.SPOTIFY_API
- .saveShowsForCurrentUser(ITest.ID_SHOW, ITest.ID_SHOW)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
- private final SaveShowsForCurrentUserRequest bodyRequest = ITest.SPOTIFY_API
- .saveShowsForCurrentUser(ITest.SHOWS)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
-
- public SaveShowsForCurrentUserRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/shows?ids=5AvwZVawapvyhJUIx71pdJ%2C5AvwZVawapvyhJUIx71pdJ",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(bodyRequest,
- "ids",
- ITest.SHOWS);
- assertEquals("https://api.spotify.com:443/v1/me/shows",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsTopTracksRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveToLibraryRequestTest.java
similarity index 58%
rename from src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsTopTracksRequestTest.java
rename to src/test/java/se/michaelthelin/spotify/requests/data/library/SaveToLibraryRequestTest.java
index 2e43b31f9..ae7413479 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/artists/GetArtistsTopTracksRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveToLibraryRequestTest.java
@@ -1,33 +1,32 @@
-package se.michaelthelin.spotify.requests.data.artists;
+package se.michaelthelin.spotify.requests.data.library;
import org.apache.hc.core5.http.ParseException;
import org.junit.jupiter.api.Test;
import se.michaelthelin.spotify.ITest;
import se.michaelthelin.spotify.TestUtil;
import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Track;
import se.michaelthelin.spotify.requests.data.AbstractDataTest;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
-public class GetArtistsTopTracksRequestTest extends AbstractDataTest {
- private final GetArtistsTopTracksRequest defaultRequest = ITest.SPOTIFY_API.getArtistsTopTracks(ITest.ID_ARTIST, ITest.COUNTRY)
+public class SaveToLibraryRequestTest extends AbstractDataTest {
+ private final SaveToLibraryRequest defaultRequest = ITest.SPOTIFY_API.saveToLibrary(ITest.URIS)
.setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/artists/GetArtistsTopTracksRequest.json"))
+ TestUtil.MockedHttpManager.returningJson(null))
.build();
- public GetArtistsTopTracksRequestTest() throws Exception {
+ public SaveToLibraryRequestTest() throws Exception {
}
@Test
public void shouldComplyWithReference() {
assertHasAuthorizationHeader(defaultRequest);
assertEquals(
- "https://api.spotify.com:443/v1/artists/0LcJLqbBmaGUft1e9Mm8HV/top-tracks?country=SE",
+ "https://api.spotify.com:443/v1/me/library",
defaultRequest.getUri().toString());
}
@@ -41,9 +40,7 @@ public void shouldReturnDefault_async() throws ExecutionException, InterruptedEx
shouldReturnDefault(defaultRequest.executeAsync().get());
}
- public void shouldReturnDefault(final Track[] tracks) {
- assertEquals(
- 1,
- tracks.length);
+ public void shouldReturnDefault(final String string) {
+ assertNull(string);
}
}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveTracksForUserRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveTracksForUserRequestTest.java
deleted file mode 100644
index cdd67ef07..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/library/SaveTracksForUserRequestTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package se.michaelthelin.spotify.requests.data.library;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static se.michaelthelin.spotify.Assertions.assertHasBodyParameter;
-import static se.michaelthelin.spotify.Assertions.assertHasHeader;
-
-public class SaveTracksForUserRequestTest extends AbstractDataTest {
- private final SaveTracksForUserRequest defaultRequest = ITest.SPOTIFY_API
- .saveTracksForUser(ITest.ID_TRACK, ITest.ID_TRACK)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
- private final SaveTracksForUserRequest bodyRequest = ITest.SPOTIFY_API
- .saveTracksForUser(ITest.TRACKS)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(null))
- .build();
-
- public SaveTracksForUserRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/me/tracks?ids=01iyCAUm8EvOFqVWYJ3dVX%2C01iyCAUm8EvOFqVWYJ3dVX",
- defaultRequest.getUri().toString());
-
- assertHasAuthorizationHeader(bodyRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(
- bodyRequest,
- "ids",
- ITest.TRACKS);
- assertEquals(
- "https://api.spotify.com:443/v1/me/tracks",
- bodyRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final String string) {
- assertNull(
- string);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequestNumericStringTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequestNumericStringTest.java
deleted file mode 100644
index 80b3b6d05..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequestNumericStringTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package se.michaelthelin.spotify.requests.data.playlists;
-
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.SpotifyApi;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Test for ensuring numeric strings are preserved as strings in JSON request bodies
- */
-public class CreatePlaylistRequestNumericStringTest {
-
- @Test
- public void shouldPreserveNumericStringsAsStrings() {
- // Create a request with numeric strings for name and description
- CreatePlaylistRequest request = new SpotifyApi.Builder()
- .setAccessToken("test-token")
- .build()
- .createPlaylist("testuser", "2025")
- .description("2025")
- .build();
-
- // Generate the JSON body
- String json = request.bodyParametersToJson(request.getBodyParameters());
-
- // The JSON should contain quoted strings, not numbers
- assertTrue(json.contains("\"name\":\"2025\""),
- "Name should be a quoted string, not a number. Actual JSON: " + json);
- assertTrue(json.contains("\"description\":\"2025\""),
- "Description should be a quoted string, not a number. Actual JSON: " + json);
-
- // Should NOT contain unquoted numbers
- assertFalse(json.contains("\"name\":2025"),
- "Name should not be an unquoted number. Actual JSON: " + json);
- assertFalse(json.contains("\"description\":2025"),
- "Description should not be an unquoted number. Actual JSON: " + json);
- }
-
- @Test
- public void shouldPreserveMixedTypesCorrectly() {
- // Test various edge cases
- CreatePlaylistRequest request = new SpotifyApi.Builder()
- .setAccessToken("test-token")
- .build()
- .createPlaylist("testuser", "123.45") // decimal number as string
- .description("abc123") // mixed alphanumeric
- .build();
-
- String json = request.bodyParametersToJson(request.getBodyParameters());
-
- // Both should remain as strings
- assertTrue(json.contains("\"name\":\"123.45\""),
- "Decimal number string should remain quoted. Actual JSON: " + json);
- assertTrue(json.contains("\"description\":\"abc123\""),
- "Mixed alphanumeric should remain quoted. Actual JSON: " + json);
- }
-
- @Test
- public void shouldPreserveEmptyAndNullLikeStrings() {
- CreatePlaylistRequest request = new SpotifyApi.Builder()
- .setAccessToken("test-token")
- .build()
- .createPlaylist("testuser", "null")
- .description("true")
- .build();
-
- String json = request.bodyParametersToJson(request.getBodyParameters());
-
- // Should remain as quoted strings, not become null/boolean literals
- assertTrue(json.contains("\"name\":\"null\""),
- "String 'null' should remain quoted. Actual JSON: " + json);
- assertTrue(json.contains("\"description\":\"true\""),
- "String 'true' should remain quoted. Actual JSON: " + json);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequestTest.java
deleted file mode 100644
index c3ae7f16d..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/CreatePlaylistRequestTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package se.michaelthelin.spotify.requests.data.playlists;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.enums.ModelObjectType;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Playlist;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static se.michaelthelin.spotify.Assertions.*;
-
-public class CreatePlaylistRequestTest extends AbstractDataTest {
- private final CreatePlaylistRequest defaultRequest = ITest.SPOTIFY_API
- .createPlaylist(ITest.ID_USER, ITest.NAME)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/playlists/CreatePlaylistRequest.json"))
- .collaborative(ITest.COLLABORATIVE)
- .description(ITest.DESCRIPTION)
- .public_(ITest.PUBLIC)
- .build();
-
- public CreatePlaylistRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertHasHeader(defaultRequest, "Content-Type", "application/json");
- assertHasBodyParameter(
- defaultRequest,
- "name",
- ITest.NAME);
- assertHasBodyParameter(
- defaultRequest,
- "public",
- ITest.PUBLIC);
- assertHasBodyParameter(
- defaultRequest,
- "collaborative",
- ITest.COLLABORATIVE);
- assertHasBodyParameter(
- defaultRequest,
- "description",
- ITest.DESCRIPTION);
- assertEquals(
- "https://api.spotify.com:443/v1/users/abbaspotify/playlists",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final Playlist playlist) {
- assertFalse(
- playlist.getIsCollaborative());
- assertNull(
- playlist.getDescription());
- assertNotNull(
- playlist.getExternalUrls());
- assertNotNull(
- playlist.getFollowers());
- assertEquals(
- "https://api.spotify.com/v1/users/thelinmichael/playlists/7d2D2S200NyUE5KYs80PwO",
- playlist.getHref());
- assertEquals(
- "7d2D2S200NyUE5KYs80PwO",
- playlist.getId());
- assertEquals(
- 0,
- playlist.getImages().length);
- assertEquals(
- "A New Playlist",
- playlist.getName());
- assertNotNull(
- playlist.getOwner());
- assertFalse(
- playlist.getIsPublicAccess());
- assertEquals(
- "s0o3TSuYnRLl2jch+oA4OEbKwq/fNxhGBkSPnvhZdmWjNV0q3uCAWuGIhEx8SHIx",
- playlist.getSnapshotId());
- assertNotNull(
- playlist.getTracks());
- assertEquals(
- ModelObjectType.PLAYLIST,
- playlist.getType());
- assertEquals(
- "spotify:user:thelinmichael:playlist:7d2D2S200NyUE5KYs80PwO",
- playlist.getUri());
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetListOfUsersPlaylistsRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetListOfUsersPlaylistsRequestTest.java
deleted file mode 100644
index e0fedbfb9..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetListOfUsersPlaylistsRequestTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package se.michaelthelin.spotify.requests.data.playlists;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.Paging;
-import se.michaelthelin.spotify.model_objects.specification.PlaylistSimplified;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-public class GetListOfUsersPlaylistsRequestTest extends AbstractDataTest> {
- private final GetListOfUsersPlaylistsRequest defaultRequest = ITest.SPOTIFY_API
- .getListOfUsersPlaylists(ITest.ID_USER)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/playlists/GetListOfUsersPlaylistsRequest.json"))
- .limit(ITest.LIMIT)
- .offset(ITest.OFFSET)
- .build();
-
- private final GetListOfUsersPlaylistsRequest requestWithUserIdWithSymbol$ = ITest.SPOTIFY_API
- .getListOfUsersPlaylists(ITest.ID_USER_WITH_$)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/playlists/GetListOfUsersPlaylistsRequest_UserWith$.json"))
- .limit(ITest.LIMIT)
- .offset(ITest.OFFSET)
- .build();
-
- public GetListOfUsersPlaylistsRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/users/abbaspotify/playlists?limit=10&offset=0",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- @Test
- public void shouldReturnDefaultFor_UserId_With_$_async() throws ExecutionException, InterruptedException {
- Paging playlistSimplifiedPaging = requestWithUserIdWithSymbol$.executeAsync().get();
- assertEquals(
- "https://api.spotify.com/v1/users/%24wizzler%24/playlists",
- playlistSimplifiedPaging.getHref());
- assertEquals(
- 2,
- playlistSimplifiedPaging.getItems().length);
- assertEquals(
- 9,
- (int) playlistSimplifiedPaging.getLimit());
- assertNull(
- playlistSimplifiedPaging.getNext());
- assertEquals(
- 0,
- (int) playlistSimplifiedPaging.getOffset());
- assertNull(
- playlistSimplifiedPaging.getPrevious());
- assertEquals(
- 9,
- (int) playlistSimplifiedPaging.getTotal());
- }
-
- public void shouldReturnDefault(final Paging playlistSimplifiedPaging) {
- assertEquals(
- "https://api.spotify.com/v1/users/wizzler/playlists",
- playlistSimplifiedPaging.getHref());
- assertEquals(
- 2,
- playlistSimplifiedPaging.getItems().length);
- assertEquals(
- 9,
- (int) playlistSimplifiedPaging.getLimit());
- assertNull(
- playlistSimplifiedPaging.getNext());
- assertEquals(
- 0,
- (int) playlistSimplifiedPaging.getOffset());
- assertNull(
- playlistSimplifiedPaging.getPrevious());
- assertEquals(
- 9,
- (int) playlistSimplifiedPaging.getTotal());
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistRequestTest.java
index ca8a7781f..10b891a61 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistRequestTest.java
@@ -133,7 +133,7 @@ public void shouldReturnDefault(final Playlist playlist) {
"bNLWdmhh+HDsbHzhckXeDC0uyKyg4FjPI/KEsKjAE526usnz2LxwgyBoMShVL+z+",
playlist.getSnapshotId());
assertNotNull(
- playlist.getTracks());
+ playlist.getItems());
assertEquals(
ModelObjectType.PLAYLIST,
playlist.getType());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistsItemsRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistsItemsRequestTest.java
index f6d1c322a..db6fc1244 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistsItemsRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/playlists/GetPlaylistsItemsRequestTest.java
@@ -71,7 +71,7 @@ public void shouldReturnDefault(final Paging playlistTrackPaging)
playlistTrackPaging.getItems().length);
assertInstanceOf(
Track.class,
- playlistTrackPaging.getItems()[0].getTrack());
+ playlistTrackPaging.getItems()[0].getItem());
assertEquals(
100,
(int) playlistTrackPaging.getLimit());
@@ -106,7 +106,7 @@ public void shouldReturnDefaultEpisode(final Paging playlistTrack
playlistTrackPaging.getItems().length);
assertInstanceOf(
Episode.class,
- playlistTrackPaging.getItems()[0].getTrack());
+ playlistTrackPaging.getItems()[0].getItem());
assertEquals(
100,
(int) playlistTrackPaging.getLimit());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/shows/GetSeveralShowsRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/shows/GetSeveralShowsRequestTest.java
deleted file mode 100644
index b8390b855..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/shows/GetSeveralShowsRequestTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package se.michaelthelin.spotify.requests.data.shows;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.ShowSimplified;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class GetSeveralShowsRequestTest extends AbstractDataTest {
-
- private final GetSeveralShowsRequest defaultRequest = SPOTIFY_API.getSeveralShows(ID_SHOW, ID_SHOW)
- .setHttpManager(TestUtil.MockedHttpManager.returningJson("requests/data/shows/GetSeveralShowsRequest.json"))
- .build();
-
- public GetSeveralShowsRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- "https://api.spotify.com:443/v1/shows?ids=5AvwZVawapvyhJUIx71pdJ%2C5AvwZVawapvyhJUIx71pdJ",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final ShowSimplified[] shows) {
- assertEquals(
- 2,
- shows.length);
- }
-}
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/shows/GetShowRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/shows/GetShowRequestTest.java
index 10c25e4eb..c40e7c583 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/shows/GetShowRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/shows/GetShowRequestTest.java
@@ -43,9 +43,6 @@ public void shouldReturnDefault_async() throws ExecutionException, InterruptedEx
}
public void shouldReturnDefault(final Show show) {
- assertEquals(
- 77,
- show.getAvailableMarkets().length);
assertEquals(
0,
show.getCopyrights().length);
@@ -81,9 +78,6 @@ public void shouldReturnDefault(final Show show) {
assertEquals(
"Acht Milliarden – Der Auslands-Podcast",
show.getName());
- assertEquals(
- "DER SPIEGEL",
- show.getPublisher());
assertEquals(
ModelObjectType.SHOW,
show.getType());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequestTest.java
index 592288b38..08c5afa71 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequestTest.java
@@ -51,9 +51,6 @@ public void shouldReturnDefault(final Track track) {
assertNotNull(
track.getArtists(),
"");
- assertEquals(
- 57,
- track.getAvailableMarkets().length);
assertEquals(
1,
(int) track.getDiscNumber());
@@ -62,8 +59,6 @@ public void shouldReturnDefault(final Track track) {
(int) track.getDurationMs());
assertFalse(
track.getIsExplicit());
- assertNotNull(
- track.getExternalIds());
assertNotNull(
track.getExternalUrls());
assertEquals(
@@ -75,9 +70,6 @@ public void shouldReturnDefault(final Track track) {
assertEquals(
"Mr. Brightside",
track.getName());
- assertEquals(
- 73,
- (int) track.getPopularity());
assertEquals(
"https://p.scdn.co/mp3-preview/4839b070015ab7d6de9fec1756e1f3096d908fba",
track.getPreviewUrl());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/users_profile/GetCurrentUsersProfileRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/users_profile/GetCurrentUsersProfileRequestTest.java
index 6f84d946c..6efe4b424 100644
--- a/src/test/java/se/michaelthelin/spotify/requests/data/users_profile/GetCurrentUsersProfileRequestTest.java
+++ b/src/test/java/se/michaelthelin/spotify/requests/data/users_profile/GetCurrentUsersProfileRequestTest.java
@@ -1,12 +1,10 @@
package se.michaelthelin.spotify.requests.data.users_profile;
-import com.neovisionaries.i18n.CountryCode;
import org.apache.hc.core5.http.ParseException;
import org.junit.jupiter.api.Test;
import se.michaelthelin.spotify.ITest;
import se.michaelthelin.spotify.TestUtil;
import se.michaelthelin.spotify.enums.ModelObjectType;
-import se.michaelthelin.spotify.enums.ProductType;
import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
import se.michaelthelin.spotify.model_objects.specification.User;
import se.michaelthelin.spotify.requests.data.AbstractDataTest;
@@ -50,19 +48,11 @@ public void shouldReturnDefault(final User user) {
assertEquals(
"1937-06-01",
user.getBirthdate());
- assertEquals(
- CountryCode.SE,
- user.getCountry());
assertEquals(
"JM Wizzler",
user.getDisplayName());
- assertEquals(
- "email@example.com",
- user.getEmail());
assertNotNull(
user.getExternalUrls());
- assertNotNull(
- user.getFollowers());
assertEquals(
"https://api.spotify.com/v1/users/wizzler",
user.getHref());
@@ -72,9 +62,6 @@ public void shouldReturnDefault(final User user) {
assertEquals(
1,
user.getImages().length);
- assertEquals(
- ProductType.PREMIUM,
- user.getProduct());
assertEquals(
ModelObjectType.USER,
user.getType());
diff --git a/src/test/java/se/michaelthelin/spotify/requests/data/users_profile/GetUsersProfileRequestTest.java b/src/test/java/se/michaelthelin/spotify/requests/data/users_profile/GetUsersProfileRequestTest.java
deleted file mode 100644
index 7e527f6e7..000000000
--- a/src/test/java/se/michaelthelin/spotify/requests/data/users_profile/GetUsersProfileRequestTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package se.michaelthelin.spotify.requests.data.users_profile;
-
-import org.apache.hc.core5.http.ParseException;
-import org.junit.jupiter.api.Test;
-import se.michaelthelin.spotify.ITest;
-import se.michaelthelin.spotify.TestUtil;
-import se.michaelthelin.spotify.enums.ModelObjectType;
-import se.michaelthelin.spotify.exceptions.SpotifyWebApiException;
-import se.michaelthelin.spotify.model_objects.specification.User;
-import se.michaelthelin.spotify.requests.data.AbstractDataTest;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class GetUsersProfileRequestTest extends AbstractDataTest {
- private final GetUsersProfileRequest defaultRequest = ITest.SPOTIFY_API
- .getUsersProfile(ITest.ID_USER_NON_ASCII)
- .setHttpManager(
- TestUtil.MockedHttpManager.returningJson(
- "requests/data/users_profile/GetUsersProfileRequest.json"))
- .build();
-
- public GetUsersProfileRequestTest() throws Exception {
- }
-
- @Test
- public void shouldComplyWithReference() {
- assertHasAuthorizationHeader(defaultRequest);
- assertEquals(
- // Yes, ABBA is not spelled that way ;)
- // But it should be ensured non-ASCII characters are handled properly as well.
- // Therefore, "abbaspötify" is used instead of "abbaspotify".
- // "abbaspötify" should become abbasp%C3%B6tify after URL encoding.
- // These characters do exist, for example there are plenty of them in the German speaking area,
- // they are used in profile names and Spotify permits them.
- // Additionally, the URL encoding is not only applied to non-ASCII characters as the set of characters allowed to be used in an URL
- // is just a subset of ASCII.
- // Only used ids and category ids are prone to this as the other ids used by spotify are Base62 encoded and
- // therefore do not contain characters requiring to be encoded via Percent/URL encoding.
- "https://api.spotify.com:443/v1/users/abbasp%C3%B6tify",
- defaultRequest.getUri().toString());
- }
-
- @Test
- public void shouldReturnDefault_sync() throws IOException, SpotifyWebApiException, ParseException {
- shouldReturnDefault(defaultRequest.execute());
- }
-
- @Test
- public void shouldReturnDefault_async() throws ExecutionException, InterruptedException {
- shouldReturnDefault(defaultRequest.executeAsync().get());
- }
-
- public void shouldReturnDefault(final User user) {
- assertEquals(
- "Lilla Namo",
- user.getDisplayName());
- assertNotNull(
- user.getExternalUrls());
- assertNotNull(
- user.getFollowers());
- assertEquals(
- "https://api.spotify.com/v1/users/tuggareutangranser",
- user.getHref());
- assertEquals(
- "tuggareutangranser",
- user.getId());
- assertEquals(
- 1,
- user.getImages().length);
- assertEquals(
- ModelObjectType.USER,
- user.getType());
- assertEquals(
- "spotify:user:tuggareutangranser",
- user.getUri());
- }
-}
From fbec5b99bc7a237c2860c5039c2a40c5c61472e4 Mon Sep 17 00:00:00 2001
From: Jonas Thelemann
Date: Wed, 11 Feb 2026 16:45:41 +0100
Subject: [PATCH 27/29] chore(track): correct javadoc comment
---
.../spotify/requests/data/tracks/GetTrackRequest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequest.java b/src/main/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequest.java
index 27c408ad0..7a1759585 100644
--- a/src/main/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequest.java
+++ b/src/main/java/se/michaelthelin/spotify/requests/data/tracks/GetTrackRequest.java
@@ -70,7 +70,7 @@ public Builder id(final String id) {
*
* @param market Optional. An ISO 3166-1 alpha-2 country code. Provide this
* parameter if you want to apply Track Relinking.
- * @return A {@link GetSeveralTracksRequest.Builder}.
+ * @return A {@link GetTrackRequest.Builder}.
* @see Wikipedia: ISO 3166-1 alpha-2 country codes
* @see Spotify: Track Relinking Guide
*/
From 786623b4a4967f8bd5f6be03b243482fe6f312e9 Mon Sep 17 00:00:00 2001
From: Jonas Thelemann
Date: Wed, 11 Feb 2026 17:01:08 +0100
Subject: [PATCH 28/29] ci: update signing key
---
.github/workflows/ci.yml | 2 +-
ci/.m2.settings.xml | 1 -
ci/README.md | 3 +--
ci/codesigning.asc.enc | Bin 16490 -> 16397 bytes
pom.xml | 6 ++++++
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ade9eec7c..61ca8b462 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
env:
GPG_KEY_NAME: B70E1EAC
GPG_PASSPHRASE_FILE: ${{ secrets.GPG_PASSPHRASE_FILE }}
- GPG_PASSPHRASE_KEY: ${{ secrets.GPG_PASSPHRASE_KEY }}
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE_KEY }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
run: |
diff --git a/ci/.m2.settings.xml b/ci/.m2.settings.xml
index 5923dd548..0e6935617 100644
--- a/ci/.m2.settings.xml
+++ b/ci/.m2.settings.xml
@@ -15,7 +15,6 @@
${env.GPG_KEY_NAME}
- ${env.GPG_PASSPHRASE_KEY}
diff --git a/ci/README.md b/ci/README.md
index f49ff1b12..4c805cb08 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -3,7 +3,6 @@ How to update the `codesigning.asc.enc`:
```shell
gpg --export --armor your@email.com > codesigning.asc
gpg --export-secret-keys --armor your@email.com >> codesigning.asc
-gpg --output codesigning.asc.enc --symmetric --cipher-algo AES256 codesigning.asc
-# protect using $GPG_PASSPHRASE_FILE, not the secret subkey's passphrase
+gpg --output codesigning.asc.enc --symmetric --cipher-algo AES256 codesigning.asc # protect using $GPG_PASSPHRASE_FILE, not the secret subkey's passphrase
shred --remove codesigning.asc
```
diff --git a/ci/codesigning.asc.enc b/ci/codesigning.asc.enc
index f2a4ce6021320a250a48671b8e4c284aba2d914e..5738a11d8d7abe74463618a4006dcc3b985dae2c 100644
GIT binary patch
literal 16397
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
literal 16490
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
z