Set a back reference in the CreatubblesResponse object to the originating CreatubblesRequest object (for checking response codes, etc)

pahimar · pahimar · commit 7763727e50b1 · 2015-10-26T15:24:16.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,6 +45,11 @@ public CreatubblesRequest(String endPoint, HttpMethod httpMethod, String accessT
         }
     }
 
+    public CreatubblesRequest setAccessToken(String accessToken) {
+        this.urlParameters.put("access_token", accessToken);
+        return this;
+    }
+
     public String getEndPoint() {
         return endPoint;
     }
@@ -112,6 +117,13 @@ public boolean isDone() {
         return ((response != null) || (futureResponse != null && futureResponse.isDone()));
     }
 
+    public boolean wasSuccessful() {
+        if (isDone()) {
+            return getRawResponse().getStatus() == 200;
+        }
+        return false;
+    }
+
     public void cancelRequest() {
         if (futureResponse != null & !futureResponse.isDone()) {
             futureResponse.cancel(true);
@@ -136,7 +148,9 @@ public T getResponse() {
         Response response = getRawResponse();
         Class<? extends T> responseClass = getResponseClass();
         if (response != null && responseClass != null) {
-            return CreatubblesAPI.GSON.fromJson(response.readEntity(String.class), responseClass);
+            T creatubblesResponse = CreatubblesAPI.GSON.fromJson(response.readEntity(String.class), responseClass);
+            creatubblesResponse.setOriginatingRequest(this);
+            return creatubblesResponse;
         }
 
         return null;
diff --git a/src/main/java/com/creatubbles/api/core/CreatubblesResponse.java b/src/main/java/com/creatubbles/api/core/CreatubblesResponse.java
@@ -2,4 +2,13 @@
 
 public abstract class CreatubblesResponse {
     public String message;
+    private CreatubblesRequest originatingRequest;
+
+    public final CreatubblesRequest getOriginalRequest() {
+        return originatingRequest;
+    }
+
+    public void setOriginatingRequest(CreatubblesRequest originatingRequest) {
+        this.originatingRequest = originatingRequest;
+    }
 }
diff --git a/src/main/java/com/creatubbles/api/request/creation/CreationRequest.java b/src/main/java/com/creatubbles/api/request/creation/CreationRequest.java
diff --git a/src/main/java/com/creatubbles/api/request/creation/GetCreationsRequest.java b/src/main/java/com/creatubbles/api/request/creation/GetCreationsRequest.java
@@ -0,0 +1,95 @@
+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 GetCreationsRequest() {
+        super(EndPoints.CREATIONS, HttpMethod.GET);
+    }
+
+    public GetCreationsRequest(String id) {
+        super(String.format(EndPoints.CREATORS_CREATIONS, id), HttpMethod.GET);
+    }
+
+    public GetCreationsRequest(String id, String accessToken) {
+        super(String.format(EndPoints.CREATORS_CREATIONS, id), HttpMethod.GET, accessToken);
+    }
+
+    public String getCreatorIdParam() {
+        return getUrlParameters().get("creator_id");
+    }
+
+    public GetCreationsRequest setCreatorIdParam(boolean creatorId) {
+        setUrlParameter("creator_id", String.valueOf(creatorId));
+        return this;
+    }
+
+    public String getByCreatorIdParam() {
+        return getUrlParameters().get("by_creator");
+    }
+
+    public GetCreationsRequest setByCreatorIdParam(boolean creatorId) {
+        setUrlParameter("by_creator", String.valueOf(creatorId));
+        return this;
+    }
+
+    public boolean getFeaturedParam() {
+        return Boolean.parseBoolean(getUrlParameters().get("featured"));
+    }
+
+    public GetCreationsRequest setFeaturedParam(boolean featured) {
+        setUrlParameter("featured", String.valueOf(featured));
+        return this;
+    }
+
+    public boolean getRecentParam() {
+        return Boolean.parseBoolean(getUrlParameters().get("recent"));
+    }
+
+    public GetCreationsRequest setRecentParam(boolean recent) {
+        setUrlParameter("recent", String.valueOf(recent));
+        return this;
+    }
+
+    public boolean getPopularParam() {
+        return Boolean.parseBoolean(getUrlParameters().get("popular"));
+    }
+
+    public GetCreationsRequest setPopularParam(boolean popular) {
+        setUrlParameter("popular", String.valueOf(popular));
+        return this;
+    }
+
+    public boolean getBubbledParam() {
+        return Boolean.parseBoolean(getUrlParameters().get("bubbled"));
+    }
+
+    public GetCreationsRequest setBubbledParam(boolean bubbled) {
+        setUrlParameter("bubbled", String.valueOf(bubbled));
+        return this;
+    }
+
+    public Integer getPageNumber() {
+        try {
+            return Integer.parseInt(getUrlParameters().get("page"));
+        } catch (NumberFormatException e) {
+
+        }
+        return null;
+    }
+
+    public GetCreationsRequest setPageNumber(int pageNumber) {
+        setUrlParameter("page", String.valueOf(pageNumber));
+        return this;
+    }
+
+    @Override
+    public Class<? extends CreatubblesResponse> 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
@@ -0,0 +1,43 @@
+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 SearchCreationsRequest(String searchParam) {
+        super(EndPoints.SEARCH_CREATIONS, HttpMethod.GET);
+        setUrlParameter("search", searchParam);
+    }
+
+    public String getSearchParam() {
+        return getUrlParameters().get("search");
+    }
+
+    public SearchCreationsRequest setSearchParam(String searchParam) {
+        setUrlParameter("search", searchParam);
+        return this;
+    }
+
+    public Integer getPageNumber() {
+        try {
+            return Integer.parseInt(getUrlParameters().get("page"));
+        } catch (NumberFormatException e) {
+
+        }
+        return null;
+    }
+
+    public SearchCreationsRequest setPageNumber(int pageNumber) {
+        setUrlParameter("page", String.valueOf(pageNumber));
+        return this;
+    }
+
+    @Override
+    public Class<? extends CreatubblesResponse> 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
@@ -0,0 +1,20 @@
+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 UploadCreationRequest() {
+        super(EndPoints.CREATIONS, HttpMethod.POST);
+    }
+
+    @Override
+    public Class<? extends CreatubblesResponse> 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
@@ -16,6 +16,20 @@ public CreatorsFollowersRequest(String id, int page) {
         setUrlParameter("page", String.valueOf(page));
     }
 
+    public Integer getPageNumber() {
+        try {
+            return Integer.parseInt(getUrlParameters().get("page"));
+        } catch (NumberFormatException e) {
+
+        }
+        return null;
+    }
+
+    public CreatorsFollowersRequest setPageNumber(int pageNumber) {
+        setUrlParameter("page", String.valueOf(pageNumber));
+        return this;
+    }
+
     @Override
     public Class<? extends CreatorsFollowersResponse> getResponseClass() {
         return CreatorsFollowersResponse.class;
diff --git a/src/main/java/com/creatubbles/api/request/creator/CreatorsFollowingUsersRequest.java b/src/main/java/com/creatubbles/api/request/creator/CreatorsFollowingUsersRequest.java
@@ -17,6 +17,20 @@ public CreatorsFollowingUsersRequest(String id, int page) {
         setUrlParameter("page", String.valueOf(page));
     }
 
+    public Integer getPageNumber() {
+        try {
+            return Integer.parseInt(getUrlParameters().get("page"));
+        } catch (NumberFormatException e) {
+
+        }
+        return null;
+    }
+
+    public CreatorsFollowingUsersRequest setPageNumber(int pageNumber) {
+        setUrlParameter("page", String.valueOf(pageNumber));
+        return this;
+    }
+
     @Override
     public Class<? extends CreatorsFollowingUsersResponse> getResponseClass() {
         return CreatorsFollowingUsersResponse.class;
diff --git a/src/main/java/com/creatubbles/api/request/creator/UsersCreatorsRequest.java b/src/main/java/com/creatubbles/api/request/creator/UsersCreatorsRequest.java
@@ -37,8 +37,9 @@ public Integer getPageNumber() {
         return null;
     }
 
-    public void setPageNumber(int pageNumber) {
+    public UsersCreatorsRequest setPageNumber(int pageNumber) {
         setUrlParameter("page", String.valueOf(pageNumber));
+        return this;
     }
 
     @Override
diff --git a/src/main/java/com/creatubbles/api/response/creation/GetCreationsResponse.java b/src/main/java/com/creatubbles/api/response/creation/GetCreationsResponse.java
@@ -1,11 +1,11 @@
-package com.creatubbles.api.response;
+package com.creatubbles.api.response.creation;
 
 import com.creatubbles.api.core.Creation;
 import com.creatubbles.api.core.CreatubblesResponse;
 
 import java.util.List;
 
-public class CreationResponse extends CreatubblesResponse {
+public class GetCreationsResponse extends CreatubblesResponse {
     public int total_entries, total_pages, page;
     public List<Creation> creations;
 }
diff --git a/src/main/java/com/creatubbles/api/response/creation/SearchCreationsResponse.java b/src/main/java/com/creatubbles/api/response/creation/SearchCreationsResponse.java
@@ -0,0 +1,12 @@
+package com.creatubbles.api.response.creation;
+
+import com.creatubbles.api.core.Creation;
+import com.creatubbles.api.core.CreatubblesResponse;
+
+import java.util.List;
+
+public class SearchCreationsResponse extends CreatubblesResponse {
+    public int total_entries, total_pages;
+    public String page;
+    public List<Creation> creations;
+}
diff --git a/src/main/java/com/creatubbles/api/response/creation/UploadCreationResponse.java b/src/main/java/com/creatubbles/api/response/creation/UploadCreationResponse.java
@@ -0,0 +1,6 @@
+package com.creatubbles.api.response.creation;
+
+import com.creatubbles.api.core.CreatubblesResponse;
+
+public class UploadCreationResponse extends CreatubblesResponse {
+}
diff --git a/src/main/java/com/creatubbles/api/util/EndPoints.java b/src/main/java/com/creatubbles/api/util/EndPoints.java
@@ -27,6 +27,8 @@ public class EndPoints {
 
     public static final String CREATORS_CREATIONS = "creators/%s/creations.json";
 
+    public static final String SEARCH_CREATIONS = "search/creations.json";
+
     public static final String AWS_TOKEN = "sessions/aws_token.json";
 
 }
diff --git a/src/main/java/com/creatubbles/api/util/ResponseParser.java b/src/main/java/com/creatubbles/api/util/ResponseParser.java
@@ -0,0 +1,28 @@
+package com.creatubbles.api.util;
+
+import com.creatubbles.api.core.CreatubblesResponse;
+import com.creatubbles.api.core.Gallery;
+import com.creatubbles.api.response.auth.SignUpResponse;
+import com.creatubbles.api.response.creator.CreateCreatorResponse;
+import com.creatubbles.api.response.gallery.CreateUserGalleryResponse;
+import com.creatubbles.api.response.user.UserProfileResponse;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import javax.ws.rs.core.Response;
+
+public class ResponseParser {
+
+    public final static Gson GSON = new GsonBuilder()
+            .registerTypeAdapter(SignUpResponse.class, new SignUpResponse())
+            .registerTypeAdapter(UserProfileResponse.class, new UserProfileResponse())
+            .registerTypeAdapter(CreateCreatorResponse.class, new CreateCreatorResponse())
+            .registerTypeAdapter(CreateUserGalleryResponse.class, new CreateUserGalleryResponse())
+            .registerTypeAdapter(Gallery.class, new Gallery())
+            .create();
+
+    public static CreatubblesResponse parse(Response response, Class requestClass) {
+
+        return null;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,9 @@ public Integer getPageNumber() {`
`37`	`37`	`return null;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public void setPageNumber(int pageNumber) {`
	`40`	`+ public UsersCreatorsRequest setPageNumber(int pageNumber) {`
`41`	`41`	`setUrlParameter("page", String.valueOf(pageNumber));`
	`42`	`+ return this;`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`@Override`