Review2

src/main/java/com/coscale/sdk/client/ApiClient.java

@@ -29,7 +29,7 @@ public class ApiClient {
     private final String APPID;
 
     /** API_PATH, API_VERSION for request URL. */
-    private final String API_PATH = "api";
+    private static final String API_PATH = "api";
     private String API_VERSION = "v1";
 
     /** URL path separator */
@@ -199,19 +199,20 @@ public int getDeserializationExceptions() {
      *            used by request.
      * @param uri
      *            of the API call.
-     * @param data
-     *            in string format to pass to the request.
+     * @param payload
+     *            data in string format to pass to the request.
+     * @param authenticate
+     *            True if the call requires authenticate, false if not.
      * @return String response for the request.
      * @throws IOException
      */
     private String doHttpRequest(String method, String uri, String payload, boolean authenticate)
             throws IOException {
-        URL url;
         HttpURLConnection conn = null;
         int responseCode = -1;
 
         try {
-            url = new URL(uri);
+            URL url = new URL(uri);
             conn = (HttpURLConnection) url.openConnection();
 
             // Set connection timeout.
@@ -288,8 +289,7 @@ private void login() throws IOException {
         String uri = credentials.usesToken() ? getAppRequestURL("/login/")
                 : getGlobalRequestURL("/users/login/");
         Credentials.TokenHelper data = call("POST", uri, credentials,
-                new TypeReference<Credentials.TokenHelper>() {
-                }, false);
+                new TokenHelperTypeReference(), false);
 
         token = data.token;
     }
@@ -328,6 +328,7 @@ public <T> T callWithAuth(String method, String endpoint, Object obj, TypeRefere
             } catch (CoscaleApiException e) {
                 if (e.statusCode == HttpURLConnection.HTTP_UNAUTHORIZED) {
                     this.token = null; // will trigger new login
+                    responseCode = 401; // 401 means login failed: https://httpstatuses.com/401
                 } else {
                     throw e;
                 }
@@ -349,6 +350,8 @@ public <T> T callWithAuth(String method, String endpoint, Object obj, TypeRefere
      *            object with data for the request. This parameter can be null.
      * @param valueType
      *            is the type expected.
+     * @param auth
+     *            true if the call requires authentication, false if not.
      * @return The Object received as a result for the request.
      * @throws IOException
      */
@@ -410,11 +413,11 @@ public String getGlobalRequestURL(String endpoint) {
     public String getRequesUrl(String endpoint, Options options, boolean globalApi) {
 
         StringBuilder sb = new StringBuilder();
-        sb.append(getBaseURL());
+        sb.append(API_BASE_URL);
         sb.append(PATH_DIV);
-        sb.append(getApiPath());
+        sb.append(API_PATH);
         sb.append(PATH_DIV);
-        sb.append(getApiVersion());
+        sb.append(API_VERSION);
         if (!globalApi) {
             sb.append(PATH_DIV);
             sb.append("app");
@@ -486,4 +489,12 @@ private <T> String objectToJson(T obj) throws IOException {
             }
         }
     }
+
+    /**
+     * Copied from the Intellij code analysis:
+     * A static inner class does not keep an implicit reference to its enclosing instance.
+     * This prevents a common cause of memory leaks and uses less memory per instance of the class.
+     */
+    private static class TokenHelperTypeReference extends TypeReference<Credentials.TokenHelper> {
+    }
 }

src/main/java/com/coscale/sdk/client/data/DataApi.java

@@ -35,7 +35,14 @@ public DataApi(ApiClient api) {
      * @throws IOException
      */
     public Msg insert(String subjectId, DataInsert data) throws IOException {
-        return api.callWithAuth("POST", "/data/" + subjectId + '/', data, new TypeReference<Msg>() {
-        });
+        return api.callWithAuth("POST", "/data/" + subjectId + '/', data, new MsgTypeReference());
+    }
+
+    /**
+     * Copied from the Intellij code analysis:
+     * A static inner class does not keep an implicit reference to its enclosing instance.
+     * This prevents a common cause of memory leaks and uses less memory per instance of the class.
+     */
+    private static class MsgTypeReference extends TypeReference<Msg> {
     }
 }

src/main/java/com/coscale/sdk/client/events/EventsApi.java

@@ -39,8 +39,7 @@ public EventsApi(ApiClient api) {
      * @throws IOException
      */
     public List<Event> all() throws IOException {
-        return api.callWithAuth("GET", "/events/", null, new TypeReference<List<Event>>() {
-        });
+        return api.callWithAuth("GET", "/events/", null, new EventListTypeReference());
     }
 
     /**
@@ -54,8 +53,7 @@ public List<Event> all() throws IOException {
     public List<Event> all(Options options) throws IOException {
         String url = "/events/";
         url += (options.hasQuery() ? "?" : "&") + options.query();
-        return api.callWithAuth("GET", url, null, new TypeReference<List<Event>>() {
-        });
+        return api.callWithAuth("GET", url, null, new EventListTypeReference());
     }
 
     /**
@@ -67,8 +65,7 @@ public List<Event> all(Options options) throws IOException {
      * @throws IOException
      */
     public Event get(long id) throws IOException {
-        return api.callWithAuth("GET", "/events/" + id + '/', null, new TypeReference<Event>() {
-        });
+        return api.callWithAuth("GET", "/events/" + id + '/', null, new EventTypeReference());
     }
 
     /**
@@ -80,8 +77,7 @@ public Event get(long id) throws IOException {
      * @throws IOException
      */
     public Event insert(EventInsert event) throws IOException {
-        return api.callWithAuth("POST", "/events/", event, new TypeReference<Event>() {
-        });
+        return api.callWithAuth("POST", "/events/", event, new EventTypeReference());
     }
 
     /**
@@ -93,8 +89,7 @@ public Event insert(EventInsert event) throws IOException {
      * @throws IOException
      */
     public Msg delete(long id) throws IOException {
-        return api.callWithAuth("DELETE", "/events/" + id + '/', null, new TypeReference<Msg>() {
-        });
+        return api.callWithAuth("DELETE", "/events/" + id + '/', null, new MsgTypeReference());
     }
 
     /** Events data end point calls. */
@@ -127,8 +122,7 @@ public List<EventData> allData(Long eventId, @Nullable Long start, @Nullable Lon
             first = false;
         }
 
-        return api.callWithAuth("GET", endpoint, null, new TypeReference<List<EventData>>() {
-        });
+        return api.callWithAuth("GET", endpoint, null, new EventDataListTypeReference());
     }
 
     /**
@@ -143,8 +137,7 @@ public List<EventData> allData(Long eventId, @Nullable Long start, @Nullable Lon
      */
     public EventData getData(Long eventId, Long dataId) throws IOException {
         return api.callWithAuth("GET", "/events/" + eventId + "/data/get/" + dataId + '/', null,
-                new TypeReference<EventData>() {
-                });
+                new EventDataTypeReference());
     }
 
     /**
@@ -159,8 +152,7 @@ public EventData getData(Long eventId, Long dataId) throws IOException {
      */
     public EventData insertData(Long eventId, EventDataInsert data) throws IOException {
         return api.callWithAuth("POST", "/events/" + eventId + "/data/", data,
-                new TypeReference<EventData>() {
-                });
+                new EventDataTypeReference());
     }
 
     /**
@@ -175,8 +167,26 @@ public EventData insertData(Long eventId, EventDataInsert data) throws IOExcepti
      */
     public Msg deleteData(Long eventId, Long dataId) throws IOException {
         return api.callWithAuth("DELETE", "/events/" + eventId + "/data/" + dataId + '/', null,
-                new TypeReference<Msg>() {
-                });
+                new MsgTypeReference());
     }
 
+    /**
+     * Copied from the Intellij code analysis:
+     * A static inner class does not keep an implicit reference to its enclosing instance.
+     * This prevents a common cause of memory leaks and uses less memory per instance of the class.
+     */
+    private static class EventListTypeReference extends TypeReference<List<Event>> {
+    }
+
+    private static class EventTypeReference extends TypeReference<Event> {
+    }
+
+    private static class MsgTypeReference extends TypeReference<Msg> {
+    }
+
+    private static class EventDataListTypeReference extends TypeReference<List<EventData>> {
+    }
+
+    private static class EventDataTypeReference extends TypeReference<EventData> {
+    }
 }

src/main/java/com/coscale/sdk/client/metrics/MetricGroup.java

@@ -4,6 +4,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
+import com.google.common.collect.Lists;
 
 public class MetricGroup {
 
@@ -48,13 +49,13 @@ public MetricGroup(Long id, String source, java.util.List<Metric> metrics, Subje
             java.util.List<Long> metricIds, String type, Long version) {
         this.id = id;
         this.source = source;
-        this.metrics = metrics;
+        this.metrics = Lists.newArrayList(metrics); // Copy the contents, don't keep reference.
         this.subject = subject;
         this.description = description;
         this.name = name;
         this.state = state;
-        this.metricgroups = metricgroups;
-        this.metricIds = metricIds;
+        this.metricgroups = Lists.newArrayList(metricgroups);
+        this.metricIds = Lists.newArrayList(metricIds);
         this.type = type;
         this.version = version;
     }