Merge pull request #8 from Gruncan/v1.1a

Fixed issue with search

Author: Gruncan

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.spotstat</groupId>
     <artifactId>S4J</artifactId>
-    <version>1.1a</version>
+    <version>1.1.1a</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

src/main/java/com/spotify/requests/AbstractRequest.java

@@ -166,10 +166,12 @@ public String buildRequestUrl() {
                     }
 
                     String parameter = Util.join(strings, ",");
+                    parameter = parameter.replace(" ", "%20");
                     sb.append(parameter);
                     sb.append("&");
                 } else {
-                    sb.append(o);
+                    String v = o.toString().replace(" ", "%20");
+                    sb.append(v);
                     sb.append("&");
                 }
                 field.setAccessible(false);

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

@@ -4,6 +4,7 @@
 import com.spotify.requests.SpotifyRequest;
 import com.spotify.requests.SpotifyRequestField;
 import com.spotify.requests.util.Market;
+import com.spotify.requests.util.Type;
 
 
 @SpotifyRequest("search")
@@ -13,7 +14,7 @@ public class SearchGet extends AbstractRequest {
     private final String q;
 
     @SpotifyRequestField
-    private final String type;
+    private final Type[] type;
 
     @SpotifyRequestField
     private String include_external;
@@ -27,7 +28,7 @@ public class SearchGet extends AbstractRequest {
     @SpotifyRequestField
     private int offset;
 
-    public SearchGet(String q, String type) {
+    public SearchGet(String q, Type... type) {
         this.q = q;
         this.type = type;
         this.include_external = null;

src/main/java/com/spotify/requests/util/Type.java

@@ -4,8 +4,8 @@
 
 public enum Type {
 
-    ARTISTS,
-    TRACKS;
+    ARTIST,
+    TRACK;
 
 
     @Override

src/test/java/com/spotify/Main.java

@@ -1,19 +1,20 @@
 package com.spotify;
 
 import com.spotify.json.JSONObject;
-import com.spotify.requests.AbstractRequest;
-import com.spotify.requests.tracks.SeveralTrackAudioFeaturesGet;
+import com.spotify.requests.search.SearchGet;
+import com.spotify.requests.util.Type;
 
 public class Main {
 
 
     public static void main(String[] args) throws IllegalAccessException {
-        SpotifyClient sc = new SpotifyClientBuilderTester().getBuiltClient();
+        SpotifyClient sc = new SpotifyClientBuilderTester().printAccessToken().getBuiltClient();
 
+        SearchGet searchGet = new SearchGet("Don't Stop artist:Fleetwood Mac", Type.TRACK);
+//        AbstractRequest al = new SeveralTrackAudioFeaturesGet("05lBXOMA1uHpVPEQZyjoh3", "1ljziaoMnRH95aPeOSGAtr1");
 
-        AbstractRequest al = new SeveralTrackAudioFeaturesGet("05lBXOMA1uHpVPEQZyjoh3", "1ljziaoMnRH95aPeOSGAtr1");
-
-        JSONObject jsonObject = sc.executeRequest(al).ok();
+        System.out.println(searchGet.buildRequestUrl());
+        JSONObject jsonObject = sc.executeRequest(searchGet).ok();
         System.out.println(jsonObject.toString(4));