Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -486,7 +486,7 @@ List result = new LinkedList<>(); for (Object[] entry : queryResult) { - ActivityTimeLimitDTO dto = new ActivityTimeLimitDTO(((BigInteger) entry[0]).longValue(), (String) entry[1], + ActivityTimeLimitDTO dto = new ActivityTimeLimitDTO(((Long) entry[0]).longValue(), (String) entry[1], ((Date) entry[2]).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); result.add(dto); } Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java =================================================================== diff -u -re7cbf85417c8226f95995e5adb34f7eeb386a98c -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java (.../IQbDAO.java) (revision e7cbf85417c8226f95995e5adb34f7eeb386a98c) +++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java (.../IQbDAO.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -63,7 +63,7 @@ List getPagedQuestions(String questionTypes, String collectionUids, Long learningDesignId, int page, int size, String sortBy, String sortOrder, String searchString); - List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, String searchString); + List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, String searchString); int getCountQuestions(String questionTypes, String collectionUids, String searchString); Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java (.../QbDAO.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -213,7 +213,7 @@ @Override public int generateNextQuestionId() { - int max = ((BigInteger) this.getSession().createNativeQuery(FIND_MAX_QUESTION_ID_FROM_GENERATOR).uniqueResult()) + int max = ((Long) this.getSession().createNativeQuery(FIND_MAX_QUESTION_ID_FROM_GENERATOR).uniqueResult()) .intValue(); max++; this.getSession().createNativeQuery(GENERATE_QUESTION_ID).setParameter("qbQuestionId", max).executeUpdate(); @@ -222,9 +222,9 @@ @Override public void updateMaxQuestionId() { - int maxGenerator = ((BigInteger) this.getSession().createNativeQuery(FIND_MAX_QUESTION_ID_FROM_GENERATOR) + int maxGenerator = ((Long) this.getSession().createNativeQuery(FIND_MAX_QUESTION_ID_FROM_GENERATOR) .uniqueResult()).intValue(); - int maxTable = ((BigInteger) this.getSession().createNativeQuery(FIND_MAX_QUESTION_ID).uniqueResult()) + int maxTable = ((Long) this.getSession().createNativeQuery(FIND_MAX_QUESTION_ID).uniqueResult()) .intValue(); if (maxGenerator < maxTable) { this.getSession().createNativeQuery(GENERATE_QUESTION_ID).setParameter("qbQuestionId", maxTable) @@ -283,7 +283,7 @@ .setParameter("qbQuestionUid", qbQuestionUid).list(); Map map = new HashMap<>(result.size()); for (Object[] answerStat : result) { - map.put(((BigInteger) answerStat[0]).longValue(), ((BigInteger) answerStat[1]).longValue()); + map.put(((Long) answerStat[0]).longValue(), ((Long) answerStat[1]).longValue()); } return map; } @@ -306,9 +306,9 @@ @SuppressWarnings("unchecked") @Override - public List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, + public List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, String searchString) { - return (List) getPagedQuestions(null, collectionUids, null, 0, 100000, sortBy, sortOrder, + return (List) getPagedQuestions(null, collectionUids, null, 0, 100000, sortBy, sortOrder, searchString, true); } @@ -445,7 +445,7 @@ .setParameter("activityId", activityId).setParameter("qbQuestionUid", qbQuestionUid).list(); Map map = new HashMap<>(result.size()); for (Object[] answerStat : result) { - map.put(((BigInteger) answerStat[0]).intValue(), ((BigInteger) answerStat[1]).longValue()); + map.put(((Long) answerStat[0]).intValue(), ((Long) answerStat[1]).longValue()); } return map; } @@ -559,7 +559,7 @@ @Override public int getCountCollectionQuestions(long collectionUid, String search) { Query query = prepareCollectionQuestionsQuery(collectionUid, null, null, search, true); - return ((BigInteger) query.getSingleResult()).intValue(); + return ((Long) query.getSingleResult()).intValue(); } @Override @@ -579,11 +579,11 @@ @SuppressWarnings("unchecked") @Override public Set getCollectionQuestionIdsExcluded(long collectionUid, Collection qbQuestionIds) { - List queryResult = getSession().createNativeQuery(FIND_COLLECTION_QUESTIONS_EXCLUDED) + List queryResult = getSession().createNativeQuery(FIND_COLLECTION_QUESTIONS_EXCLUDED) .setParameter("collectionUid", collectionUid).setParameterList("qbQuestionIds", qbQuestionIds) .getResultList(); Set result = new HashSet<>(); - for (BigInteger questionId : queryResult) { + for (Long questionId : queryResult) { result.add(questionId.intValue()); } return result; Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java (.../IQbService.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java (.../IQbService.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -88,7 +88,7 @@ List getPagedQuestions(String questionTypes, String collectionUids, int page, int size, String sortBy, String sortOrder, String searchString); - List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, String searchString); + List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, String searchString); int getCountQuestions(String questionTypes, String collectionUids, String searchString); Index: lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java (.../QbService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java (.../QbService.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -168,7 +168,7 @@ } @Override - public List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, + public List getAllQuestionUids(String collectionUids, String sortBy, String sortOrder, String searchString) { return qbDAO.getAllQuestionUids(collectionUids, sortBy, sortOrder, searchString); } Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java (.../RatingService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java (.../RatingService.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -697,16 +697,16 @@ break; } - long itemId = ((BigInteger) row[0]).longValue(); + long itemId = ((Long) row[0]).longValue(); if (includeCurrentUser || itemId != currentUserId) { - if (row[1] != null && itemId != ((BigInteger) row[0]).longValue()) { + if (row[1] != null && itemId != ((Long) row[0]).longValue()) { log.error("convertToStyledDTO: ratingCriteria" + ratingCriteria.getRatingCriteriaId() + " UserId: " + currentUserId + " Potential issue: expected item id " + row[0] + " does match real item id " + row[1] + ". Data: 0:" + row[0] + " 1:" + row[1]); } - StyledRatingDTO dto = new StyledRatingDTO(((BigInteger) row[0]).longValue()); + StyledRatingDTO dto = new StyledRatingDTO(((Long) row[0]).longValue()); dto.setComment((String) row[2]); dto.setItemDescription(row[numColumns - 2] != null ? row[numColumns - 2].toString() : null); dto.setItemDescription2(row[numColumns - 1] != null ? row[numColumns - 1].toString() : null); @@ -775,10 +775,10 @@ break; } - Long itemId = ((BigInteger) row[0]).longValue(); + Long itemId = ((Long) row[0]).longValue(); if (includeCurrentUser || itemId != currentUserId) { - if (row[1] != null && itemId.longValue() != ((BigInteger) row[0]).longValue()) { + if (row[1] != null && itemId.longValue() != ((Long) row[0]).longValue()) { log.error("convertToStyledJSON: ratingCriteria" + ratingCriteria.getRatingCriteriaId() + " UserId: " + currentUserId + " Potential issue: expected item id " + row[0] + " does match real item id " + row[1] + ". Data: 0:" + row[0] + " 1:" + row[1]); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -804,9 +804,9 @@ } String searchString = WebUtil.readStrParam(request, "searchString", true); - List questionUids = qbService.getAllQuestionUids(collectionUids, sortBy, sortOrder, searchString); + List questionUids = qbService.getAllQuestionUids(collectionUids, sortBy, sortOrder, searchString); ArrayNode rows = JsonNodeFactory.instance.arrayNode(); - for (BigInteger questionUid : questionUids) { + for (Long questionUid : questionUids) { rows.add(questionUid); } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java (.../SpreadsheetBuilder.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java (.../SpreadsheetBuilder.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -366,7 +366,7 @@ } ExcelRow commentRow = sessionSheet.initRow(); - Long commentingUserId = ((BigInteger) comment[0]).longValue(); + Long commentingUserId = ((Long) comment[0]).longValue(); PeerreviewUser commentingUser = userMap.get(commentingUserId); commentRow.addCell(StringEscapeUtils.escapeCsv(commentingUser.getLoginName())); commentRow.addCell(StringEscapeUtils.escapeCsv(commentingUser.getFirstName())); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r75088f2af7a57bca6d772385fb30c1d6f248bd4f --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) @@ -154,7 +154,6 @@ return CRITERIA_PATH; } - // may be a BigInteger, may be a Long. Who knows as it has come from Hibernate and it seems to change! private Long asLong(Object value) { if (value != null) { try {