Updated Activity related methods to use better error handling.

Author: AaronCoplan

src/main/java/com/aaroncoplan/todoist/Todoist.java

@@ -240,79 +240,65 @@ public void deleteComment(long id) throws TodoistException {
         if(response.getStatus() != HTTP_OK_NO_CONTENT) throw new TodoistException(response.getStatus());
     }
 
-    public List<Activity> getActivityForProject(long id) {
+    public List<Activity> getActivityForProject(long id) throws TodoistException {
         return getActivityForProject(id, ActivityType.ALL);
     }
 
-    public List<Activity> getActivityForProject(long id, ActivityType... types) {
-        try {
-            int limit = 30;
-            int offset = 0;
-            int count;
-
-            List<String> activityTypes = Arrays.stream(types)
-                    .flatMap(ActivityType::getStream)
-                    .collect(Collectors.toList());
-
-            List<Activity> activityList = new ArrayList<>();
-            do {
-                HttpResponse<String> response = Unirest.post("https://todoist.com/API/v8/activity/get")
-                        .header("Content-Type", "application/json")
-                        .body(JsonAdapters.writeActivityRequest(new ActivityRequest(limit, offset, activityTypes, null, null, true, id, true)))
-                        .asString();
-                if (response.getStatus() != HTTP_OK) {
-                    throw new Exception("HTTP STATUS " + response.getStatus());
-                }
-
-                ActivityResponse activityResponse = JsonAdapters.extractActivityResponse(response.getBody());
-                activityList.addAll(activityResponse.events);
-
-                count = activityResponse.count;
-                offset += limit;
-            } while(offset < count);
-
-            return activityList;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
+    public List<Activity> getActivityForProject(long id, ActivityType... types) throws TodoistException {
+        int limit = 30;
+        int offset = 0;
+        int count;
+
+        List<String> activityTypes = Arrays.stream(types)
+                .flatMap(ActivityType::getStream)
+                .collect(Collectors.toList());
+
+        List<Activity> activityList = new ArrayList<>();
+        do {
+            HttpResponse<String> response = Unirest.post("https://todoist.com/API/v8/activity/get")
+                    .header("Content-Type", "application/json")
+                    .body(JsonAdapters.writeActivityRequest(new ActivityRequest(limit, offset, activityTypes, null, null, true, id, true)))
+                    .asString();
+            if (response.getStatus() != HTTP_OK) throw new TodoistException(response.getStatus());
+
+            ActivityResponse activityResponse = extract(JsonAdapters::extractActivityResponse, response);
+            activityList.addAll(activityResponse.events);
+
+            count = activityResponse.count;
+            offset += limit;
+        } while(offset < count);
+
+        return activityList;
     }
 
-    public List<Activity> getActivityForTask(long id) {
+    public List<Activity> getActivityForTask(long id) throws TodoistException {
         return getActivityForTask(id, ActivityType.ALL);
     }
 
-    public List<Activity> getActivityForTask(long id, ActivityType... types) {
-        try {
-            int limit = 30;
-            int offset = 0;
-            int count;
-
-            List<String> activityTypes = Arrays.stream(types)
-                    .flatMap(ActivityType::getStream)
-                    .collect(Collectors.toList());
-
-            List<Activity> activityList = new ArrayList<>();
-            do {
-                HttpResponse<String> response = Unirest.post("https://todoist.com/API/v8/activity/get")
-                        .header("Content-Type", "application/json")
-                        .body(JsonAdapters.writeActivityRequest(new ActivityRequest(limit, offset, activityTypes, id, true, true, null, null)))
-                        .asString();
-                if (response.getStatus() != HTTP_OK) {
-                    throw new Exception("HTTP STATUS " + response.getStatus());
-                }
-
-                ActivityResponse activityResponse = JsonAdapters.extractActivityResponse(response.getBody());
-                activityList.addAll(activityResponse.events);
-
-                count = activityResponse.count;
-                offset += limit;
-            } while(offset < count);
-
-            return activityList;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
+    public List<Activity> getActivityForTask(long id, ActivityType... types) throws TodoistException {
+        int limit = 30;
+        int offset = 0;
+        int count;
+
+        List<String> activityTypes = Arrays.stream(types)
+                .flatMap(ActivityType::getStream)
+                .collect(Collectors.toList());
+
+        List<Activity> activityList = new ArrayList<>();
+        do {
+            HttpResponse<String> response = Unirest.post("https://todoist.com/API/v8/activity/get")
+                    .header("Content-Type", "application/json")
+                    .body(JsonAdapters.writeActivityRequest(new ActivityRequest(limit, offset, activityTypes, id, true, true, null, null)))
+                    .asString();
+            if (response.getStatus() != HTTP_OK) throw new TodoistException(response.getStatus());
+
+            ActivityResponse activityResponse = extract(JsonAdapters::extractActivityResponse, response);
+            activityList.addAll(activityResponse.events);
+
+            count = activityResponse.count;
+            offset += limit;
+        } while(offset < count);
+
+        return activityList;
     }
 }