Clean up some generics and change getUrlParameters to getUrlParameter

tterrag1098 · tterrag1098 · commit 50f026802cfd · 2015-10-26T20:22:29.000-04:00
diff --git a/src/main/java/com/creatubbles/api/core/CreatubblesRequest.java b/src/main/java/com/creatubbles/api/core/CreatubblesRequest.java
@@ -45,7 +45,7 @@ public CreatubblesRequest(String endPoint, HttpMethod httpMethod, String accessT
         }
     }
 
-    public CreatubblesRequest setAccessToken(String accessToken) {
+    public CreatubblesRequest<T> setAccessToken(String accessToken) {
         this.urlParameters.put("access_token", accessToken);
         return this;
     }
@@ -68,8 +68,8 @@ public CreatubblesRequest<T> setHttpMethod(HttpMethod httpMethod) {
         return this;
     }
 
-    public Map<String, String> getUrlParameters() {
-        return urlParameters;
+    public String getUrlParameter(String key) {
+        return urlParameters.get(key);
     }
 
     public String getAcceptLanguage() {
diff --git a/src/main/java/com/creatubbles/api/core/CreatubblesResponse.java b/src/main/java/com/creatubbles/api/core/CreatubblesResponse.java
@@ -1,14 +1,16 @@
 package com.creatubbles.api.core;
 
 public abstract class CreatubblesResponse {
+
     public String message;
-    private CreatubblesRequest originatingRequest;
+    // Type is unnecessary because the response has obviously already been gotten
+    private CreatubblesRequest<?> originatingRequest;
 
-    public final CreatubblesRequest getOriginalRequest() {
+    public final CreatubblesRequest<?> getOriginalRequest() {
         return originatingRequest;
     }
 
-    public void setOriginatingRequest(CreatubblesRequest originatingRequest) {
+    public void setOriginatingRequest(CreatubblesRequest<?> originatingRequest) {
         this.originatingRequest = originatingRequest;
     }
 }
diff --git a/src/main/java/com/creatubbles/api/request/amazon/GetAmazonTokenRequest.java b/src/main/java/com/creatubbles/api/request/amazon/GetAmazonTokenRequest.java
@@ -12,7 +12,7 @@ public GetAmazonTokenRequest(String accessToken) {
     }
 
     @Override
-    public Class getResponseClass() {
+    public Class<? extends GetAmazonTokenResponse> getResponseClass() {
         return GetAmazonTokenResponse.class;
     }
 }
diff --git a/src/main/java/com/creatubbles/api/request/creation/GetCreationsRequest.java b/src/main/java/com/creatubbles/api/request/creation/GetCreationsRequest.java
@@ -1,12 +1,11 @@
 package com.creatubbles.api.request.creation;
 
 import com.creatubbles.api.core.CreatubblesRequest;
-import com.creatubbles.api.core.CreatubblesResponse;
 import com.creatubbles.api.response.creation.GetCreationsResponse;
 import com.creatubbles.api.util.EndPoints;
 import com.creatubbles.api.util.HttpMethod;
 
-public class GetCreationsRequest extends CreatubblesRequest {
+public class GetCreationsRequest extends CreatubblesRequest<GetCreationsResponse> {
 
     public GetCreationsRequest() {
         super(EndPoints.CREATIONS, HttpMethod.GET);
@@ -21,7 +20,7 @@ public GetCreationsRequest(String id, String accessToken) {
     }
 
     public String getCreatorIdParam() {
-        return getUrlParameters().get("creator_id");
+        return getUrlParameter("creator_id");
     }
 
     public GetCreationsRequest setCreatorIdParam(boolean creatorId) {
@@ -30,7 +29,7 @@ public GetCreationsRequest setCreatorIdParam(boolean creatorId) {
     }
 
     public String getByCreatorIdParam() {
-        return getUrlParameters().get("by_creator");
+        return getUrlParameter("by_creator");
     }
 
     public GetCreationsRequest setByCreatorIdParam(boolean creatorId) {
@@ -39,7 +38,7 @@ public GetCreationsRequest setByCreatorIdParam(boolean creatorId) {
     }
 
     public boolean getFeaturedParam() {
-        return Boolean.parseBoolean(getUrlParameters().get("featured"));
+        return Boolean.parseBoolean(getUrlParameter("featured"));
     }
 
     public GetCreationsRequest setFeaturedParam(boolean featured) {
@@ -48,7 +47,7 @@ public GetCreationsRequest setFeaturedParam(boolean featured) {
     }
 
     public boolean getRecentParam() {
-        return Boolean.parseBoolean(getUrlParameters().get("recent"));
+        return Boolean.parseBoolean(getUrlParameter("recent"));
     }
 
     public GetCreationsRequest setRecentParam(boolean recent) {
@@ -57,7 +56,7 @@ public GetCreationsRequest setRecentParam(boolean recent) {
     }
 
     public boolean getPopularParam() {
-        return Boolean.parseBoolean(getUrlParameters().get("popular"));
+        return Boolean.parseBoolean(getUrlParameter("popular"));
     }
 
     public GetCreationsRequest setPopularParam(boolean popular) {
@@ -66,7 +65,7 @@ public GetCreationsRequest setPopularParam(boolean popular) {
     }
 
     public boolean getBubbledParam() {
-        return Boolean.parseBoolean(getUrlParameters().get("bubbled"));
+        return Boolean.parseBoolean(getUrlParameter("bubbled"));
     }
 
     public GetCreationsRequest setBubbledParam(boolean bubbled) {
@@ -76,7 +75,7 @@ public GetCreationsRequest setBubbledParam(boolean bubbled) {
 
     public Integer getPageNumber() {
         try {
-            return Integer.parseInt(getUrlParameters().get("page"));
+            return Integer.parseInt(getUrlParameter("page"));
         } catch (NumberFormatException e) {
 
         }
@@ -89,7 +88,7 @@ public GetCreationsRequest setPageNumber(int pageNumber) {
     }
 
     @Override
-    public Class<? extends CreatubblesResponse> getResponseClass() {
+    public Class<? extends GetCreationsResponse> getResponseClass() {
         return GetCreationsResponse.class;
     }
 }
diff --git a/src/main/java/com/creatubbles/api/request/creation/SearchCreationsRequest.java b/src/main/java/com/creatubbles/api/request/creation/SearchCreationsRequest.java
@@ -1,20 +1,19 @@
 package com.creatubbles.api.request.creation;
 
 import com.creatubbles.api.core.CreatubblesRequest;
-import com.creatubbles.api.core.CreatubblesResponse;
 import com.creatubbles.api.response.creation.SearchCreationsResponse;
 import com.creatubbles.api.util.EndPoints;
 import com.creatubbles.api.util.HttpMethod;
 
-public class SearchCreationsRequest extends CreatubblesRequest {
+public class SearchCreationsRequest extends CreatubblesRequest<SearchCreationsResponse> {
 
     public SearchCreationsRequest(String searchParam) {
         super(EndPoints.SEARCH_CREATIONS, HttpMethod.GET);
         setUrlParameter("search", searchParam);
     }
 
     public String getSearchParam() {
-        return getUrlParameters().get("search");
+        return getUrlParameter("search");
     }
 
     public SearchCreationsRequest setSearchParam(String searchParam) {
@@ -24,7 +23,7 @@ public SearchCreationsRequest setSearchParam(String searchParam) {
 
     public Integer getPageNumber() {
         try {
-            return Integer.parseInt(getUrlParameters().get("page"));
+            return Integer.parseInt(getUrlParameter("page"));
         } catch (NumberFormatException e) {
 
         }
@@ -37,7 +36,7 @@ public SearchCreationsRequest setPageNumber(int pageNumber) {
     }
 
     @Override
-    public Class<? extends CreatubblesResponse> getResponseClass() {
+    public Class<? extends SearchCreationsResponse> getResponseClass() {
         return SearchCreationsResponse.class;
     }
 }
diff --git a/src/main/java/com/creatubbles/api/request/creation/UploadCreationRequest.java b/src/main/java/com/creatubbles/api/request/creation/UploadCreationRequest.java
@@ -1,20 +1,19 @@
 package com.creatubbles.api.request.creation;
 
 import com.creatubbles.api.core.CreatubblesRequest;
-import com.creatubbles.api.core.CreatubblesResponse;
 import com.creatubbles.api.response.creation.UploadCreationResponse;
 import com.creatubbles.api.util.EndPoints;
 import com.creatubbles.api.util.HttpMethod;
 
 // TODO Order of operations (and how the upload actually happens) is kind of vague in the API docs - figure out OoO
-public class UploadCreationRequest extends CreatubblesRequest {
+public class UploadCreationRequest extends CreatubblesRequest<UploadCreationResponse> {
 
     public UploadCreationRequest() {
         super(EndPoints.CREATIONS, HttpMethod.POST);
     }
 
     @Override
-    public Class<? extends CreatubblesResponse> getResponseClass() {
+    public Class<? extends UploadCreationResponse> getResponseClass() {
         return UploadCreationResponse.class;
     }
 }
diff --git a/src/main/java/com/creatubbles/api/request/creator/CreatorsFollowersRequest.java b/src/main/java/com/creatubbles/api/request/creator/CreatorsFollowersRequest.java
@@ -18,7 +18,7 @@ public CreatorsFollowersRequest(String id, int page) {
 
     public Integer getPageNumber() {
         try {
-            return Integer.parseInt(getUrlParameters().get("page"));
+            return Integer.parseInt(getUrlParameter("page"));
         } catch (NumberFormatException e) {
 
         }
diff --git a/src/main/java/com/creatubbles/api/request/creator/CreatorsFollowingUsersRequest.java b/src/main/java/com/creatubbles/api/request/creator/CreatorsFollowingUsersRequest.java
@@ -19,7 +19,7 @@ public CreatorsFollowingUsersRequest(String id, int page) {
 
     public Integer getPageNumber() {
         try {
-            return Integer.parseInt(getUrlParameters().get("page"));
+            return Integer.parseInt(getUrlParameter("page"));
         } catch (NumberFormatException e) {
 
         }
diff --git a/src/main/java/com/creatubbles/api/request/creator/UsersCreatorsRequest.java b/src/main/java/com/creatubbles/api/request/creator/UsersCreatorsRequest.java
@@ -30,7 +30,7 @@ public UsersCreatorsRequest(String id, String accessToken, int pageNumber) {
 
     public Integer getPageNumber() {
         try {
-            return Integer.parseInt(getUrlParameters().get("page"));
+            return Integer.parseInt(getUrlParameter("page"));
         } catch (NumberFormatException e) {
 
         }
diff --git a/src/main/java/com/creatubbles/api/util/ResponseParser.java b/src/main/java/com/creatubbles/api/util/ResponseParser.java
@@ -21,8 +21,7 @@ public class ResponseParser {
             .registerTypeAdapter(Gallery.class, new Gallery())
             .create();
 
-    public static CreatubblesResponse parse(Response response, Class requestClass) {
-
+    public static CreatubblesResponse parse(Response response, Class<?> requestClass) {
         return null;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public CreatubblesRequest(String endPoint, HttpMethod httpMethod, String accessT`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public CreatubblesRequest setAccessToken(String accessToken) {`
	`48`	`+ public CreatubblesRequest<T> setAccessToken(String accessToken) {`
`49`	`49`	`this.urlParameters.put("access_token", accessToken);`
`50`	`50`	`return this;`
`51`	`51`	`}`
`@@ -68,8 +68,8 @@ public CreatubblesRequest<T> setHttpMethod(HttpMethod httpMethod) {`
`68`	`68`	`return this;`
`69`	`69`	`}`
`70`	`70`
`71`		`- public Map<String, String> getUrlParameters() {`
`72`		`- return urlParameters;`
	`71`	`+ public String getUrlParameter(String key) {`
	`72`	`+ return urlParameters.get(key);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public String getAcceptLanguage() {`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,16 @@`
`1`	`1`	`package com.creatubbles.api.core;`
`2`	`2`
`3`	`3`	`public abstract class CreatubblesResponse {`
	`4`	`+`
`4`	`5`	`public String message;`
`5`		`- private CreatubblesRequest originatingRequest;`
	`6`	`+ // Type is unnecessary because the response has obviously already been gotten`
	`7`	`+ private CreatubblesRequest<?> originatingRequest;`
`6`	`8`
`7`		`- public final CreatubblesRequest getOriginalRequest() {`
	`9`	`+ public final CreatubblesRequest<?> getOriginalRequest() {`
`8`	`10`	`return originatingRequest;`
`9`	`11`	`}`
`10`	`12`
`11`		`- public void setOriginatingRequest(CreatubblesRequest originatingRequest) {`
	`13`	`+ public void setOriginatingRequest(CreatubblesRequest<?> originatingRequest) {`
`12`	`14`	`this.originatingRequest = originatingRequest;`
`13`	`15`	`}`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public GetAmazonTokenRequest(String accessToken) {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`@Override`
`15`		`- public Class getResponseClass() {`
	`15`	`+ public Class<? extends GetAmazonTokenResponse> getResponseClass() {`
`16`	`16`	`return GetAmazonTokenResponse.class;`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`	`1`	`package com.creatubbles.api.request.creation;`
`2`	`2`
`3`	`3`	`import com.creatubbles.api.core.CreatubblesRequest;`
`4`		`-import com.creatubbles.api.core.CreatubblesResponse;`
`5`	`4`	`import com.creatubbles.api.response.creation.GetCreationsResponse;`
`6`	`5`	`import com.creatubbles.api.util.EndPoints;`
`7`	`6`	`import com.creatubbles.api.util.HttpMethod;`
`8`	`7`
`9`		`-public class GetCreationsRequest extends CreatubblesRequest {`
	`8`	`+public class GetCreationsRequest extends CreatubblesRequest<GetCreationsResponse> {`
`10`	`9`
`11`	`10`	`public GetCreationsRequest() {`
`12`	`11`	`super(EndPoints.CREATIONS, HttpMethod.GET);`
`@@ -21,7 +20,7 @@ public GetCreationsRequest(String id, String accessToken) {`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`public String getCreatorIdParam() {`
`24`		`- return getUrlParameters().get("creator_id");`
	`23`	`+ return getUrlParameter("creator_id");`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`public GetCreationsRequest setCreatorIdParam(boolean creatorId) {`
`@@ -30,7 +29,7 @@ public GetCreationsRequest setCreatorIdParam(boolean creatorId) {`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`public String getByCreatorIdParam() {`
`33`		`- return getUrlParameters().get("by_creator");`
	`32`	`+ return getUrlParameter("by_creator");`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`public GetCreationsRequest setByCreatorIdParam(boolean creatorId) {`
`@@ -39,7 +38,7 @@ public GetCreationsRequest setByCreatorIdParam(boolean creatorId) {`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`public boolean getFeaturedParam() {`
`42`		`- return Boolean.parseBoolean(getUrlParameters().get("featured"));`
	`41`	`+ return Boolean.parseBoolean(getUrlParameter("featured"));`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`public GetCreationsRequest setFeaturedParam(boolean featured) {`
`@@ -48,7 +47,7 @@ public GetCreationsRequest setFeaturedParam(boolean featured) {`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`public boolean getRecentParam() {`
`51`		`- return Boolean.parseBoolean(getUrlParameters().get("recent"));`
	`50`	`+ return Boolean.parseBoolean(getUrlParameter("recent"));`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`public GetCreationsRequest setRecentParam(boolean recent) {`
`@@ -57,7 +56,7 @@ public GetCreationsRequest setRecentParam(boolean recent) {`
`57`	`56`	`}`
`58`	`57`
`59`	`58`	`public boolean getPopularParam() {`
`60`		`- return Boolean.parseBoolean(getUrlParameters().get("popular"));`
	`59`	`+ return Boolean.parseBoolean(getUrlParameter("popular"));`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`public GetCreationsRequest setPopularParam(boolean popular) {`
`@@ -66,7 +65,7 @@ public GetCreationsRequest setPopularParam(boolean popular) {`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`public boolean getBubbledParam() {`
`69`		`- return Boolean.parseBoolean(getUrlParameters().get("bubbled"));`
	`68`	`+ return Boolean.parseBoolean(getUrlParameter("bubbled"));`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`public GetCreationsRequest setBubbledParam(boolean bubbled) {`
`@@ -76,7 +75,7 @@ public GetCreationsRequest setBubbledParam(boolean bubbled) {`
`76`	`75`
`77`	`76`	`public Integer getPageNumber() {`
`78`	`77`	`try {`
`79`		`- return Integer.parseInt(getUrlParameters().get("page"));`
	`78`	`+ return Integer.parseInt(getUrlParameter("page"));`
`80`	`79`	`} catch (NumberFormatException e) {`
`81`	`80`
`82`	`81`	`}`
`@@ -89,7 +88,7 @@ public GetCreationsRequest setPageNumber(int pageNumber) {`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`@Override`
`92`		`- public Class<? extends CreatubblesResponse> getResponseClass() {`
	`91`	`+ public Class<? extends GetCreationsResponse> getResponseClass() {`
`93`	`92`	`return GetCreationsResponse.class;`
`94`	`93`	`}`
`95`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,19 @@`
`1`	`1`	`package com.creatubbles.api.request.creation;`
`2`	`2`
`3`	`3`	`import com.creatubbles.api.core.CreatubblesRequest;`
`4`		`-import com.creatubbles.api.core.CreatubblesResponse;`
`5`	`4`	`import com.creatubbles.api.response.creation.SearchCreationsResponse;`
`6`	`5`	`import com.creatubbles.api.util.EndPoints;`
`7`	`6`	`import com.creatubbles.api.util.HttpMethod;`
`8`	`7`
`9`		`-public class SearchCreationsRequest extends CreatubblesRequest {`
	`8`	`+public class SearchCreationsRequest extends CreatubblesRequest<SearchCreationsResponse> {`
`10`	`9`
`11`	`10`	`public SearchCreationsRequest(String searchParam) {`
`12`	`11`	`super(EndPoints.SEARCH_CREATIONS, HttpMethod.GET);`
`13`	`12`	`setUrlParameter("search", searchParam);`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`public String getSearchParam() {`
`17`		`- return getUrlParameters().get("search");`
	`16`	`+ return getUrlParameter("search");`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`public SearchCreationsRequest setSearchParam(String searchParam) {`
`@@ -24,7 +23,7 @@ public SearchCreationsRequest setSearchParam(String searchParam) {`
`24`	`23`
`25`	`24`	`public Integer getPageNumber() {`
`26`	`25`	`try {`
`27`		`- return Integer.parseInt(getUrlParameters().get("page"));`
	`26`	`+ return Integer.parseInt(getUrlParameter("page"));`
`28`	`27`	`} catch (NumberFormatException e) {`
`29`	`28`
`30`	`29`	`}`
`@@ -37,7 +36,7 @@ public SearchCreationsRequest setPageNumber(int pageNumber) {`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`@Override`
`40`		`- public Class<? extends CreatubblesResponse> getResponseClass() {`
	`39`	`+ public Class<? extends SearchCreationsResponse> getResponseClass() {`
`41`	`40`	`return SearchCreationsResponse.class;`
`42`	`41`	`}`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public CreatorsFollowersRequest(String id, int page) {`
`18`	`18`
`19`	`19`	`public Integer getPageNumber() {`
`20`	`20`	`try {`
`21`		`- return Integer.parseInt(getUrlParameters().get("page"));`
	`21`	`+ return Integer.parseInt(getUrlParameter("page"));`
`22`	`22`	`} catch (NumberFormatException e) {`
`23`	`23`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public CreatorsFollowingUsersRequest(String id, int page) {`
`19`	`19`
`20`	`20`	`public Integer getPageNumber() {`
`21`	`21`	`try {`
`22`		`- return Integer.parseInt(getUrlParameters().get("page"));`
	`22`	`+ return Integer.parseInt(getUrlParameter("page"));`
`23`	`23`	`} catch (NumberFormatException e) {`
`24`	`24`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public UsersCreatorsRequest(String id, String accessToken, int pageNumber) {`
`30`	`30`
`31`	`31`	`public Integer getPageNumber() {`
`32`	`32`	`try {`
`33`		`- return Integer.parseInt(getUrlParameters().get("page"));`
	`33`	`+ return Integer.parseInt(getUrlParameter("page"));`
`34`	`34`	`} catch (NumberFormatException e) {`
`35`	`35`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ public class ResponseParser {`
`21`	`21`	`.registerTypeAdapter(Gallery.class, new Gallery())`
`22`	`22`	`.create();`
`23`	`23`
`24`		`- public static CreatubblesResponse parse(Response response, Class requestClass) {`
`25`		`-`
	`24`	`+ public static CreatubblesResponse parse(Response response, Class<?> requestClass) {`
`26`	`25`	`return null;`
`27`	`26`	`}`
`28`	`27`	`}`