Update to spotify-web-api-core 2021.7.20

Author: sonallux

CHANGELOG.md

@@ -5,8 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Update to spotify-web-api-core `2021.6.30`
-  - Fix tracks property in `Recommendations`
+- Update to spotify-web-api-core `2021.7.20`
+  - Fix `tracks` property in `Recommendations`
+  - Mark `market` parameter in "Get Playlist's Items" endpoint as optional
 
 ## [2.2.0]
 - Update to spotify-web-api-core `2021.6.18`

spotify-web-api-java-generator/pom.xml

@@ -20,7 +20,7 @@
     <url>https://github.com/sonallux/spotify-web-api-java</url>
 
     <properties>
-        <spotify-web-api-core.version>2021.6.30</spotify-web-api-core.version>
+        <spotify-web-api-core.version>2021.7.20</spotify-web-api-core.version>
         <guava.version>30.1.1-jre</guava.version>
         <picocli.version>4.6.1</picocli.version>
         <flexmark.version>0.62.2</flexmark.version>

spotify-web-api-java/src/main/generated/de/sonallux/spotify/api/apis/PlaylistsApi.java

@@ -86,11 +86,10 @@ public GetPlaylistCoverRequest getPlaylistCover(String playlistId) {
      * <h3>Get a Playlist's Items</h3>
      * <p>Get full details of the items of a playlist owned by a Spotify user.</p>
      * @param playlistId <p>The <a href="https://developer.spotify.com/documentation/web-api/#spotify-uris-and-ids">Spotify ID</a> for the playlist.</p>
-     * @param market <p>An <a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2 country code</a> or the string <code>from_token</code>. Provide this parameter if you want to apply <a href="https://developer.spotify.com/documentation/general/guides/track-relinking-guide/">Track Relinking</a>. For episodes, 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.<br><em>Note: If neither market or user country are provided, the episode is considered unavailable for the client.</em></p>
      * @return a {@link GetPlaylistsTracksRequest} object to build and execute the request
      */
-    public GetPlaylistsTracksRequest getPlaylistsTracks(String playlistId, String market) {
-        return new GetPlaylistsTracksRequest(apiClient, playlistId, market);
+    public GetPlaylistsTracksRequest getPlaylistsTracks(String playlistId) {
+        return new GetPlaylistsTracksRequest(apiClient, playlistId);
     }
 
     /**

spotify-web-api-java/src/main/generated/de/sonallux/spotify/api/apis/playlists/GetPlaylistsTracksRequest.java

@@ -21,17 +21,23 @@ public class GetPlaylistsTracksRequest {
      * <h3>Get a Playlist's Items request</h3>
      * @param apiClient <p>The API client</p>
      * @param playlistId <p>The <a href="https://developer.spotify.com/documentation/web-api/#spotify-uris-and-ids">Spotify ID</a> for the playlist.</p>
-     * @param market <p>An <a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2 country code</a> or the string <code>from_token</code>. Provide this parameter if you want to apply <a href="https://developer.spotify.com/documentation/general/guides/track-relinking-guide/">Track Relinking</a>. For episodes, 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.<br><em>Note: If neither market or user country are provided, the episode is considered unavailable for the client.</em></p>
      */
-    public GetPlaylistsTracksRequest(ApiClient apiClient, String playlistId, String market) {
+    public GetPlaylistsTracksRequest(ApiClient apiClient, String playlistId) {
         this.apiClient = apiClient;
         this.request = new Request("GET", "/playlists/{playlist_id}/tracks")
             .addPathParameter("playlist_id", String.valueOf(playlistId))
-            .addQueryParameter("market", String.valueOf(market))
         ;
         this.additionalTypes("track,episode");
     }
 
+    /**
+     * <p>An <a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2 country code</a> or the string <code>from_token</code>. Provide this parameter if you want to apply <a href="https://developer.spotify.com/documentation/general/guides/track-relinking-guide/">Track Relinking</a>. For episodes, 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.<br><em>Note: If neither market or user country are provided, the episode is considered unavailable for the client.</em></p>
+     */
+    public GetPlaylistsTracksRequest market(String market) {
+        this.request.addQueryParameter("market", String.valueOf(market));
+        return this;
+    }
+
     /**
      * <p>Filters for the query: a comma-separated list of the fields to return. If omitted, all fields are returned. For example, to get just the total number of items and the request limit:<br><code>fields=total,limit</code><br>A dot separator can be used to specify non-reoccurring fields, while parentheses can be used to specify reoccurring fields within objects. For example, to get just the added date and user ID of the adder:<br><code>fields=items(added_at,added_by.id)</code><br>Use multiple parentheses to drill down into nested objects, for example:<br><code>fields=items(track(name,href,album(name,href)))</code><br>Fields can be excluded by prefixing them with an exclamation mark, for example:<br><code>fields=items.track.album(!external_urls,images)</code></p>
      */

spotify-web-api-java/src/test/java/de/sonallux/spotify/api/ConversionTest.java

@@ -97,7 +97,7 @@ void testRequestWithSnakeCaseToCamelCase() throws Exception {
     void testUnionTypeHandlingWithAdditionalTypesParameter() throws Exception {
         webServer.enqueue(loadMockResponse("get-playlists-tracks-union.json"));
 
-        var response = api.getPlaylistsApi().getPlaylistsTracks("foo", "DE").build().execute();
+        var response = api.getPlaylistsApi().getPlaylistsTracks("foo").build().execute();
         var track = response.getItems().get(0).getTrack();
         assertNotNull(track);
         assertEquals("track", track.getType());
@@ -110,14 +110,14 @@ void testUnionTypeHandlingWithAdditionalTypesParameter() throws Exception {
         assertNotNull(((Episode) episode).getShow());
 
         var request = webServer.takeRequest();
-        assertEquals("/playlists/foo/tracks?market=DE&additional_types=track%2Cepisode", request.getPath());
+        assertEquals("/playlists/foo/tracks?additional_types=track%2Cepisode", request.getPath());
     }
 
     @Test
     void testUnionTypeHandlingWithoutAdditionalTypesParameter() throws Exception {
         webServer.enqueue(loadMockResponse("get-playlists-tracks.json"));
 
-        var response = api.getPlaylistsApi().getPlaylistsTracks("foo", "DE")
+        var response = api.getPlaylistsApi().getPlaylistsTracks("foo")
             .additionalTypes("track")
             .build().execute();
         var track = response.getItems().get(0).getTrack();
@@ -132,7 +132,7 @@ void testUnionTypeHandlingWithoutAdditionalTypesParameter() throws Exception {
         assertNull(((Episode) episode).getShow());//show is not set, because episode is returned with track format
 
         var request = webServer.takeRequest();
-        assertEquals("/playlists/foo/tracks?market=DE&additional_types=track", request.getPath());
+        assertEquals("/playlists/foo/tracks?additional_types=track", request.getPath());
     }
 
     @Test