Minor fixes

Author: sonallux

CHANGELOG.md

@@ -5,6 +5,13 @@ 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]
+The Java wrapper generator has been completely rewritten and uses now OpenAPI definition of the Spotify Web API as source.
+The OpenAPI definition contains fixes and improvements from my [spotify-web-api](https://github.com/sonallux/spotify-web-api) repository.
+Therefore, some model class names have changed and many fixes are included.
+
+- The library now also requires Java 17
+- Update to jackson `2.13.2`
+- Update to okhttp `4.9.3`
 
 ## [2.4.0]
 - Update to spotify-web-api-core `2021.10.17`

spotify-web-api-java/src/main/java/de/sonallux/spotify/api/authorization/AuthorizationRedirectResponse.java

@@ -37,6 +37,7 @@ public static <T> AuthorizationRedirectResponse<T> error(String error) {
 
     /**
      * Parses the authorization response from the callback url
+     *
      * @param url the callback url
      * @return the authorization response
      * @throws IllegalArgumentException If {@code uri} is not a well-formed URI.
@@ -47,6 +48,7 @@ public static <T> AuthorizationRedirectResponse<T> parse(String url, Function<Ht
 
     /**
      * Parses the authorization response from the callback url
+     *
      * @param httpUrl the callback url
      * @return the authorization response
      * @throws IllegalArgumentException If {@code uri} is not a well-formed URI.
@@ -58,11 +60,9 @@ public static <T> AuthorizationRedirectResponse<T> parse(HttpUrl httpUrl, Functi
         var content = contentExtractor.apply(httpUrl);
         if (content != null) {
             return new AuthorizationRedirectResponse<>(state, content, null);
-        }
-        else if (TextUtil.hasText(error)) {
+        } else if (TextUtil.hasText(error)) {
             return new AuthorizationRedirectResponse<>(state, null, error);
-        }
-        else {
+        } else {
             return new AuthorizationRedirectResponse<>(state, null, "Invalid authorization redirect response uri");
         }
     }

spotify-web-api-java/src/main/java/de/sonallux/spotify/api/authorization/AuthorizationUrlBuilder.java

@@ -3,6 +3,7 @@
 import okhttp3.HttpUrl;
 
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 public class AuthorizationUrlBuilder {
     protected final HttpUrl.Builder builder;
@@ -28,8 +29,7 @@ public AuthorizationUrlBuilder scopes(Scope... scopes) {
         }
         var scopeString = Arrays.stream(scopes)
             .map(Scope::getName)
-            .reduce((scope1, scope2) -> scope1 + " " + scope2)
-            .orElse("");
+            .collect(Collectors.joining(" "));
 
         builder.addQueryParameter("scope", scopeString);
         return this;

spotify-web-api-java/src/main/java/de/sonallux/spotify/api/authorization/authorization_code/AuthorizationCodeFlow.java

@@ -1,7 +1,7 @@
 package de.sonallux.spotify.api.authorization.authorization_code;
 
-import de.sonallux.spotify.api.authorization.AuthorizationUrlBuilder;
 import de.sonallux.spotify.api.authorization.AuthorizationRedirectResponse;
+import de.sonallux.spotify.api.authorization.AuthorizationUrlBuilder;
 import de.sonallux.spotify.api.authorization.SpotifyAuthorizationException;
 import de.sonallux.spotify.api.authorization.TokenStore;
 import de.sonallux.spotify.api.util.TextUtil;

spotify-web-api-java/src/main/java/de/sonallux/spotify/api/authorization/authorization_code/AuthorizationCodePKCEFlow.java

@@ -1,7 +1,7 @@
 package de.sonallux.spotify.api.authorization.authorization_code;
 
-import de.sonallux.spotify.api.authorization.AuthorizationUrlBuilder;
 import de.sonallux.spotify.api.authorization.AuthorizationRedirectResponse;
+import de.sonallux.spotify.api.authorization.AuthorizationUrlBuilder;
 import de.sonallux.spotify.api.authorization.SpotifyAuthorizationException;
 import de.sonallux.spotify.api.authorization.TokenStore;
 import de.sonallux.spotify.api.util.TextUtil;

spotify-web-api-java/src/test/java/de/sonallux/spotify/api/authorization/implicit_grant/ImplicitGrantFlowTest.java

@@ -37,14 +37,14 @@ void createAuthorizationUriTest() {
 
         var urlWithStateAndScope = implicitGrantFlow.createAuthorizationUrl()
             .state("34fFs29kd10")
-            .scopes(Scope.USER_LIBRARY_READ, Scope.USER_LIBRARY_MODIFY)
+            .scopes(Scope.USER_LIBRARY_READ)
             .build();
         assertEquals("https://accounts.spotify.com/authorize?" +
             "client_id=1a2b3c4d5e6f7&" +
             "response_type=token&" +
             "redirect_uri=http%3A%2F%2Fexample.com%2Fcallback&" +
             "state=34fFs29kd10&" +
-            "scope=user-library-read%20user-library-modify", urlWithStateAndScope.toString());
+            "scope=user-library-read", urlWithStateAndScope.toString());
 
         var urlWithDialog = implicitGrantFlow.createAuthorizationUrl()
             .showDialog(true)