Clean up metadata, fix gallery serialization, other general cleanup

Author: tterrag1098

src/main/java/com/creatubbles/api/CreatubblesAPI.java

@@ -10,6 +10,7 @@
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientBuilder;
 
+import com.creatubbles.api.core.Gallery;
 import com.creatubbles.api.core.LandingUrl;
 import com.creatubbles.api.request.amazon.UploadS3FileRequest;
 import com.creatubbles.api.request.creation.CreateCreationRequest;
@@ -43,8 +44,9 @@ public class CreatubblesAPI {
     public static final String URL_BASE_STAGING = "https://api.staging.creatubbles.com/v2/";
 
     public final static Gson GSON = new GsonBuilder()
+    		.registerTypeAdapter(Gallery.class, new Gallery.Serializer())
             .registerTypeAdapter(String.class, new StringAdapter())
-            .registerTypeAdapterFactory(new JsonHackx())
+            .registerTypeAdapterFactory(new JsonHacks())
             .create();
 
     public final static JerseyClient CLIENT = JerseyClientBuilder
@@ -121,7 +123,7 @@ public String deserialize(JsonElement json, Type typeOfT,
         }
     }
 
-    private static class JsonHackx implements TypeAdapterFactory {
+    private static class JsonHacks implements TypeAdapterFactory {
 
         @Override
         public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {

src/main/java/com/creatubbles/api/core/CreatubblesRequest.java

@@ -13,13 +13,13 @@
 import javax.ws.rs.core.Response;
 
 import jersey.repackaged.com.google.common.base.Throwables;
-import jersey.repackaged.com.google.common.collect.Lists;
 
 import org.glassfish.jersey.client.JerseyWebTarget;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 
 import com.creatubbles.api.CreatubblesAPI;
 import com.creatubbles.api.response.ArrayResponse;
+import com.creatubbles.api.response.meta.Metadata;
 import com.creatubbles.api.util.HttpMethod;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
@@ -35,7 +35,7 @@ public abstract class CreatubblesRequest<T extends CreatubblesResponse> {
     private T responseCache;
     private T[] responseArrayCache;
     private JsonObject metaCache;
-    
+
     private String accessToken;
     private static final String EMPTY_RESPONSE = "{}";
     private static final String APPLICATION_VND_API_JSON = "application/vnd.api+json";
@@ -225,7 +225,7 @@ private T createDefaultResponse(String json) {
             throw Throwables.propagate(e);
         }
     }
-    
+
     public final boolean isArrayResponse() {
         return getResponseClass().isAnnotationPresent(ArrayResponse.class);
     }
@@ -247,10 +247,10 @@ public final T getResponse() {
      */
     public final List<T> getResponseList() {
         initResponse();
-        return responseArrayCache == null ? Lists.<T>newArrayList() : Arrays.asList(responseArrayCache);
+        return responseArrayCache == null ? null : Arrays.asList(responseArrayCache);
     }
-    
-    public final <M> M getMetadata(Class<M> metaClass) {
+
+    public final <M extends Metadata> M getMetadata(Class<M> metaClass) {
         return CreatubblesAPI.GSON.fromJson(metaCache, metaClass);
     }
 

src/main/java/com/creatubbles/api/core/Gallery.java

@@ -14,55 +14,55 @@
 @Value
 @Builder
 public class Gallery {
-    
+
     int id;
     String name, description;
-    
+
     @SerializedName("type")
     String type;
     @SerializedName("created_at")
     String createdDate;
     Image banner;
-    
+
     @SerializedName("open_for_all")
-    public boolean openForAll;
-    
+    boolean openForAll;
+
     @SerializedName("owner_id")
-    public int ownerId;
+    int ownerId;
     @SerializedName("owner_type")
-    public String ownerType;
-    
+    String ownerType;
+
     public static class Serializer implements JsonSerializer<Gallery> {
-        
+
         @Override
         public JsonElement serialize(Gallery src, Type typeOfSrc, JsonSerializationContext context) {
-            
+
             JsonObject root = new JsonObject();
-            
+
             JsonObject data = new JsonObject();
             data.addProperty("type", src.type);
-            
+
             JsonObject attributes = new JsonObject();
             attributes.addProperty("name", src.name);
             attributes.addProperty("descrtiption", src.description);
             attributes.addProperty("open_for_all", src.openForAll ? 1 : 0);
-            
+
             JsonObject relationships = new JsonObject();
-            
+
             JsonObject owner = new JsonObject();
             JsonObject ownerdata = new JsonObject();
             ownerdata.addProperty("type", src.ownerType);
             ownerdata.addProperty("id", src.ownerId);
             owner.add("data", ownerdata);
-            
+
             relationships.add("owner", owner);
-            
+
             data.add("attributes", attributes);
             data.add("relationships", relationships);
-            
+
             root.add("data", data);
             return root;
         }
     }
-    
+
 }

src/main/java/com/creatubbles/api/core/Group.java

@@ -5,7 +5,7 @@
 import com.google.gson.annotations.SerializedName;
 
 @Value
-public class MetaPagination {
+public class MetaPagination implements Metadata {
 
     @SerializedName("total_count")
     int objectCount;

src/main/java/com/creatubbles/api/response/meta/MetaPagination.java

@@ -0,0 +1,5 @@
+package com.creatubbles.api.response.meta;
+
+public interface Metadata {
+
+}