Deprecate old APIv1 stuff, clean up

tterrag1098 · tterrag1098 · commit ae9fd9456bbd · 2016-01-08T15:31:12.000-05:00
diff --git a/src/main/java/com/creatubbles/api/CreatubblesAPI.java b/src/main/java/com/creatubbles/api/CreatubblesAPI.java
@@ -1,15 +1,18 @@
 package com.creatubbles.api;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.JerseyClient;
+import org.glassfish.jersey.client.JerseyClientBuilder;
+
 import com.creatubbles.api.core.Gallery;
 import com.creatubbles.api.request.amazon.UploadS3ImageRequest;
-import com.creatubbles.api.request.auth.OAuthAccessTokenRequest;
 import com.creatubbles.api.request.creation.CreateCreationRequest;
 import com.creatubbles.api.request.creation.CreationsUploadsRequest;
-import com.creatubbles.api.request.creation.GetCreationsRequest;
 import com.creatubbles.api.request.creation.PingCreationsUploadsRequest;
-import com.creatubbles.api.request.creator.GetCreatorsRequest;
-import com.creatubbles.api.request.user.UserProfileRequest;
-import com.creatubbles.api.response.auth.OAuthAccessTokenResponse;
 import com.creatubbles.api.response.auth.SignUpResponse;
 import com.creatubbles.api.response.creation.CreateCreationResponse;
 import com.creatubbles.api.response.creation.CreationsUploadsResponse;
@@ -19,17 +22,12 @@
 import com.creatubbles.api.response.gallery.CreateUserGalleryResponse;
 import com.creatubbles.api.response.user.UserProfileResponse;
 import com.creatubbles.api.util.EndPoints;
+import com.creatubbles.test.request.AuthTests;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.JerseyClient;
-import org.glassfish.jersey.client.JerseyClientBuilder;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
 
 
+@SuppressWarnings("deprecation")
 public class CreatubblesAPI {
     public final static Gson GSON = new GsonBuilder()
             .registerTypeAdapter(SignUpResponse.class, new SignUpResponse())
@@ -62,23 +60,10 @@ public static void setStagingMode(boolean staging) {
     }
 
     public static void main(String[] args) throws IOException {
+        // Additional examples can be found in the JUnit test files
+        
         CreatubblesAPI.setStagingMode(true);
-        OAuthAccessTokenRequest request = new OAuthAccessTokenRequest("jevgeni.koltsin@gmail.com", "ccttbb");
-        OAuthAccessTokenResponse response = request.execute().getResponse();
-        String accessToken = response.access_token;
-        System.out.println(accessToken);
-
-        UserProfileRequest userProfileRequest = new UserProfileRequest(accessToken);
-        UserProfileResponse userProfileResponse = userProfileRequest.execute().getResponse();
-        System.out.println(userProfileResponse.user.id);
-
-        GetCreatorsRequest getCreators = new GetCreatorsRequest(userProfileResponse.user.id, accessToken);
-        GetCreatorsResponse getCreatorsResponse = getCreators.execute().getResponse();
-        System.out.println(getCreatorsResponse.creators != null);
-
-        GetCreationsRequest getCreations = new GetCreationsRequest(userProfileResponse.user.id, accessToken);
-        GetCreationsResponse getCreationsResponse = getCreations.execute().getResponse();
-        System.out.println(getCreationsResponse.total_count);
+        String accessToken = AuthTests.getAuthToken();
 
         CreateCreationRequest createCreation = new CreateCreationRequest(accessToken);
         CreateCreationResponse createCreationResponse = createCreation.execute().getResponse();
diff --git a/src/main/java/com/creatubbles/api/core/Creation.java b/src/main/java/com/creatubbles/api/core/Creation.java
@@ -6,7 +6,6 @@ public class Creation {
     public int created_at_month, created_at_year, comments_count, bubble_count, views_count;
     public String last_bubbled_at, last_commented_at, last_submitted_at;
     public Image image;
-    public Creator[] creators;
     public String store_dir;
     public String url;
 }
diff --git a/src/main/java/com/creatubbles/api/core/Creator.java b/src/main/java/com/creatubbles/api/core/Creator.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+@Deprecated
 public class Creator {
     public String id;
     public String name, created_at, avatar_url;
diff --git a/src/main/java/com/creatubbles/api/core/CreatubblesRequest.java b/src/main/java/com/creatubbles/api/core/CreatubblesRequest.java
@@ -2,16 +2,21 @@
 
 import com.creatubbles.api.CreatubblesAPI;
 import com.creatubbles.api.util.HttpMethod;
+import com.google.gson.JsonSyntaxException;
+
 import org.glassfish.jersey.client.JerseyWebTarget;
 
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.core.Response;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import jersey.repackaged.com.google.common.base.Throwables;
+
 public abstract class CreatubblesRequest<T extends CreatubblesResponse> {
     private String endPoint, acceptLanguage, data;
     private String xSource = "mc-mod";
@@ -136,7 +141,7 @@ public void cancelRequest() {
     }
 
     public Response getRawResponse() {
-        if (response == null && futureResponse.isDone()) {
+        if (response == null && futureResponse != null && futureResponse.isDone()) {
             try {
                 response = futureResponse.get();
             } catch (InterruptedException e) {
@@ -158,8 +163,21 @@ public T getResponse() {
                 if (isSuccessStatus(response) && json.isEmpty()) {
                     json = EMPTY_RESPONSE;
                 }
-                T creatubblesResponse = CreatubblesAPI.GSON.fromJson(json, responseClass);
-                creatubblesResponse.setOriginatingRequest(this);
+                T creatubblesResponse = null;
+                try {
+                    creatubblesResponse = CreatubblesAPI.GSON.fromJson(json, responseClass);
+                } catch (JsonSyntaxException e) { // protect against invalid API returns (for now)
+                    e.printStackTrace();
+                }
+                if (creatubblesResponse == null) {
+                    try {
+                        creatubblesResponse = responseClass.newInstance();
+                    } catch (Exception e) {
+                        Throwables.propagate(e);
+                    }
+                } else {
+                    creatubblesResponse.setOriginatingRequest(this);
+                }
                 responseCache = creatubblesResponse;
             }
         }
diff --git a/src/main/java/com/creatubbles/api/core/Image.java b/src/main/java/com/creatubbles/api/core/Image.java
@@ -1,14 +1,19 @@
 package com.creatubbles.api.core;
 
-import java.util.List;
+import java.util.Map;
 
 public class Image {
-    public String url;
-    public Links links;
-    public List<Creator> creators;
-    public String store_dir;
 
-    public class Links {
-        public String full_view, list_view_retina, list_view, matrix_view_retina, matrix_view, gallery_mobile, explore_mobile, share;
+    public Map<ImageType, String> links;
+
+    public enum ImageType {
+        full_view,
+        list_view_retina,
+        list_view,
+        matrix_view_retina,
+        matrix_view,
+        gallery_mobile,
+        explore_mobile,
+        share;
     }
 }
diff --git a/src/main/java/com/creatubbles/api/request/creation/CreateCreationRequest.java b/src/main/java/com/creatubbles/api/request/creation/CreateCreationRequest.java
@@ -9,7 +9,6 @@
 @APIVersion(2)
 public class CreateCreationRequest extends CreatubblesRequest<CreateCreationResponse> {
 
-
     public CreateCreationRequest(String accessToken) {
         super(EndPoints.CREATIONS, HttpMethod.POST, accessToken);
     }
diff --git a/src/main/java/com/creatubbles/api/request/creator/CreateCreatorRequest.java b/src/main/java/com/creatubbles/api/request/creator/CreateCreatorRequest.java
@@ -1,14 +1,15 @@
 package com.creatubbles.api.request.creator;
 
-import com.creatubbles.api.CreatubblesAPI;
 import com.creatubbles.api.APIVersion;
+import com.creatubbles.api.CreatubblesAPI;
 import com.creatubbles.api.core.Creator;
 import com.creatubbles.api.core.CreatubblesRequest;
 import com.creatubbles.api.response.creator.CreateCreatorResponse;
 import com.creatubbles.api.util.EndPoints;
 import com.creatubbles.api.util.HttpMethod;
 
 @APIVersion(1)
+@Deprecated
 public class CreateCreatorRequest extends CreatubblesRequest<CreateCreatorResponse> {
 
     public CreateCreatorRequest(String accessToken, Creator creator) {
diff --git a/src/main/java/com/creatubbles/api/request/creator/GetCreatorsRequest.java b/src/main/java/com/creatubbles/api/request/creator/GetCreatorsRequest.java
@@ -14,7 +14,6 @@ public GetCreatorsRequest(String userId, String token) {
         setUrlParameter(Params.user_id.name(), userId);
     }
 
-
     @Override
     public Class<? extends GetCreatorsResponse> getResponseClass() {
         return GetCreatorsResponse.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
@@ -7,6 +7,7 @@
 import com.creatubbles.api.util.HttpMethod;
 
 @APIVersion(1)
+@Deprecated
 public class UsersCreatorsRequest extends CreatubblesRequest<UsersCreatorsResponse> {
 
     public UsersCreatorsRequest() {
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,19 +1,25 @@
 package com.creatubbles.api.response.creation;
 
+import java.lang.reflect.Type;
+import java.util.List;
+
+import jersey.repackaged.com.google.common.collect.Lists;
+
 import com.creatubbles.api.APIVersion;
 import com.creatubbles.api.CreatubblesAPI;
 import com.creatubbles.api.core.Creation;
 import com.creatubbles.api.core.CreatubblesResponse;
-import com.google.gson.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 
 @APIVersion(2)
 public class GetCreationsResponse extends CreatubblesResponse implements JsonDeserializer<GetCreationsResponse> {
     public int total_pages, total_count;
-    public List<Creation> creations = new ArrayList<Creation>();
+    public List<Creation> creations;
 
     @Override
     public GetCreationsResponse deserialize(JsonElement jsonElement, Type typeOfT, JsonDeserializationContext context) throws
@@ -29,6 +35,7 @@ public GetCreationsResponse deserialize(JsonElement jsonElement, Type typeOfT, J
     private void deserializeData(JsonObject jsonObject) {
         JsonArray data = jsonObject.getAsJsonArray("data");
         if (data != null) {
+            creations = Lists.newArrayList();
             for (int i = 0; i < data.size(); i++) {
                 JsonElement elem = data.get(i);
                 if (!elem.isJsonPrimitive()) {
diff --git a/src/main/java/com/creatubbles/api/response/creator/CreateCreatorResponse.java b/src/main/java/com/creatubbles/api/response/creator/CreateCreatorResponse.java
@@ -1,15 +1,20 @@
 package com.creatubbles.api.response.creator;
 
+import java.lang.reflect.Type;
+import java.util.List;
+
 import com.creatubbles.api.APIVersion;
 import com.creatubbles.api.CreatubblesAPI;
 import com.creatubbles.api.core.Creator;
 import com.creatubbles.api.core.CreatubblesResponse;
-import com.google.gson.*;
-
-import java.lang.reflect.Type;
-import java.util.List;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 
 @APIVersion(1)
+@Deprecated
 public class CreateCreatorResponse extends CreatubblesResponse implements JsonDeserializer<CreateCreatorResponse> {
     public Creator creator;
     public CreateCreatorError errors;
diff --git a/src/main/java/com/creatubbles/api/response/creator/GetCreatorsResponse.java b/src/main/java/com/creatubbles/api/response/creator/GetCreatorsResponse.java
@@ -1,34 +1,41 @@
 package com.creatubbles.api.response.creator;
 
+import java.lang.reflect.Type;
+import java.util.List;
+
+import jersey.repackaged.com.google.common.collect.Lists;
+
 import com.creatubbles.api.APIVersion;
 import com.creatubbles.api.CreatubblesAPI;
-import com.creatubbles.api.core.Creator;
 import com.creatubbles.api.core.CreatubblesResponse;
-import com.google.gson.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
+import com.creatubbles.api.core.User;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 
 @APIVersion(2)
 public class GetCreatorsResponse extends CreatubblesResponse implements JsonDeserializer<GetCreatorsResponse> {
 
-    public List<Creator> creators = new ArrayList<Creator>();
+    public List<User> creators;
 
     @Override
     public GetCreatorsResponse deserialize(JsonElement jsonElement, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         if (!jsonElement.isJsonPrimitive()) {
             JsonObject jsonObject = (JsonObject) jsonElement;
             JsonArray data = jsonObject.getAsJsonArray("data");
             if (data != null) {
+                creators = Lists.newArrayList();
                 for (int i = 0; i < data.size(); i++) {
                     JsonElement elem = data.get(i);
                     if (!elem.isJsonPrimitive()) {
-                        JsonObject obj = (JsonObject) jsonElement;
+                        JsonObject obj = (JsonObject) elem;
                         JsonObject attributes = obj.getAsJsonObject("attributes");
                         JsonElement idE = obj.get("id");
                         if (idE != null && attributes != null) {
-                            Creator creator = CreatubblesAPI.GSON.fromJson(attributes, Creator.class);
+                            User creator = CreatubblesAPI.GSON.fromJson(attributes, User.class);
                             creator.id = idE.getAsString();
                             creators.add(creator);
                         }
diff --git a/src/main/java/com/creatubbles/api/response/creator/UsersCreatorsResponse.java b/src/main/java/com/creatubbles/api/response/creator/UsersCreatorsResponse.java
@@ -1,12 +1,13 @@
 package com.creatubbles.api.response.creator;
 
+import java.util.List;
+
 import com.creatubbles.api.APIVersion;
 import com.creatubbles.api.core.Creator;
 import com.creatubbles.api.core.CreatubblesResponse;
 
-import java.util.List;
-
 @APIVersion(1)
+@Deprecated
 public class UsersCreatorsResponse extends CreatubblesResponse {
     public int total_entries, total_pages;
     public String page, next, prev, first, last;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ public class Creation {`
`6`	`6`	`public int created_at_month, created_at_year, comments_count, bubble_count, views_count;`
`7`	`7`	`public String last_bubbled_at, last_commented_at, last_submitted_at;`
`8`	`8`	`public Image image;`
`9`		`- public Creator[] creators;`
`10`	`9`	`public String store_dir;`
`11`	`10`	`public String url;`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`@APIVersion(2)`
`10`	`10`	`public class CreateCreationRequest extends CreatubblesRequest<CreateCreationResponse> {`
`11`	`11`
`12`		`-`
`13`	`12`	`public CreateCreationRequest(String accessToken) {`
`14`	`13`	`super(EndPoints.CREATIONS, HttpMethod.POST, accessToken);`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ public GetCreatorsRequest(String userId, String token) {`
`14`	`14`	`setUrlParameter(Params.user_id.name(), userId);`
`15`	`15`	`}`
`16`	`16`
`17`		`-`
`18`	`17`	`@Override`
`19`	`18`	`public Class<? extends GetCreatorsResponse> getResponseClass() {`
`20`	`19`	`return GetCreatorsResponse.class;`