Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== diff -u -r6b58638c62c43fc5b43bc67402d77b347311bc16 -r2921dcd0bdb3c896b149d7a398ee3f5104cdcf4a --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 6b58638c62c43fc5b43bc67402d77b347311bc16) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java (.../LessonManagerServlet.java) (revision 2921dcd0bdb3c896b149d7a398ee3f5104cdcf4a) @@ -191,7 +191,7 @@ } if (method.equals(CentralConstants.METHOD_START)) { - ldId = new Long(ldIdStr); + ldId = Long.parseLong(ldIdStr); Long lessonId = startLesson(serverId, datetime, hashValue, username, ldId, courseId, title, desc, enforceAllowLearnerRestart, country, locale, customCSV, presenceEnable, imEnable, enableNotifications); @@ -200,15 +200,15 @@ element.setAttribute(CentralConstants.ATTR_LESSON_ID, lessonId.toString()); } else if (method.equals(CentralConstants.METHOD_PREVIEW)) { - ldId = new Long(ldIdStr); + ldId = Long.parseLong(ldIdStr); Long lessonId = startPreview(serverId, datetime, hashValue, username, ldId, courseId, title, desc, country, locale, customCSV, presenceEnable, imEnable); element = document.createElement(CentralConstants.ELEM_LESSON); element.setAttribute(CentralConstants.ATTR_LESSON_ID, lessonId.toString()); } else if (method.equals(CentralConstants.METHOD_SCHEDULE)) { - ldId = new Long(ldIdStr); + ldId = Long.parseLong(ldIdStr); Long lessonId = scheduleLesson(serverId, datetime, hashValue, username, ldId, courseId, title, desc, enforceAllowLearnerRestart, startDate, country, locale, customCSV, presenceEnable, imEnable, enableNotifications); @@ -218,7 +218,7 @@ } else if (method.equals(CentralConstants.METHOD_CLONE)) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); Long lessonId = cloneLesson(serverId, datetime, hashValue, username, lsId, courseId); element = document.createElement(CentralConstants.ELEM_LESSON); @@ -228,7 +228,7 @@ || method.equals(CentralConstants.METHOD_REMOVE_LESSON)) { verifyPostRequestMethod(request); - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); Boolean deleted = removeLesson(serverId, datetime, hashValue, username, lsId); element = document.createElement(CentralConstants.ELEM_LESSON); @@ -243,76 +243,75 @@ } else if (method.equals(CentralConstants.METHOD_REMOVE_USER)) { verifyPostRequestMethod(request); - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = removeUser(document, serverId, datetime, hashValue, username, lsId, userIds); } else if (method.equals(CentralConstants.METHOD_REMOVE_ALL_USERS)) { verifyPostRequestMethod(request); - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = removeAllUsers(document, serverId, datetime, hashValue, username, lsId); } else if (method.equals(CentralConstants.METHOD_STUDENT_PROGRESS)) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getAllStudentProgress(document, serverId, datetime, hashValue, username, lsId, courseId); } else if (method.equals(CentralConstants.METHOD_SINGLE_STUDENT_PROGRESS)) { String firstName = request.getParameter(LoginRequestDispatcher.PARAM_FIRST_NAME); String lastName = request.getParameter(LoginRequestDispatcher.PARAM_LAST_NAME); String email = request.getParameter(LoginRequestDispatcher.PARAM_EMAIL); - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getSingleStudentProgress(document, serverId, datetime, hashValue, username, firstName, lastName, locale, country, email, lsId, courseId); } else if (method.equals(CentralConstants.METHOD_IMPORT)) { - - // ldId = new Long(ldIdStr); Long ldID = importLearningDesign(request, response, filePath, username, serverId, customCSV); element = document.createElement(CentralConstants.ELEM_LEARNINGDESIGN); element.setAttribute(CentralConstants.PARAM_LEARNING_DESIGN_ID, ldID.toString()); } else if (method.equals(CentralConstants.METHOD_JOIN_LESSON)) { - Thread t = new Thread(new AddUsersToLessonThread(serverId, datetime, username, hashValue, lsIdStr, + lsId = Long.parseLong(lsIdStr); + Thread t = new Thread(new AddUsersToLessonThread(serverId, datetime, username, hashValue, lsId, courseId, locale, country, learnerIds, monitorIds, firstNames, lastNames, emails, request)); t.start(); element = document.createElement(CentralConstants.ELEM_LESSON); element.setAttribute(CentralConstants.ATTR_LESSON_ID, lsIdStr); } else if (method.equals("gradebookMarksUser")) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getGradebookMarks(document, serverId, datetime, hashValue, username, lsId, null, outputsUser); } else if (method.equals("gradebookMarksLesson")) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getGradebookMarks(document, serverId, datetime, hashValue, username, lsId, null, null); } else if (method.equals("gradebookMarksCourse")) { element = getGradebookMarks(document, serverId, datetime, hashValue, username, null, courseId, null); } else if (method.equals("toolOutputsAllUsers")) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getToolOutputs(document, serverId, datetime, hashValue, username, lsId, courseId, false, null); } else if (method.equals("authoredToolOutputsAllUsers")) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getToolOutputs(document, serverId, datetime, hashValue, username, lsId, courseId, true, null); } else if (method.equals("toolOutputsUser")) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getToolOutputs(document, serverId, datetime, hashValue, username, lsId, courseId, false, outputsUser); } else if (method.equals("authoredToolOutputsUser")) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = getToolOutputs(document, serverId, datetime, hashValue, username, lsId, courseId, true, outputsUser); } else if (method.equals(CentralConstants.METHOD_CHECK_LESSON_FOR_NUMERIC_TOOL_OUTPUTS)) { - lsId = new Long(lsIdStr); + lsId = Long.parseLong(lsIdStr); element = checkLessonForNumericToolOutputs(document, serverId, datetime, hashValue, username, lsId); } else if (method.equals(CentralConstants.METHOD_VERIFY_EXT_SERVER)) { @@ -833,7 +832,7 @@ private String datetime; private String username; private String hashValue; - private String lsIdStr; + private Long lessonId; private String courseId; private String locale; private String country; @@ -845,13 +844,13 @@ private HttpServletRequest request; public AddUsersToLessonThread(String serverId, String datetime, String username, String hashValue, - String lsIdStr, String courseId, String locale, String country, String learnerIds, String monitorIds, + Long lessonId, String courseId, String locale, String country, String learnerIds, String monitorIds, String firstNames, String lastNames, String emails, HttpServletRequest request) { this.serverId = serverId; this.datetime = datetime; this.username = username; this.hashValue = hashValue; - this.lsIdStr = lsIdStr; + this.lessonId = lessonId; this.courseId = courseId; this.locale = locale; this.country = country; @@ -865,7 +864,7 @@ @Override public void run() { - addUsersToLesson(serverId, datetime, username, hashValue, lsIdStr, courseId, locale, country, learnerIds, + addUsersToLesson(serverId, datetime, username, hashValue, lessonId, courseId, locale, country, learnerIds, monitorIds, firstNames, lastNames, emails, request); } @@ -876,14 +875,14 @@ * @param serverId * @param datetime * @param hashValue - * @param lsIdStr + * @param lessonId * @param learnerIds * @param monitorIds * @param request * @return */ public Boolean addUsersToLesson(String serverId, String datetime, String requestorUsername, String hashValue, - String lsIdStr, String courseId, String locale, String country, String learnerIds, String monitorIds, + Long lessonId, String courseId, String locale, String country, String learnerIds, String monitorIds, String firstNames, String lastNames, String emails, HttpServletRequest request) { try { @@ -927,9 +926,9 @@ } if (StringUtils.isNotBlank(userName)) { -// integrationService.addExtUserToLesson(extServer, LoginRequestDispatcher.METHOD_LEARNER, lsIdStr, +// integrationService.addExtUserToLesson(extServer, LoginRequestDispatcher.METHOD_LEARNER, lessonId, // userName, firstName, lastName, email, courseId, countryIsoCode, langIsoCode); - integrationService.addExtUserToLesson(extServer, LoginRequestDispatcher.METHOD_LEARNER, lsIdStr, + integrationService.addExtUserToLesson(extServer, LoginRequestDispatcher.METHOD_LEARNER, lessonId, userName, firstName, lastName, email, courseId, country, locale); } i++; @@ -947,7 +946,7 @@ } if (StringUtils.isNotBlank(userName)) { - integrationService.addExtUserToLesson(extServer, LoginRequestDispatcher.METHOD_MONITOR, lsIdStr, + integrationService.addExtUserToLesson(extServer, LoginRequestDispatcher.METHOD_MONITOR, lessonId, userName, firstName, lastName, email, courseId, country, locale); } i++; Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java =================================================================== diff -u -r4a45c80055efc54640ada958853d4546861bc8d5 -r2921dcd0bdb3c896b149d7a398ee3f5104cdcf4a --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision 4a45c80055efc54640ada958853d4546861bc8d5) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java (.../IIntegrationService.java) (revision 2921dcd0bdb3c896b149d7a398ee3f5104cdcf4a) @@ -233,7 +233,7 @@ ExtCourseClassMap getExtCourseClassMap(Integer sid, Long lessonId); - ExtUserUseridMap addExtUserToLesson(ExtServer extServer, String method, String lsIdStr, String username, String firstName, + ExtUserUseridMap addExtUserToLesson(ExtServer extServer, String method, Long lessonId, String username, String firstName, String lastName, String email, String courseId, String countryIsoCode, String langIsoCode) throws UserInfoFetchException, UserInfoValidationException; Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -r872afab741b1581092544a74d65479af7d3d44e6 -r2921dcd0bdb3c896b149d7a398ee3f5104cdcf4a --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 872afab741b1581092544a74d65479af7d3d44e6) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 2921dcd0bdb3c896b149d7a398ee3f5104cdcf4a) @@ -871,12 +871,12 @@ } @Override - public ExtUserUseridMap addExtUserToLesson(ExtServer extServer, String method, String lsIdStr, String username, + public ExtUserUseridMap addExtUserToLesson(ExtServer extServer, String method, Long lesssonId, String username, String firstName, String lastName, String email, String courseId, String countryIsoCode, String langIsoCode) throws UserInfoFetchException, UserInfoValidationException { if (log.isDebugEnabled()) { - log.debug("Adding user '" + username + "' as " + method + " to lesson with id '" + lsIdStr + "'."); + log.debug("Adding user '" + username + "' as " + method + " to lesson with id '" + lesssonId + "'."); } ExtUserUseridMap userMap = null; @@ -889,7 +889,6 @@ email, usePrefix, isUpdateUserDetails); } - // ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(extServer, username); // adds user to group ExtCourseClassMap orgMap = getExtCourseClassMap(extServer, userMap, courseId, null, method); //TODO when merging to newer branch, check and maybe change to the following @@ -904,9 +903,9 @@ } if (LoginRequestDispatcher.METHOD_LEARNER.equals(method)) { - lessonService.addLearner(Long.parseLong(lsIdStr), user.getUserId()); + lessonService.addLearner(lesssonId, user.getUserId()); } else if (LoginRequestDispatcher.METHOD_MONITOR.equals(method)) { - lessonService.addStaffMember(Long.parseLong(lsIdStr), user.getUserId()); + lessonService.addStaffMember(lesssonId, user.getUserId()); } return userMap; @@ -1034,10 +1033,10 @@ String method = LtiUtils.isStaff(roles, extServer) || LtiUtils.isAdmin(roles) ? LoginRequestDispatcher.METHOD_MONITOR : LoginRequestDispatcher.METHOD_LEARNER; - ExtUserUseridMap extUser = addExtUserToLesson(extServer, method, lessonId.toString(), extUserId, firstName, - lastName, email, courseId, countryIsoCode, langIsoCode); + ExtUserUseridMap extUser = addExtUserToLesson(extServer, method, lessonId, extUserId, firstName, lastName, + email, courseId, countryIsoCode, langIsoCode); - // If a result sourcedid is providedm, save it to the user object + // If a result sourcedid is provided, save it to the user object JsonNode messages = membership.get("message"); if (messages != null && messages.size() > 0) { for (int k = 0; k < messages.size(); k++) {