Merge pull request #144 from ASSISTments/int-to-long-pr

Change Integers to Long since all numbers are defined as 64 bit in Canvas.

Author: ToeBee

src/integration-test/java/edu/ksu/canvas/calendar/CalendarIT.java

@@ -81,7 +81,7 @@ public void testCreateReadDelete() throws IOException {
 
         assertTrue(writtenCalendarEvent.isPresent());
 
-        Integer id = writtenCalendarEvent.get().getId();
+        Long id = writtenCalendarEvent.get().getId();
         Optional<CalendarEvent> readCalendarEvent = reader.getCalendarEvent(id);
         assertTrue(readCalendarEvent.isPresent());
         assertEquals(writtenCalendarEvent, readCalendarEvent);
@@ -101,9 +101,9 @@ public void testRepeatingEvents() throws IOException {
             event.setContextCode("course_" + course);
             event.setStartAt(Instant.now());
             event.setEndAt(Instant.now().plus(1, ChronoUnit.HOURS));
-            event.setDuplicateCount(9);
+            event.setDuplicateCount(9L);
             event.setDuplicateFrequency(CalendarEvent.Frequency.DAILY);
-            event.setDuplicateInterval(1);
+            event.setDuplicateInterval(1L);
             event.setDuplicateAppend(true);
             writer.createCalendarEvent(event);
         }

src/integration-test/java/edu/ksu/canvas/contentMigration/ContentMigrationIT.java

@@ -1,4 +1,4 @@
-package edu.ksu.canvas.contentmigration;
+package edu.ksu.canvas.contentMigration;
 
 import edu.ksu.canvas.CanvasApiFactory;
 import edu.ksu.canvas.interfaces.ContentMigrationReader;
@@ -70,7 +70,7 @@ public void testCreateContentMigration() throws IOException, InterruptedExceptio
         CreateCourseContentMigrationOptions createCourseContentMigrationOptions = new CreateCourseContentMigrationOptions(destinationCourse, course, MigrationType.course_copy_importer, false);
         Optional<ContentMigration> response = writer.createCourseContentMigration(createCourseContentMigrationOptions);
         assertNotNull(response.get().getProgressUrl());
-        Integer migrationId = response.get().getId();
+        Long migrationId = response.get().getId();
         assertNotNull(migrationId);
         assertEquals(user, response.get().getUserId().toString());
         assertEquals(MigrationType.course_copy_importer.toString(), response.get().getMigrationType());

src/main/java/edu/ksu/canvas/impl/AccountReportImpl.java

@@ -39,7 +39,7 @@ public List<AccountReport> listReports(String accountId, String report) throws I
     }
 
     @Override
-    public Optional<AccountReport> reportStatus(String accountId, String report, Integer id) throws IOException {
+    public Optional<AccountReport> reportStatus(String accountId, String report, Long id) throws IOException {
         LOG.debug("Retrieving information about report ID " + id + " of report " + report + " for account " + accountId);
         String url = buildCanvasUrl("accounts/" + accountId + "/reports/" + report + "/" + id, Collections.emptyMap());
 
@@ -55,7 +55,7 @@ public Optional<AccountReport> startReport(AccountReportOptions options) throws
     }
 
     @Override
-    public Optional<AccountReport> deleteReport(String accountId, String report, Integer reportId) throws IOException {
+    public Optional<AccountReport> deleteReport(String accountId, String report, Long reportId) throws IOException {
         LOG.debug("Deleting report ID " + reportId + " for report " + report + " on behalf of account " + accountId);
         String url = buildCanvasUrl("accounts/" + accountId + "/reports/" + report + "/" + reportId, Collections.emptyMap());
         Response response = canvasMessenger.deleteFromCanvas(oauthToken, url, Collections.emptyMap());

src/main/java/edu/ksu/canvas/impl/AssignmentImpl.java

@@ -62,7 +62,7 @@ public Optional<Assignment> createAssignment(String courseId, Assignment assignm
     }
 
     @Override
-    public Optional<Assignment> deleteAssignment(String courseId, Integer assignmentId) throws IOException {
+    public Optional<Assignment> deleteAssignment(String courseId, Long assignmentId) throws IOException {
         Map<String, List<String>> postParams = new HashMap<>();
         postParams.put("event", Collections.singletonList("delete"));
         String createdUrl = buildCanvasUrl("courses/" + courseId + "/assignments/" + assignmentId, Collections.emptyMap());

src/main/java/edu/ksu/canvas/impl/AssignmentOverrideImpl.java

@@ -29,14 +29,14 @@ public AssignmentOverrideImpl(String canvasBaseUrl, Integer apiVersion, OauthTok
     }
 
     @Override
-    public List<AssignmentOverride> listAssignmentOverrides(String courseId, Integer assignmentId) throws IOException {
+    public List<AssignmentOverride> listAssignmentOverrides(String courseId, Long assignmentId) throws IOException {
         LOG.debug("Retrieving a list of assignment overrides in course " + courseId + " for assignment " + assignmentId);
         String url = buildCanvasUrl("courses/" + courseId + "/assignments/" + assignmentId + "/overrides", Collections.emptyMap());
         return getListFromCanvas(url);
     }
 
     @Override
-    public Optional<AssignmentOverride> getAssignmentOverride(String courseId, Integer assignmentId, Integer overrideId) throws IOException {
+    public Optional<AssignmentOverride> getAssignmentOverride(String courseId, Long assignmentId, Long overrideId) throws IOException {
         LOG.debug("Retrieving an assignment override in course " + courseId + " for assignment " + assignmentId);
         String url = buildCanvasUrl("courses/" + courseId + "/assignments/" + assignmentId + "/overrides/" + overrideId, Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);

src/main/java/edu/ksu/canvas/impl/CalendarEventImpl.java

@@ -65,7 +65,7 @@ public List<CalendarEvent> listCalendarEvents(String userId, ListCalendarEventsO
     }
 
     @Override
-    public Optional<CalendarEvent> getCalendarEvent(Integer id) throws IOException {
+    public Optional<CalendarEvent> getCalendarEvent(Long id) throws IOException {
         LOG.debug("Getting calendar event: "+ id);
         String url = buildCanvasUrl("/calendar_events/"+ id.toString(), Collections.emptyMap());
         return getFromCanvas(url);

src/main/java/edu/ksu/canvas/impl/ContentMigrationImpl.java

@@ -29,7 +29,7 @@ public ContentMigrationImpl(String canvasBaseUrl, Integer apiVersion, OauthToken
     }
 
     @Override
-    public  Optional<ContentMigration> getCourseContentMigration(String courseId, Integer id) throws IOException {
+    public  Optional<ContentMigration> getCourseContentMigration(String courseId, Long id) throws IOException {
         LOG.debug("listing a content migration for the course");
         String url = buildCanvasUrl("courses/" + courseId + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);
@@ -52,7 +52,7 @@ public Optional<ContentMigration> createCourseContentMigration(CreateCourseConte
     }
 
     @Override
-    public Optional<ContentMigration> updateCourseContentMigration(Integer id, CreateCourseContentMigrationOptions options) throws IOException {
+    public Optional<ContentMigration> updateCourseContentMigration(Long id, CreateCourseContentMigrationOptions options) throws IOException {
         LOG.debug("updating course content migration");
         String url = buildCanvasUrl("courses/" + options.getDestinationCourseId() + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.putToCanvas(oauthToken, url, options.getOptionsMap());
@@ -61,7 +61,7 @@ public Optional<ContentMigration> updateCourseContentMigration(Integer id, Creat
 
     /******************************** USERS ********************************/
     @Override
-    public  Optional<ContentMigration> getUserContentMigration(String userId, Integer id) throws IOException {
+    public  Optional<ContentMigration> getUserContentMigration(String userId, Long id) throws IOException {
         LOG.debug("listing a content migration for the user");
         String url = buildCanvasUrl("users/" + userId + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);
@@ -84,7 +84,7 @@ public Optional<ContentMigration> createUserContentMigration(CreateContentMigrat
     }
 
     @Override
-    public Optional<ContentMigration> updateUserContentMigration(Integer id, CreateContentMigrationOptions options) throws IOException {
+    public Optional<ContentMigration> updateUserContentMigration(Long id, CreateContentMigrationOptions options) throws IOException {
         LOG.debug("updating user content migration");
         String url = buildCanvasUrl("users/" + options.getSourceCourseId() + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.putToCanvas(oauthToken, url, options.getOptionsMap());
@@ -93,7 +93,7 @@ public Optional<ContentMigration> updateUserContentMigration(Integer id, CreateC
 
     /******************************** GROUPS ********************************/
     @Override
-    public  Optional<ContentMigration> getGroupContentMigration(String groupId, Integer id) throws IOException {
+    public  Optional<ContentMigration> getGroupContentMigration(String groupId, Long id) throws IOException {
         LOG.debug("listing a content migration for the group");
         String url = buildCanvasUrl("groups/" + groupId + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);
@@ -116,7 +116,7 @@ public Optional<ContentMigration> createGroupContentMigration(CreateContentMigra
     }
 
     @Override
-    public Optional<ContentMigration> updateGroupContentMigration(Integer id, CreateContentMigrationOptions options) throws IOException {
+    public Optional<ContentMigration> updateGroupContentMigration(Long id, CreateContentMigrationOptions options) throws IOException {
         LOG.debug("updating group content migration");
         String url = buildCanvasUrl("groups/" + options.getSourceCourseId() + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.putToCanvas(oauthToken, url, options.getOptionsMap());
@@ -125,7 +125,7 @@ public Optional<ContentMigration> updateGroupContentMigration(Integer id, Create
 
     /******************************** ACCOUNTS ********************************/
     @Override
-    public  Optional<ContentMigration> getAccountContentMigration(String accountId, Integer id) throws IOException {
+    public  Optional<ContentMigration> getAccountContentMigration(String accountId, Long id) throws IOException {
         LOG.debug("listing a content migration for the account");
         String url = buildCanvasUrl("accounts/" + accountId + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);
@@ -148,7 +148,7 @@ public Optional<ContentMigration> createAccountContentMigration(CreateContentMig
     }
 
     @Override
-    public Optional<ContentMigration> updateAccountContentMigration(Integer id, CreateContentMigrationOptions options) throws IOException {
+    public Optional<ContentMigration> updateAccountContentMigration(Long id, CreateContentMigrationOptions options) throws IOException {
         LOG.debug("updating account content migration");
         String url = buildCanvasUrl("accounts/" + options.getSourceCourseId() + "/content_migrations/" + id.toString(), Collections.emptyMap());
         Response response = canvasMessenger.putToCanvas(oauthToken, url, options.getOptionsMap());

src/main/java/edu/ksu/canvas/impl/ExternalToolImpl.java

@@ -31,16 +31,16 @@ public ExternalToolImpl(String canvasBaseUrl, Integer apiVersion, OauthToken oau
     }
 
     @Override
-    public Optional<ExternalTool> getExternalToolInCourse(String courseId, Integer toolId) throws IOException {
+    public Optional<ExternalTool> getExternalToolInCourse(String courseId, Long toolId) throws IOException {
         return getExternalTool("courses", courseId, toolId);
     }
 
     @Override
-    public Optional<ExternalTool> getExternalToolInAccount(String accountId, Integer toolId) throws IOException {
+    public Optional<ExternalTool> getExternalToolInAccount(String accountId, Long toolId) throws IOException {
         return getExternalTool("accounts", accountId, toolId);
     }
 
-    private Optional<ExternalTool> getExternalTool(String objectType, String objectId, Integer toolId) throws IOException {
+    private Optional<ExternalTool> getExternalTool(String objectType, String objectId, Long toolId) throws IOException {
         LOG.debug("Getting external tool " + toolId + " from " + objectType + " " + objectId);
         if(StringUtils.isBlank(objectId) || toolId == null) {
             throw new IllegalArgumentException("course/account ID and tool ID cannot be blank");
@@ -116,14 +116,14 @@ private Optional<ExternalTool> editExternalTool(String url, ExternalTool tool) t
         return responseParser.parseToObject(ExternalTool.class, response);
     }
 
-    public Optional<ExternalTool> deleteExternalToolInCourse(String courseId, Integer toolId) throws IOException {
+    public Optional<ExternalTool> deleteExternalToolInCourse(String courseId, Long toolId) throws IOException {
         LOG.debug("Deleting external tool " + toolId + " from course " + courseId);
         String url = buildCanvasUrl("courses/" + courseId + "/external_tools/" + toolId, Collections.emptyMap());
         Response response = canvasMessenger.deleteFromCanvas(oauthToken, url, Collections.emptyMap());
         return responseParser.parseToObject(ExternalTool.class, response);
     }
 
-    public Optional<ExternalTool> deleteExternalToolInAccount(String accountId, Integer toolId) throws IOException {
+    public Optional<ExternalTool> deleteExternalToolInAccount(String accountId, Long toolId) throws IOException {
         LOG.debug("Deleting external tool " + toolId + " from account " + accountId);
         String url = buildCanvasUrl("accounts/" + accountId + "/external_tools/" + toolId, Collections.emptyMap());
         Response response = canvasMessenger.deleteFromCanvas(oauthToken, url, Collections.emptyMap());

src/main/java/edu/ksu/canvas/impl/MigrationIssueImpl.java

@@ -27,59 +27,59 @@ public MigrationIssueImpl(String canvasBaseUrl, Integer apiVersion, OauthToken o
     }
 
     @Override
-    public List<MigrationIssue> getCourseMigrationIssues(String courseId, Integer migrationId) throws IOException {
+    public List<MigrationIssue> getCourseMigrationIssues(String courseId, Long migrationId) throws IOException {
         LOG.debug("listing the migration issues for a content migration for the course");
         String url = buildCanvasUrl("courses/" + courseId + "/content_migrations/" + migrationId.toString() + "/migration_issues", Collections.emptyMap());
         return getListFromCanvas(url);
     }
 
     @Override
-    public Optional<MigrationIssue> getCourseMigrationIssue(String courseId, Integer migrationId, Integer issueId) throws IOException {
+    public Optional<MigrationIssue> getCourseMigrationIssue(String courseId, Long migrationId, Long issueId) throws IOException {
         LOG.debug("listing a migration issue for a content migration for the course");
         String url = buildCanvasUrl("courses/" + courseId + "/content_migrations/" + migrationId.toString() + "/migration_issues/" + issueId.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);
         return responseParser.parseToObject(MigrationIssue.class, response);
     }
 
     @Override
-    public List<MigrationIssue> getUserMigrationIssues(String userId, Integer migrationId) throws IOException {
+    public List<MigrationIssue> getUserMigrationIssues(String userId, Long migrationId) throws IOException {
         LOG.debug("listing the migration issues for a content migration for the course");
         String url = buildCanvasUrl("users/" + userId + "/content_migrations/" + migrationId.toString() + "/migration_issues", Collections.emptyMap());
         return getListFromCanvas(url);
     }
 
     @Override
-    public Optional<MigrationIssue> getUserMigrationIssue(String userId, Integer migrationId, Integer issueId) throws IOException {
+    public Optional<MigrationIssue> getUserMigrationIssue(String userId, Long migrationId, Long issueId) throws IOException {
         LOG.debug("listing a migration issue for a content migration for the course");
         String url = buildCanvasUrl("users/" + userId + "/content_migrations/" + migrationId.toString() + "/migration_issues/" + issueId.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);
         return responseParser.parseToObject(MigrationIssue.class, response);
     }
 
     @Override
-    public List<MigrationIssue> getGroupMigrationIssues(String groupId, Integer migrationId) throws IOException {
+    public List<MigrationIssue> getGroupMigrationIssues(String groupId, Long migrationId) throws IOException {
         LOG.debug("listing the migration issues for a content migration for the group");
         String url = buildCanvasUrl("groups/" + groupId + "/content_migrations/" + migrationId.toString() + "/migration_issues", Collections.emptyMap());
         return getListFromCanvas(url);
     }
 
     @Override
-    public Optional<MigrationIssue> getGroupMigrationIssue(String groupId, Integer migrationId, Integer issueId) throws IOException {
+    public Optional<MigrationIssue> getGroupMigrationIssue(String groupId, Long migrationId, Long issueId) throws IOException {
         LOG.debug("listing a migration issue for a content migration for the group");
         String url = buildCanvasUrl("groups/" + groupId + "/content_migrations/" + migrationId.toString() + "/migration_issues/" + issueId.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);
         return responseParser.parseToObject(MigrationIssue.class, response);
     }
 
     @Override
-    public List<MigrationIssue> getAccountMigrationIssues(String accountId, Integer migrationId) throws IOException {
+    public List<MigrationIssue> getAccountMigrationIssues(String accountId, Long migrationId) throws IOException {
         LOG.debug("listing the migration issues for a content migration for the account");
         String url = buildCanvasUrl("accounts/" + accountId + "/content_migrations/" + migrationId.toString() + "/migration_issues", Collections.emptyMap());
         return getListFromCanvas(url);
     }
 
     @Override
-    public Optional<MigrationIssue> getAccountMigrationIssue(String accountId, Integer migrationId, Integer issueId) throws IOException {
+    public Optional<MigrationIssue> getAccountMigrationIssue(String accountId, Long migrationId, Long issueId) throws IOException {
         LOG.debug("listing a migration issue for a content migration for the account");
         String url = buildCanvasUrl("accounts/" + accountId + "/content_migrations/" + migrationId.toString() + "/migration_issues/" + issueId.toString(), Collections.emptyMap());
         Response response = canvasMessenger.getSingleResponseFromCanvas(oauthToken, url);

src/main/java/edu/ksu/canvas/impl/ProgressImpl.java

@@ -34,7 +34,7 @@ public Optional<Progress> getProgress(String url) throws IOException {
     }
 
     @Override
-    public Optional<Progress> getProgress(Integer progressId) throws IOException {
+    public Optional<Progress> getProgress(Long progressId) throws IOException {
         LOG.debug("getting the progress of an asynchronous operation by ID: " + progressId);
         String url = buildCanvasUrl(String.format("progress/%d", progressId), Collections.emptyMap());
         return responseParser.parseToObject(Progress.class, canvasMessenger.getSingleResponseFromCanvas(oauthToken, url));