Updated all requests

Author: Gruncan

src/main/java/com/spotify/requests/search/SearchGet.java

@@ -1,28 +1,56 @@
 package com.spotify.requests.search;
 
-import com.spotify.json.JSONObject;
 import com.spotify.requests.AbstractRequest;
-import com.spotify.requests.RequestQuery;
-import com.spotify.requests.util.ParameterPairBuilder;
+import com.spotify.requests.SpotifyRequest;
+import com.spotify.requests.SpotifyRequestField;
+import com.spotify.requests.util.Market;
 
+
+@SpotifyRequest("search")
 public class SearchGet extends AbstractRequest {
 
-    private final static String URL = "search/";
+    @SpotifyRequestField
+    private final String q;
+
+    @SpotifyRequestField
+    private final String type;
+
+    @SpotifyRequestField
+    private String include_external;
 
+    @SpotifyRequestField
+    private int limit;
+
+    @SpotifyRequestField
+    private Market market;
+
+    @SpotifyRequestField
+    private int offset;
 
     public SearchGet(String q, String type) {
-        super(new ParameterPairBuilder()
-                .addKeys("q", "type", "include_external", "limit", "market", "offset")
-                .addClasses(String.class, String.class, String.class, Integer.class, Integer.class)
-                .build());
-        super.addQuery(new RequestQuery<>("q", q));
-        super.addQuery(new RequestQuery<>("type", type));
+        this.q = q;
+        this.type = type;
+        this.include_external = null;
+        this.limit = -1;
+        this.market = null;
+        this.offset = -1;
+    }
+
+
+    public void setIncludeExternal(String s) {
+        this.include_external = s;
+    }
+
+    public void setLimit(int limit) {
+        this.limit = Math.max(0, Math.min(limit, 50));
+    }
 
+    public void setMarket(Market market) {
+        this.market = market;
     }
 
-    @Override
-    public JSONObject execute(String token) {
-        return super.requestGet(token, URL);
+    public void setOffset(int offset) {
+        this.offset = Math.max(0, Math.min(offset, 1000));
     }
 
 

src/main/java/com/spotify/requests/tracks/SeveralTrackAudioFeaturesGet.java

@@ -1,30 +1,25 @@
 package com.spotify.requests.tracks;
 
-import com.spotify.json.JSONObject;
 import com.spotify.requests.AbstractRequest;
-import com.spotify.requests.RequestQuery;
-import com.spotify.requests.util.ParameterPair;
-import com.spotify.util.Util;
-
+import com.spotify.requests.SpotifyRequest;
+import com.spotify.requests.SpotifyRequestField;
 
 /**
  * Get audio features for multiple tracks based on their Spotify IDs.
  * <a href="https://developer.spotify.com/documentation/web-api/reference/#/operations/get-several-audio-features">Spotify Docs</a>
  */
+
+@SpotifyRequest("audio-features")
 public class SeveralTrackAudioFeaturesGet extends AbstractRequest {
 
-    private final static String URL = "audio-features/";
 
-    /**
-     * @param tracks The array of tracks to query
-     */
-    public SeveralTrackAudioFeaturesGet(String... tracks) {
-        super(new ParameterPair("ids", String.class));
-        super.addQuery(new RequestQuery<>("ids", Util.join(tracks, ",")));
-    }
+    @SpotifyRequestField
+    private final String[] ids;
 
-    @Override
-    public JSONObject execute(String token) {
-        return super.requestGet(token, URL);
+
+    public SeveralTrackAudioFeaturesGet(String... ids) {
+        this.ids = ids;
     }
+
+
 }

src/main/java/com/spotify/requests/tracks/TrackAudioAnalysisGet.java

@@ -1,30 +1,27 @@
 package com.spotify.requests.tracks;
 
-import com.spotify.json.JSONObject;
 import com.spotify.requests.AbstractRequest;
+import com.spotify.requests.SpotifyRequest;
+import com.spotify.requests.SpotifySubRequest;
 
 
 /**
  * Get a low-level audio analysis for a track in the Spotify catalog. The audio analysis describes the track’s structure and musical content, including rhythm, pitch, and timbre.
  * <a href="https://developer.spotify.com/documentation/web-api/reference/#/operations/get-audio-analysis">Spotify Docs</a>
  */
+@SpotifyRequest("audio-analysis")
 public class TrackAudioAnalysisGet extends AbstractRequest {
 
-    private final static String URL = "audio-analysis/{id}/";
 
+    @SpotifySubRequest
     private final String id;
 
     /**
      * @param token The token of the related spotify api session
      * @param id    The id of the track to be queried
      */
     public TrackAudioAnalysisGet(String id) {
-        super();
         this.id = id;
     }
 
-    @Override
-    public JSONObject execute(String token) {
-        return super.requestGet(token, URL.replace("{id}", this.id));
-    }
 }

src/main/java/com/spotify/requests/tracks/TrackAudioFeaturesGet.java

@@ -1,29 +1,26 @@
 package com.spotify.requests.tracks;
 
-import com.spotify.json.JSONObject;
 import com.spotify.requests.AbstractRequest;
+import com.spotify.requests.SpotifyRequest;
+import com.spotify.requests.SpotifySubRequest;
 
 
 /**
  * Get audio feature information for a single track identified by its unique Spotify ID.
  * <a href="https://developer.spotify.com/documentation/web-api/reference/#/operations/get-audio-features">Spotify Docs</a>
  */
+@SpotifyRequest("audio-features")
 public class TrackAudioFeaturesGet extends AbstractRequest {
 
-    private final static String URL = "audio-features/{id}/";
 
+    @SpotifySubRequest
     private final String id;
 
     /**
      * @param id The id of the song to get
      */
     public TrackAudioFeaturesGet(String id) {
-        super();
         this.id = id;
     }
 
-    @Override
-    public JSONObject execute(String token) {
-        return super.requestGet(token, URL.replace("{id}", this.id));
-    }
 }