Merge branch '1.4.0a' into development

Author: Gruncan

src/main/java/com/spotify/exceptions/SpotifyUrlParserException.java

@@ -0,0 +1,9 @@
+package com.spotify.exceptions;
+
+public class SpotifyUrlParserException extends Exception {
+
+    public SpotifyUrlParserException(String reason) {
+        super(reason);
+    }
+
+}

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

@@ -9,7 +9,7 @@
 @Target(ElementType.TYPE)
 public @interface SpotifyRequest {
 
-    String value() default "";
+    String value();
 
     String end() default "";
 

src/test/java/com/spotify/requests/SpotifyAnnotationTest.java

@@ -0,0 +1,100 @@
+package com.spotify.requests;
+
+import com.spotify.exceptions.SpotifyUrlParserException;
+import com.spotify.requests.testclasses.TestFieldRequestClass1;
+import com.spotify.requests.testclasses.TestRequestClass1;
+import com.spotify.requests.testclasses.TestSubRequestClass1;
+import com.spotify.requests.testclasses.TestSubRequestClass2;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class SpotifyAnnotationTest {
+
+
+    /**
+     * Tests classes that don't have @SpotifyRequest annotation
+     */
+    @Test
+    public void spotifyRequestAnnotationTest1() {
+        TestRequestClass1 trc = new TestRequestClass1();
+        trc.setField1("value1");
+        String url = trc.buildRequestUrl();
+
+        assertNull(url);
+    }
+
+
+    /**
+     * Tests class fields with @SpotifySubRequest
+     * Ensures that field that are not annotated do not add to url
+     */
+    @Test
+    public void spotifySubRequestAnnotationTest1() {
+        TestSubRequestClass1 trc = new TestSubRequestClass1();
+
+        trc.setField1("subrequest1");
+        trc.setField2("subrequest2");
+        trc.setField3("failsubrequest");
+
+        String url = trc.buildRequestUrl();
+
+        assertEquals("url/subrequest1/subrequest2", url);
+
+    }
+
+    /**
+     * Tests class fields with @SpotifySubRequest
+     * Should fail to create url since a field annotated with subRequest should not be none
+     */
+    @Test
+    public void spotifySubRequestAnnotationTest2() {
+        TestSubRequestClass1 trc = new TestSubRequestClass1();
+
+        trc.setField1("subrequest1");
+        trc.setField2(null);
+
+        String url = trc.buildRequestUrl();
+
+        assertNull(url);
+    }
+
+
+    /**
+     * Tests class fields with @SpotifySubRequest
+     * Should fail to create url since subRequest fields must be type String
+     */
+    @Test
+    public void spotifySubRequestAnnotationTest3() {
+        TestSubRequestClass2 trc = new TestSubRequestClass2();
+
+        trc.setIntField(6);
+
+        SpotifyUrlParserException thrown = assertThrows(SpotifyUrlParserException.class, trc::buildRequestUrl);
+
+        assertNotNull(thrown);
+    }
+
+
+    /**
+     * Tests class fields with @SpotifyRequestField
+     * Ensures that default values of field are ignored
+     * and non labelled fields
+     */
+    @Test
+    public void spotifyFieldRequestAnnotationTest1() {
+        TestFieldRequestClass1 trc = new TestFieldRequestClass1();
+
+        trc.setField1("value1");
+        trc.setField2("value2");
+        trc.setField3(null);
+
+
+        String url = trc.buildRequestUrl();
+
+        assertEquals("url?field1=value1&FIELD2=value2", url);
+
+    }
+
+
+}

src/test/java/com/spotify/requests/testclasses/TestFieldRequestClass1.java

@@ -0,0 +1,27 @@
+package com.spotify.requests.testclasses;
+
+import com.spotify.requests.AbstractRequest;
+import com.spotify.requests.SpotifyRequest;
+import com.spotify.requests.SpotifyRequestField;
+import lombok.Setter;
+
+@SpotifyRequest("url")
+@Setter
+public class TestFieldRequestClass1 extends AbstractRequest {
+
+    @SpotifyRequestField
+    private String field1;
+
+    @SpotifyRequestField("FIELD2")
+    private String field2;
+
+    @SpotifyRequestField
+    private String field3;
+
+    @SpotifyRequestField
+    private int field4;
+
+    @SpotifyRequestField
+    private String field5;
+
+}

src/test/java/com/spotify/requests/testclasses/TestRequestClass1.java

@@ -0,0 +1,14 @@
+package com.spotify.requests.testclasses;
+
+import com.spotify.requests.AbstractRequest;
+import com.spotify.requests.SpotifyRequestField;
+import lombok.Setter;
+
+@Setter
+public class TestRequestClass1 extends AbstractRequest {
+
+
+    @SpotifyRequestField
+    private String field1;
+
+}

src/test/java/com/spotify/requests/testclasses/TestSubRequestClass1.java

@@ -0,0 +1,21 @@
+package com.spotify.requests.testclasses;
+
+import com.spotify.requests.AbstractRequest;
+import com.spotify.requests.SpotifyRequest;
+import com.spotify.requests.SpotifySubRequest;
+import lombok.Setter;
+
+@SpotifyRequest("url")
+@Setter
+public class TestSubRequestClass1 extends AbstractRequest {
+
+    @SpotifySubRequest
+    private String field1;
+
+    @SpotifySubRequest
+    private String field2;
+
+    private String field3;
+
+
+}

src/test/java/com/spotify/requests/testclasses/TestSubRequestClass2.java

@@ -0,0 +1,17 @@
+package com.spotify.requests.testclasses;
+
+import com.spotify.requests.AbstractRequest;
+import com.spotify.requests.SpotifyRequest;
+import com.spotify.requests.SpotifySubRequest;
+import lombok.Setter;
+
+@SpotifyRequest("url")
+@Setter
+public class TestSubRequestClass2 extends AbstractRequest {
+
+
+    @SpotifySubRequest
+    private int intField;
+
+
+}