Merge pull request #14 from Gruncan/v1.2a

V1.2.0

Author: Gruncan

pom.xml

@@ -23,6 +23,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.26</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/http/SpotifyHttpServerProvider.java

@@ -34,14 +34,13 @@ public void runServer() {
             if (!url.getHost().equals("127.0.0.1"))
                 url = new URL("https://127.0.0.1:8888/redirect/");
 
-
             Desktop desktop = Desktop.getDesktop();
-            server = HttpServer.create(new InetSocketAddress(url.getPort()), 0);
+            this.server = HttpServer.create(new InetSocketAddress(url.getPort()), 0);
             this.countDownLatch = new CountDownLatch(1);
-            server.createContext(url.getPath(), new RedirectHandler());
+            this.server.createContext(url.getPath(), new RedirectHandler());
 
-            desktop.browse(new URI(spotifyClientBuilder.buildAuthUrl()));
-            server.start();
+            desktop.browse(new URI(this.spotifyClientBuilder.buildAuthUrl()));
+            this.server.start();
         } catch (IOException | URISyntaxException e) {
             System.out.println("Unable to start server.");
             e.printStackTrace();

src/main/java/com/spotify/json/JSON.java src/main/java/com/json/JSON.javasrc/main/java/com/spotify/json/JSON.java renamed to src/main/java/com/json/JSON.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.spotify.json;
+package com.json;
 
 
 class JSON {

…ain/java/com/spotify/json/JSONArray.java src/main/java/com/json/JSONArray.javasrc/main/java/com/spotify/json/JSONArray.java renamed to src/main/java/com/json/JSONArray.java src/main/java/com/spotify/json/JSONArray.java renamed to src/main/java/com/json/JSONArray.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.spotify.json;
+package com.json;
 
 
 import java.lang.reflect.Array;
@@ -633,6 +633,7 @@ public JSONObject getJSONObject(int index) throws JSONException {
         if (object instanceof JSONObject) {
             return (JSONObject) object;
         } else {
+            if (object == null || object.toString().equals("null")) return null;
             throw JSON.typeMismatch(index, object, "JSONObject");
         }
     }
@@ -647,7 +648,7 @@ public JSONObject getModifiedJSONObject(int index) throws JSONException {
         } else if (object instanceof Boolean) {
             return new JSONObject(String.format("{\"value\": %b}", object));
         } else if (object instanceof Double) {
-            return new JSONObject(String.format("{\"value\": %d}", object));
+            return new JSONObject(String.format("{\"value\": %f}", object));
         } else if (object instanceof Integer) {
             return new JSONObject(String.format("{\"value\": %d}", object));
         } else {

…java/com/spotify/json/JSONException.java src/main/java/com/json/JSONException.javasrc/main/java/com/spotify/json/JSONException.java renamed to src/main/java/com/json/JSONException.java src/main/java/com/spotify/json/JSONException.java renamed to src/main/java/com/json/JSONException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.spotify.json;
+package com.json;
 
 // Note: this class was written without inspecting the non-free org.json sourcecode.
 

…in/java/com/spotify/json/JSONObject.java src/main/java/com/json/JSONObject.javasrc/main/java/com/spotify/json/JSONObject.java renamed to src/main/java/com/json/JSONObject.java src/main/java/com/spotify/json/JSONObject.java renamed to src/main/java/com/json/JSONObject.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.spotify.json;
+package com.json;
 
 
 import java.beans.IntrospectionException;

…in/java/com/spotify/json/JSONString.java src/main/java/com/json/JSONString.javasrc/main/java/com/spotify/json/JSONString.java renamed to src/main/java/com/json/JSONString.java src/main/java/com/spotify/json/JSONString.java renamed to src/main/java/com/json/JSONString.java

@@ -1,4 +1,4 @@
-package com.spotify.json;
+package com.json;
 
 /**
  * The <code>JSONString</code> interface allows a <code>toJSONString()</code>

…/java/com/spotify/json/JSONStringer.java src/main/java/com/json/JSONStringer.javasrc/main/java/com/spotify/json/JSONStringer.java renamed to src/main/java/com/json/JSONStringer.java src/main/java/com/spotify/json/JSONStringer.java renamed to src/main/java/com/json/JSONStringer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.spotify.json;
+package com.json;
 
 
 import java.util.ArrayList;

…n/java/com/spotify/json/JSONTokener.java src/main/java/com/json/JSONTokener.javasrc/main/java/com/spotify/json/JSONTokener.java renamed to src/main/java/com/json/JSONTokener.java src/main/java/com/spotify/json/JSONTokener.java renamed to src/main/java/com/json/JSONTokener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.spotify.json;
+package com.json;
 
 // Note: this class was written without inspecting the non-free org.json sourcecode.
 

src/main/java/com/spotify/SpotifyClient.java

@@ -1,13 +1,12 @@
 package com.spotify;
 
-import com.spotify.requests.IRequest;
-import com.spotify.requests.RequestResponse;
+import com.spotify.requests.AbstractRequest;
 
 public interface SpotifyClient {
 
 
     // to be changed
-    RequestResponse executeRequest(IRequest request);
+    SpotifyResponse executeRequest(AbstractRequest request);
 
 
 }