Updated market naming to country

Gruncan · Gruncan · commit eb97b23ecc67 · 2023-04-21T09:35:38.000+01:00
diff --git a/src/main/java/com/spotify/objects/albums/Album.java b/src/main/java/com/spotify/objects/albums/Album.java
@@ -4,7 +4,7 @@
 import com.spotify.objects.SpotifyObject;
 import com.spotify.objects.SpotifyOptional;
 import com.spotify.objects.artists.SimplifiedArtist;
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.objects.wrappers.SpotifyCopyright;
 import com.spotify.objects.wrappers.SpotifyExternalID;
 import com.spotify.objects.wrappers.SpotifyImage;
@@ -26,7 +26,7 @@ public class Album implements SpotifyObject {
 
     @SpotifyOptional
     @SpotifyField("available_markets")
-    private Market[] markets;
+    private Country[] markets;
 
     @SpotifyField(value = "spotify", path = {"external_urls"})
     private String externalIDs;
diff --git a/src/main/java/com/spotify/objects/tracks/Track.java b/src/main/java/com/spotify/objects/tracks/Track.java
@@ -5,7 +5,7 @@
 import com.spotify.objects.SpotifyOptional;
 import com.spotify.objects.albums.Album;
 import com.spotify.objects.artists.Artist;
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.objects.wrappers.SpotifyExternalID;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,7 +27,7 @@ public class Track implements SpotifyObject {
 
     @SpotifyOptional
     @SpotifyField("available_markets")
-    private Market[] markets;
+    private Country[] markets;
 
     @SpotifyOptional
     @SpotifyField("disc_number")
diff --git a/src/main/java/com/spotify/objects/wrappers/Country.java b/src/main/java/com/spotify/objects/wrappers/Country.java
@@ -7,7 +7,7 @@
  * Represents the available query market codes according to
  * <a href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO_3166-1_alpha-2</a>
  */
-public enum Market implements SpotifyObject {
+public enum Country implements SpotifyObject {
 
     /*** Afghanistan */
     AF("Afghanistan"),
@@ -513,7 +513,7 @@ public enum Market implements SpotifyObject {
 
     private final String name;
 
-    Market(String name) {
+    Country(String name) {
         this.name = name;
     }
 
diff --git a/src/main/java/com/spotify/requests/albums/AlbumGet.java b/src/main/java/com/spotify/requests/albums/AlbumGet.java
@@ -2,7 +2,7 @@
 
 import com.spotify.objects.SpotifySerialize;
 import com.spotify.objects.albums.Album;
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -18,7 +18,7 @@ public class AlbumGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
 
     public AlbumGet(String id) {
diff --git a/src/main/java/com/spotify/requests/albums/AlbumTracksGet.java b/src/main/java/com/spotify/requests/albums/AlbumTracksGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.albums;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class AlbumTracksGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     @SpotifyRequestField
     private int limit;
diff --git a/src/main/java/com/spotify/requests/albums/SeveralAlbumsGet.java b/src/main/java/com/spotify/requests/albums/SeveralAlbumsGet.java
@@ -2,7 +2,7 @@
 
 import com.spotify.objects.SpotifySerialize;
 import com.spotify.objects.albums.Album;
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -17,7 +17,7 @@ public class SeveralAlbumsGet extends AbstractRequest {
     private final String[] ids;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
 
     public SeveralAlbumsGet(String... ids) {
diff --git a/src/main/java/com/spotify/requests/artists/ArtistsTopTracksGet.java b/src/main/java/com/spotify/requests/artists/ArtistsTopTracksGet.java
@@ -1,7 +1,7 @@
 package com.spotify.requests.artists;
 
 import com.spotify.objects.SpotifyField;
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifySubRequest;
@@ -16,7 +16,7 @@ public class ArtistsTopTracksGet extends AbstractRequest {
     private final String id;
 
     @SpotifyField
-    private Market market;
+    private Country market;
 
     public ArtistsTopTracksGet(String id) {
         this.id = id;
diff --git a/src/main/java/com/spotify/requests/audiobooks/AudiobookGet.java b/src/main/java/com/spotify/requests/audiobooks/AudiobookGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.audiobooks;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class AudiobookGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     public AudiobookGet(String id) {
         this.id = id;
diff --git a/src/main/java/com/spotify/requests/audiobooks/SeveralAudioBooksGet.java b/src/main/java/com/spotify/requests/audiobooks/SeveralAudioBooksGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.audiobooks;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -15,7 +15,7 @@ public class SeveralAudioBooksGet extends AbstractRequest {
     private final String[] ids;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     @SpotifyRequestField
     private int limit;
diff --git a/src/main/java/com/spotify/requests/capters/ChapterGet.java b/src/main/java/com/spotify/requests/capters/ChapterGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.capters;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class ChapterGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
 
     public ChapterGet(String id) {
diff --git a/src/main/java/com/spotify/requests/capters/SeveralChaptersGet.java b/src/main/java/com/spotify/requests/capters/SeveralChaptersGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.capters;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -15,7 +15,7 @@ public class SeveralChaptersGet extends AbstractRequest {
     private final String[] ids;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     public SeveralChaptersGet(String... ids) {
         this.ids = ids;
diff --git a/src/main/java/com/spotify/requests/categories/SeveralCategoriesGet.java b/src/main/java/com/spotify/requests/categories/SeveralCategoriesGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.categories;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -12,7 +12,7 @@ public class SeveralCategoriesGet extends AbstractRequest {
 
 
     @SpotifyRequestField
-    private Market country;
+    private Country country;
 
     @SpotifyRequestField
     private String locale;
diff --git a/src/main/java/com/spotify/requests/categories/SingleCategoriesGet.java b/src/main/java/com/spotify/requests/categories/SingleCategoriesGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.categories;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class SingleCategoriesGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market country;
+    private Country country;
 
     @SpotifyRequestField
     private String locale;
diff --git a/src/main/java/com/spotify/requests/episodes/EpisodeGet.java b/src/main/java/com/spotify/requests/episodes/EpisodeGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.episodes;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class EpisodeGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
 
     public EpisodeGet(String id) {
diff --git a/src/main/java/com/spotify/requests/episodes/SeveralEpisodesGet.java b/src/main/java/com/spotify/requests/episodes/SeveralEpisodesGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.episodes;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -15,7 +15,7 @@ public class SeveralEpisodesGet extends AbstractRequest {
     private final String[] ids;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     public SeveralEpisodesGet(String... ids) {
         this.ids = ids;
diff --git a/src/main/java/com/spotify/requests/playlists/CategoriesPlaylistsGet.java b/src/main/java/com/spotify/requests/playlists/CategoriesPlaylistsGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.playlists;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -15,7 +15,7 @@ public class CategoriesPlaylistsGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market country;
+    private Country country;
 
     @SpotifyRequestField
     private int limit;
diff --git a/src/main/java/com/spotify/requests/playlists/PlaylistGet.java b/src/main/java/com/spotify/requests/playlists/PlaylistGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.playlists;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -15,7 +15,7 @@ public class PlaylistGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     @SpotifyRequestField
     private String[] fields;
diff --git a/src/main/java/com/spotify/requests/playlists/PlaylistTracksGet.java b/src/main/java/com/spotify/requests/playlists/PlaylistTracksGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.playlists;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class PlaylistTracksGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     @SpotifyRequestField
     private String[] fields;
diff --git a/src/main/java/com/spotify/requests/search/SearchGet.java b/src/main/java/com/spotify/requests/search/SearchGet.java
@@ -2,7 +2,7 @@
 
 import com.spotify.objects.SpotifySerialize;
 import com.spotify.objects.search.Search;
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -22,7 +22,7 @@ public class SearchGet extends AbstractRequest {
     private final Type[] type;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     @SpotifyRequestField
     private int limit;
diff --git a/src/main/java/com/spotify/requests/shows/SeveralShowsGet.java b/src/main/java/com/spotify/requests/shows/SeveralShowsGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.shows;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class SeveralShowsGet extends AbstractRequest {
     private final String[] ids;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     public SeveralShowsGet(String... ids) {
         this.ids = ids;
diff --git a/src/main/java/com/spotify/requests/shows/ShowEpisodesGet.java b/src/main/java/com/spotify/requests/shows/ShowEpisodesGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.shows;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class ShowEpisodesGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     @SpotifyRequestField
     private int limit;
diff --git a/src/main/java/com/spotify/requests/shows/ShowGet.java b/src/main/java/com/spotify/requests/shows/ShowGet.java
@@ -1,6 +1,6 @@
 package com.spotify.requests.shows;
 
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -16,7 +16,7 @@ public class ShowGet extends AbstractRequest {
     private final String id;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
 
     public ShowGet(String id) {
diff --git a/src/main/java/com/spotify/requests/tracks/SeveralTracksGet.java b/src/main/java/com/spotify/requests/tracks/SeveralTracksGet.java
@@ -2,7 +2,7 @@
 
 import com.spotify.objects.SpotifySerialize;
 import com.spotify.objects.tracks.Track;
-import com.spotify.objects.wrappers.Market;
+import com.spotify.objects.wrappers.Country;
 import com.spotify.requests.AbstractRequest;
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
@@ -23,7 +23,7 @@ public class SeveralTracksGet extends AbstractRequest {
     private final String[] ids;
 
     @SpotifyRequestField
-    private Market market;
+    private Country market;
 
     /**
      * @param tracks The array of tracks to get
diff --git a/src/main/java/com/spotify/requests/tracks/TrackRecommendationGet.java b/src/main/java/com/spotify/requests/tracks/TrackRecommendationGet.java
diff --git a/src/test/java/com/spotify/requests/tracks/SeveralTracksGetTest.java b/src/test/java/com/spotify/requests/tracks/SeveralTracksGetTest.java
