Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -23,7 +23,8 @@ package org.lamsfoundation.lams.admin.service; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -58,6 +59,7 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import jakarta.servlet.http.HttpSession; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -548,7 +550,7 @@ Organisation org = null; if (StringUtils.isNotBlank(orgId)) { - org = (Organisation) service.findById(Organisation.class, new Integer(orgId)); + org = (Organisation) service.findById(Organisation.class, Integer.valueOf(orgId)); } if (StringUtils.isBlank(orgId) || (org == null)) { setError("error.org.invalid", "(" + orgId + ")"); @@ -734,7 +736,7 @@ cell.setCellType(CellType.NUMERIC); double d = cell.getNumericCellValue(); emptyRow = false; - value = new Long(new Double(d).longValue()).toString(); + value = String.valueOf(Double.valueOf(d).longValue()); } if (StringUtils.equals(value, "1") || StringUtils.equalsIgnoreCase(value, "true")) { return true; @@ -761,7 +763,7 @@ double d = cell.getNumericCellValue(); emptyRow = false; // log.debug("numeric cell value: '"+d+"'"); - return (new Long(new Double(d).longValue()).toString()); + return String.valueOf(Double.valueOf(d).longValue()); } } return null; @@ -773,7 +775,7 @@ return (AuthenticationMethod) service.findById(AuthenticationMethod.class, AuthenticationMethod.DB); } else { try { - Integer authMethodId = new Integer(authMethodName); + Integer authMethodId = Integer.valueOf(authMethodName); return (AuthenticationMethod) service.findById(AuthenticationMethod.class, authMethodId); } catch (NumberFormatException e) { list = service.findByProperty(AuthenticationMethod.class, "authenticationMethodName", authMethodName); @@ -865,7 +867,7 @@ return service.getDefaultTheme(); } else { try { - return (Theme) service.findById(Theme.class, new Long(themeId)); + return (Theme) service.findById(Theme.class, Long.valueOf(themeId)); } catch (Exception e) { return null; } @@ -878,7 +880,7 @@ return LanguageUtil.getDefaultLocale(); } else { try { - return (SupportedLocale) service.findById(SupportedLocale.class, new Integer(localeId)); + return (SupportedLocale) service.findById(SupportedLocale.class, Integer.valueOf(localeId)); } catch (Exception e) { return null; } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -134,7 +134,7 @@ int totalUsers = users.size(); if (rowLimit < users.size()) { totalPages = new Double( - Math.ceil(new Integer(users.size()).doubleValue() / new Integer(rowLimit).doubleValue())) + Math.ceil(Integer.valueOf(users.size()).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); int firstRow = (page - 1) * rowLimit; int lastRow = firstRow + rowLimit; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java (.../PolicyManagementController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java (.../PolicyManagementController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -231,7 +231,7 @@ sortBy, sortOrder, searchString); int countUsers = userManagementService.getCountUsers(searchString); int totalPages = new Double( - Math.ceil(new Integer(countUsers).doubleValue() / new Integer(rowLimit).doubleValue())).intValue(); + Math.ceil(Integer.valueOf(countUsers).doubleValue() / Integer.valueOf(rowLimit).doubleValue())).intValue(); ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); responseJSON.put("total", "" + totalPages); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -1654,7 +1654,7 @@ // Grade is used for assessment String grade = request.getParameter(prefixParam + questionNumber + "option" + i + "grade"); Option option = new Option(i, i == correctDisplayId, optionText, grade); - optionDtos.put(new Integer(i), option); + optionDtos.put(Integer.valueOf(i), option); } } Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java (.../EmailUserController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java (.../EmailUserController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -157,8 +157,8 @@ } } if (!StringUtils.isBlank(orgId)) { - result = userManagementService.isUserInRole(currentUser.getUserID(), new Integer(orgId), Role.MONITOR) - || userManagementService.isUserInRole(currentUser.getUserID(), new Integer(orgId), + result = userManagementService.isUserInRole(currentUser.getUserID(), Integer.valueOf(orgId), Role.MONITOR) + || userManagementService.isUserInRole(currentUser.getUserID(), Integer.valueOf(orgId), Role.GROUP_MANAGER); } } Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -111,7 +111,7 @@ try { HomeController.log.debug("request appadmin"); - int orgId = new Integer(req.getParameter("orgId")).intValue(); + int orgId = Integer.valueOf(req.getParameter("orgId")).intValue(); UserDTO user = getUser(); if (user == null) { HomeController.log.error("admin: User missing from session. "); Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -71,8 +71,8 @@ protected Logger log = LogManager.getLogger(WorkspaceManagementService.class.getName()); - public static final Integer AUTHORING = new Integer(1); - public static final Integer MONITORING = new Integer(2); + public static final Integer AUTHORING = Integer.valueOf(1); + public static final Integer MONITORING = Integer.valueOf(2); protected IBaseDAO baseDAO; protected ILearningDesignDAO learningDesignDAO; @@ -146,7 +146,7 @@ if (FolderContentDTO.DESIGN.equals(resourceType)) { deleteLearningDesign(resourceID, userID); } else if (FolderContentDTO.FOLDER.equals(resourceType)) { - deleteFolder(new Integer(resourceID.intValue()), userID); + deleteFolder(Integer.valueOf(resourceID.intValue()), userID); } else if (FolderContentDTO.FILE.equals(resourceType)) { deleteWorkspaceFolderContent(resourceID); } @@ -567,10 +567,10 @@ Integer userID) throws LearningDesignException, UserException, WorkspaceFolderException, IOException { if (FolderContentDTO.DESIGN.equals(resourceType)) { authoringFullService.copyLearningDesign(resourceID, - copyType != null ? copyType : new Integer(LearningDesign.COPY_TYPE_NONE), userID, targetFolderID, + copyType != null ? copyType : Integer.valueOf(LearningDesign.COPY_TYPE_NONE), userID, targetFolderID, false); } else if (FolderContentDTO.FOLDER.equals(resourceType)) { - copyFolder(new Integer(resourceID.intValue()), targetFolderID, userID); + copyFolder(Integer.valueOf(resourceID.intValue()), targetFolderID, userID); } } @@ -686,7 +686,7 @@ Iterator iterator = designs.iterator(); while (iterator.hasNext()) { LearningDesign design = (LearningDesign) iterator.next(); - authoringFullService.copyLearningDesign(design, new Integer(LearningDesign.COPY_TYPE_NONE), user, + authoringFullService.copyLearningDesign(design, Integer.valueOf(LearningDesign.COPY_TYPE_NONE), user, targetWorkspaceFolder, false, null, null); } } @@ -969,7 +969,7 @@ if (FolderContentDTO.DESIGN.equals(resourceType)) { renameLearningDesign(resourceID, newName, userID); } else if (FolderContentDTO.FOLDER.equals(resourceType)) { - renameWorkspaceFolder(new Integer(resourceID.intValue()), newName, userID); + renameWorkspaceFolder(Integer.valueOf(resourceID.intValue()), newName, userID); } } Index: lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java (.../WorkspaceController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java (.../WorkspaceController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -64,19 +64,19 @@ * Special value for folderID on getFolderContents(). Triggers getting the dummy value for the organisations (see * ORG_FOLDER_ID) and the user's private folder. See the method for more details. */ - public static final Integer BOOTSTRAP_FOLDER_ID = new Integer(-1); + public static final Integer BOOTSTRAP_FOLDER_ID = Integer.valueOf(-1); /** * Special value for folderID on getFolderContents(). Triggers getting the organisation folders that are available * to a user. See the method for more details. */ - public static final Integer ORG_FOLDER_ID = new Integer(-2); - public static final Integer ROOT_ORG_FOLDER_ID = new Integer(1); + public static final Integer ORG_FOLDER_ID = Integer.valueOf(-2); + public static final Integer ROOT_ORG_FOLDER_ID = Integer.valueOf(1); @Autowired private IWorkspaceManagementService workspaceManagementService; private Integer getUserId() { - // return new Integer(WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID)); + // return Integer.valueOf(WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID)); HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); return user != null ? user.getUserID() : null; Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java (.../ConfigurationDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -31,14 +31,12 @@ import org.springframework.stereotype.Repository; /** - * * @author Mitchell Seaton - * */ @Repository public class ConfigurationDAO extends LAMSBaseDAO implements IConfigurationDAO { - private static final String LOAD_CONFIG_ITEM_BY_KEY = "from configuration in class " - + ConfigurationItem.class.getName() + " where configuration.key=:key"; + private static final String LOAD_CONFIG_ITEM_BY_KEY = + "from configuration in class " + ConfigurationItem.class.getName() + " where configuration.key=:key"; /** * @see org.lamsfoundation.lams.config.dao.IConfigurationlDAO#getAllItems() @@ -58,6 +56,6 @@ @Override public ConfigurationItem getConfigItemByKey(final String configKey) { return (ConfigurationItem) getSession().createQuery(ConfigurationDAO.LOAD_CONFIG_ITEM_BY_KEY) - .setString("key", configKey).setCacheable(true).uniqueResult(); + .setParameter("key", configKey).setCacheable(true).uniqueResult(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0012FixWorkspaceNames.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0012FixWorkspaceNames.java (.../Patch0012FixWorkspaceNames.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0012FixWorkspaceNames.java (.../Patch0012FixWorkspaceNames.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -49,7 +49,7 @@ private static Logger log = LogManager.getLogger(Patch0012FixWorkspaceNames.class); - private static final Integer LEVEL = new Integer(12); + private static final Integer LEVEL = Integer.valueOf(12); private static final String NAME = "FixRunSeqFolders"; Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0016FixWorkspacePublicFolder.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0016FixWorkspacePublicFolder.java (.../Patch0016FixWorkspacePublicFolder.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0016FixWorkspacePublicFolder.java (.../Patch0016FixWorkspacePublicFolder.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.dbupdates; import java.sql.Connection; @@ -29,7 +28,8 @@ import java.sql.Statement; import java.util.Locale; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.lamsfoundation.lams.util.MessageService; import org.springframework.context.ApplicationContext; import org.springframework.context.MessageSource; @@ -43,14 +43,13 @@ /** * @author mseaton * - * Insert new workspace and workspace folder for new Public Folder - - * LDEV2107. + * Insert new workspace and workspace folder for new Public Folder - LDEV2107. */ public class Patch0016FixWorkspacePublicFolder extends MigrationTaskSupport { private static Logger log = LogManager.getLogger(Patch0016FixWorkspacePublicFolder.class); - private static final Integer LEVEL = new Integer(16); + private static final Integer LEVEL = Integer.valueOf(16); private static final String NAME = "FixWkspcPublicFolder"; @@ -81,12 +80,12 @@ String i18nMessage = getI18nMessage(conn); PreparedStatement query = conn.prepareStatement(insertWorkspacePublicFolder, Statement.RETURN_GENERATED_KEYS); - query.setParameter(1, new Long(1)); + query.setLong(1, 1L); query.setString(2, i18nMessage); - query.setParameter(3, new Long(1)); + query.setLong(3, 1L); query.setDate(4, new java.sql.Date(System.currentTimeMillis())); query.setDate(5, new java.sql.Date(System.currentTimeMillis())); - query.setInt(6, new Integer(3)); + query.setInt(6, Integer.valueOf(3)); int numUpdatedWorkspaces = query.executeUpdate(); ResultSet results = query.getGeneratedKeys(); @@ -100,7 +99,7 @@ // insert new workspace query = conn.prepareStatement(insertNewWorkspace, Statement.RETURN_GENERATED_KEYS); query.setString(1, i18nMessage); - query.setParameter(2, wkspcFolderId); + query.setLong(2, wkspcFolderId); numUpdatedWorkspaces = query.executeUpdate(); results = query.getGeneratedKeys(); @@ -113,8 +112,8 @@ // insert new wkspc to wkspc folder mapping query = conn.prepareStatement(insertNewWkspcWkspcFolder); - query.setParameter(1, wkspcId); - query.setParameter(2, wkspcFolderId); + query.setLong(1, wkspcId); + query.setLong(2, wkspcFolderId); numUpdatedWorkspaces = query.executeUpdate(); log.info("Inserted " + numUpdatedWorkspaces + " wkspc_wkspc_folder links."); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch02030300.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch02030300.java (.../Patch02030300.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch02030300.java (.../Patch02030300.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -39,7 +39,7 @@ private static Logger log = LogManager.getLogger(Patch02030300.class); - private static final Integer LEVEL = new Integer(2030300); + private static final Integer LEVEL = Integer.valueOf(2030300); private static final String NAME = "Fix3rdPartyUserRoles"; Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/RandomPasswordGenerator.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/integration/security/RandomPasswordGenerator.java (.../RandomPasswordGenerator.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/integration/security/RandomPasswordGenerator.java (.../RandomPasswordGenerator.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -1,20 +1,16 @@ /** * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later + * version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA + * You should have received a copy of the GNU General Public License along with this program; if not, write to the Free + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * http://www.gnu.org/licenses/gpl.txt */ @@ -30,6 +26,7 @@ import org.hibernate.id.IdentifierGenerator; import org.hibernate.id.UUIDGenerator; import org.hibernate.type.StandardBasicTypes; +import org.hibernate.type.spi.TypeConfiguration; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.FileUtilException; @@ -134,7 +131,8 @@ Properties props = new Properties(); IdentifierGenerator uuidGen = new UUIDGenerator(); - ((Configurable) uuidGen).configure(StandardBasicTypes.STRING, props, null); + ((Configurable) uuidGen).configure( + new TypeConfiguration().getBasicTypeRegistry().getRegisteredType(String.class), props, null); return ((String) uuidGen.generate(null, null)).toLowerCase(); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java =================================================================== diff -u -r7116e79c883ad42375d9fa3278dec8a84733ea86 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java (.../ContributionTypes.java) (revision 7116e79c883ad42375d9fa3278dec8a84733ea86) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java (.../ContributionTypes.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -28,18 +28,18 @@ //--------------------------------------------------------------------- // Class level constants - Contribution types //--------------------------------------------------------------------- - // public static final Integer MODERATION = new Integer(1); + // public static final Integer MODERATION = Integer.valueOf(1); //the next one was removed and no longer used - //public static final Integer DEFINE_LATER = new Integer(2); - public static final Integer PERMISSION_GATE = new Integer(3); - public static final Integer SYNC_GATE = new Integer(4); - public static final Integer SCHEDULE_GATE = new Integer(5); - public static final Integer CHOSEN_GROUPING = new Integer(6); - public static final Integer CONTRIBUTION = new Integer(7); - public static final Integer SYSTEM_GATE = new Integer(8); - public static final Integer CHOSEN_BRANCHING = new Integer(9); - public static final Integer CONDITION_GATE = new Integer(10); + //public static final Integer DEFINE_LATER = Integer.valueOf(2); + public static final Integer PERMISSION_GATE = Integer.valueOf(3); + public static final Integer SYNC_GATE = Integer.valueOf(4); + public static final Integer SCHEDULE_GATE = Integer.valueOf(5); + public static final Integer CHOSEN_GROUPING = Integer.valueOf(6); + public static final Integer CONTRIBUTION = Integer.valueOf(7); + public static final Integer SYSTEM_GATE = Integer.valueOf(8); + public static final Integer CHOSEN_BRANCHING = Integer.valueOf(9); + public static final Integer CONDITION_GATE = Integer.valueOf(10); // Tool activity was opened for editing but not closed properly - public static final Integer CONTENT_EDITED = new Integer(11); + public static final Integer CONTENT_EDITED = Integer.valueOf(11); public static final Integer PASSWORD_GATE = 12; -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java (.../Grouper.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java (.../Grouper.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -231,7 +231,7 @@ log.warn("Having trouble creating a unique name for a group. Have tried " + trimmedName); int attempt = 1; while (newGroup == null && attempt < 5) { - newGroup = Group.createLearnerGroup(grouping, trimmedName + " " + new Integer(attempt).toString(), + newGroup = Group.createLearnerGroup(grouping, trimmedName + " " + Integer.valueOf(attempt).toString(), emptySet); } if (newGroup == null) { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouper.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouper.java (.../LearnerChoiceGrouper.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearnerChoiceGrouper.java (.../LearnerChoiceGrouper.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -182,7 +182,7 @@ String prefix = getPrefix(); int size = learnerChoiceGrouping.getGroups().size(); for (int numCreated = 0, groupIndex = size + 1; numCreated < numOfGroupsTobeCreated; groupIndex++) { - String groupName = prefix + " " + new Integer(groupIndex).toString(); + String groupName = prefix + " " + Integer.valueOf(groupIndex).toString(); // if the name of the group already exists, then createLearnerGroup will return null // the name may exist if people have been creating and then removing groups in authoring. Group newGroup = Group.createLearnerGroup(learnerChoiceGrouping, groupName, new HashSet()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java (.../RandomGrouper.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java (.../RandomGrouper.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -171,7 +171,7 @@ String prefix = getPrefix(); int size = randomGrouping.getGroups().size(); for (int numCreated = 0, groupIndex = size + 1; numCreated < numOfGroupsTobeCreated; groupIndex++) { - String groupName = prefix + " " + new Integer(groupIndex).toString(); + String groupName = prefix + " " + Integer.valueOf(groupIndex).toString(); // if the name of the group already exists, then createLearnerGroup will return null // the name may exist if people have been creating and then removing groups in authoring. Group newGroup = Group.createLearnerGroup(randomGrouping, groupName, new HashSet()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java (.../CompetenceDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -55,7 +55,7 @@ if (design != null && competenceTitle != null) { Long designID = design.getLearningDesignId(); Query query = getSessionFactory().getCurrentSession().createQuery(LOAD_COMPETENCE_BY_LDID_AND_TITLE); - query.setString("title", competenceTitle); + query.setParameter("title", competenceTitle); query.setParameter("ldId", designID.longValue()); return (Competence) query.uniqueResult(); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupDAO.java (.../GroupDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -69,6 +69,6 @@ Query query = getSession().createQuery(NUM_GROUPS); query.setParameter("userID", userID); Object value = query.uniqueResult(); - return new Integer(((Number) value).intValue()); + return Integer.valueOf(((Number) value).intValue()); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -1859,7 +1859,7 @@ dataFlowObject.setDisplayName(dataFlowObjectDto.getDisplayName()); dataFlowObject.setOrderId(dataFlowObjectDto.getOrderId()); Integer toolAssigmentId = StringUtils.isBlank(dataFlowObjectDto.getToolAssigmentId()) ? null - : new Integer(dataFlowObjectDto.getToolAssigmentId()); + : Integer.valueOf(dataFlowObjectDto.getToolAssigmentId()); dataFlowObject.setToolAssigmentId(toolAssigmentId); dataTransition.getDataFlowObjects().add(dataFlowObject); } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -495,12 +495,12 @@ Calendar calendar = Calendar.getInstance(); int mth = calendar.get(Calendar.MONTH) + 1; - String mthStr = new Integer(mth).toString(); + String mthStr = Integer.valueOf(mth).toString(); if (mth < 10) { mthStr = "0" + mthStr; } int day = calendar.get(Calendar.DAY_OF_MONTH); - String dayStr = new Integer(day).toString(); + String dayStr = Integer.valueOf(day).toString(); if (day < 10) { dayStr = "0" + dayStr; } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java (.../ParallelWaitActivity.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/ParallelWaitActivity.java (.../ParallelWaitActivity.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -35,7 +35,7 @@ @Override public Integer getActivityTypeId() { - return new Integer(PARALLEL_WAIT_ACTIVITY_TYPE); + return Integer.valueOf(PARALLEL_WAIT_ACTIVITY_TYPE); } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java (.../LearnerProgressDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -29,7 +29,8 @@ import java.util.TreeMap; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.query.Query; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.learningdesign.Activity; @@ -49,8 +50,8 @@ protected Logger log = LogManager.getLogger(LearnerProgressDAO.class); - private final static String LOAD_PROGRESS_BY_LEARNER = "from LearnerProgress p where p.user.id = :learnerId " - + "and p.lesson.id = :lessonId"; + private final static String LOAD_PROGRESS_BY_LEARNER = + "from LearnerProgress p where p.user.id = :learnerId " + "and p.lesson.id = :lessonId"; private final static String LOAD_PROGRESS_REFFERING_TO_ACTIVITY = "from LearnerProgress p " + "where p.previousActivity = :activity or p.currentActivity = :activity or p.nextActivity = :activity "; @@ -67,8 +68,8 @@ private final static String LOAD_LEARNERS_COMPLETED_ACTIVITY = "SELECT prog.user FROM LearnerProgress prog, " + " Activity act join prog.completedActivities compAct where act.id = :activityId and index(compAct) = act"; - private final static String COUNT_COMPLETED_PROGRESS_BY_LESSON = "select count(*) from LearnerProgress p " - + " where p.lessonComplete > 0 and p.lesson.id = :lessonId"; + private final static String COUNT_COMPLETED_PROGRESS_BY_LESSON = + "select count(*) from LearnerProgress p " + " where p.lessonComplete > 0 and p.lesson.id = :lessonId"; private final static String COUNT_ATTEMPTED_ACTIVITY = "select count(*) from LearnerProgress prog, " + " Activity act join prog.attemptedActivities attAct where act.id = :activityId and " @@ -82,45 +83,47 @@ + "from LearnerProgress prog WHERE prog.currentActivity.activityId IN (:activityIds) " + "GROUP BY prog.currentActivity.activityId"; - private final static String COUNT_SINGLE_CURRENT_ACTIVITY = "select count(*) from LearnerProgress prog " - + "WHERE prog.currentActivity.activityId = :activityId "; + private final static String COUNT_SINGLE_CURRENT_ACTIVITY = + "select count(*) from LearnerProgress prog " + "WHERE prog.currentActivity.activityId = :activityId "; private final static String LOAD_PROGRESS_BY_LESSON = "from LearnerProgress p " + " where p.lesson.id = :lessonId order by p.user.lastName, p.user.firstName, p.user.userId"; private final static String LOAD_PROGRESS_BY_LESSON_AND_USER_IDS = "from LearnerProgress p " + " where p.lesson.id = :lessonId AND p.user.userId IN (:userIds) order by p.user.lastName, p.user.firstName, p.user.userId"; - private final static String LOAD_PROGRESSES_BY_LESSON_LIST = "FROM LearnerProgress progress WHERE " - + " progress.lesson.lessonId IN (:lessonIds)"; + private final static String LOAD_PROGRESSES_BY_LESSON_LIST = + "FROM LearnerProgress progress WHERE " + " progress.lesson.lessonId IN (:lessonIds)"; - private final static String LOAD_LEARNERS_LATEST_BY_ACTIVITY = "SELECT u.* FROM lams_learner_progress AS prog " - + "JOIN lams_user AS u USING (user_id) " - + "LEFT JOIN lams_progress_attempted AS att ON prog.learner_progress_id = att.learner_progress_id AND att.activity_id = :activityId " - + "LEFT JOIN lams_progress_completed AS comp ON prog.learner_progress_id = comp.learner_progress_id AND comp.activity_id = :activityId " - + "WHERE prog.current_activity_id = :activityId AND (att.learner_progress_id IS NOT NULL OR comp.learner_progress_id IS NOT NULL) " - + "ORDER BY att.start_date_time DESC, comp.start_date_time DESC"; + private final static String LOAD_LEARNERS_LATEST_BY_ACTIVITY = + "SELECT u.* FROM lams_learner_progress AS prog " + "JOIN lams_user AS u USING (user_id) " + + "LEFT JOIN lams_progress_attempted AS att ON prog.learner_progress_id = att.learner_progress_id AND att.activity_id = :activityId " + + "LEFT JOIN lams_progress_completed AS comp ON prog.learner_progress_id = comp.learner_progress_id AND comp.activity_id = :activityId " + + "WHERE prog.current_activity_id = :activityId AND (att.learner_progress_id IS NOT NULL OR comp.learner_progress_id IS NOT NULL) " + + "ORDER BY att.start_date_time DESC, comp.start_date_time DESC"; - private final static String LOAD_LEARNERS_BY_ACTIVITIES = "SELECT prog.user FROM LearnerProgress prog WHERE " - + " prog.currentActivity.id IN (:activityIds) " - + "ORDER BY prog.user.firstName , prog.user.lastName , prog.user.login "; + private final static String LOAD_LEARNERS_BY_ACTIVITIES = + "SELECT prog.user FROM LearnerProgress prog WHERE " + " prog.currentActivity.id IN (:activityIds) " + + "ORDER BY prog.user.firstName , prog.user.lastName , prog.user.login "; private final static String COUNT_LEARNERS_BY_LESSON = "COUNT(*) FROM LearnerProgress prog WHERE prog.lesson.id = :lessonId"; private final static String COUNT_LEARNERS_BY_LESSON_ORDER_CLAUSE = " ORDER BY prog.user.firstName ASC, prog.user.lastName ASC, prog.user.login ASC"; // find Learners for the given Lesson first, then see if they have Progress, i.e. started the lesson - private final static String LOAD_LEARNERS_BY_MOST_PROGRESS = "SELECT u.*, COUNT(comp.activity_id) AS comp_count FROM lams_lesson AS lesson " - + "JOIN lams_grouping AS grping ON lesson.class_grouping_id = grping.grouping_id " - + "JOIN lams_group AS g USING (grouping_id) JOIN lams_user_group AS ug USING (group_id) " - + "JOIN lams_user AS u ON ug.user_id = u.user_id " - + "LEFT JOIN lams_learner_progress AS prog ON prog.lesson_id = lesson.lesson_id AND prog.user_id = u.user_id " - + "LEFT JOIN lams_progress_completed AS comp USING (learner_progress_id) " - + "WHERE lesson.lesson_id = :lessonId AND g.group_name NOT LIKE '%Staff%'"; + private final static String LOAD_LEARNERS_BY_MOST_PROGRESS = + "SELECT u.*, COUNT(comp.activity_id) AS comp_count FROM lams_lesson AS lesson " + + "JOIN lams_grouping AS grping ON lesson.class_grouping_id = grping.grouping_id " + + "JOIN lams_group AS g USING (grouping_id) JOIN lams_user_group AS ug USING (group_id) " + + "JOIN lams_user AS u ON ug.user_id = u.user_id " + + "LEFT JOIN lams_learner_progress AS prog ON prog.lesson_id = lesson.lesson_id AND prog.user_id = u.user_id " + + "LEFT JOIN lams_progress_completed AS comp USING (learner_progress_id) " + + "WHERE lesson.lesson_id = :lessonId AND g.group_name NOT LIKE '%Staff%'"; private final static String LOAD_LEARNERS_BY_MOST_PROGRESS_ORDER_CLAUSE = " GROUP BY u.user_id " + "ORDER BY prog.lesson_completed_flag DESC, comp_count DESC, u.first_name ASC, u.last_name ASC, u.login ASC"; - private final static String FIND_PROGRESS_ARCHIVE_MAX_ATTEMPT = "SELECT MAX(p.attemptId) FROM LearnerProgressArchive p " - + "WHERE p.user.id = :learnerId AND p.lesson.id = :lessonId"; + private final static String FIND_PROGRESS_ARCHIVE_MAX_ATTEMPT = + "SELECT MAX(p.attemptId) FROM LearnerProgressArchive p " + + "WHERE p.user.id = :learnerId AND p.lesson.id = :lessonId"; private final static String FIND_PROGRESS_ARCHIVE_BY_DATE = "FROM LearnerProgressArchive a " + "WHERE a.lesson.lessonId = :lessonId AND a.user.userId = :learnerId AND a.archiveDate = :archiveDate"; @@ -156,7 +159,7 @@ @Override public List getLearnerProgressReferringToActivity(Activity activity) { return getSession().createQuery(LearnerProgressDAO.LOAD_PROGRESS_REFFERING_TO_ACTIVITY) - .setEntity("activity", activity).list(); + .setParameter("activity", activity).list(); } @SuppressWarnings("unchecked") @@ -178,7 +181,7 @@ public List getLearnersByActivities(Long[] activityIds, Integer limit, Integer offset, boolean orderAscending) { Query query = getSession().createQuery( - LearnerProgressDAO.LOAD_LEARNERS_BY_ACTIVITIES.replaceAll("", orderAscending ? "ASC" : "DESC")) + LearnerProgressDAO.LOAD_LEARNERS_BY_ACTIVITIES.replaceAll("", orderAscending ? "ASC" : "DESC")) .setParameterList("activityIds", activityIds); if (limit != null) { query.setMaxResults(limit); @@ -217,8 +220,8 @@ } queryText.append(LearnerProgressDAO.LOAD_LEARNERS_BY_MOST_PROGRESS_ORDER_CLAUSE); - Query query = getSession().createNativeQuery(queryText.toString()).addEntity(User.class).setParameter("lessonId", - lessonId); + Query query = getSession().createNativeQuery(queryText.toString()).addEntity(User.class) + .setParameter("lessonId", lessonId); if (limit != null) { query.setMaxResults(limit); } @@ -232,8 +235,9 @@ @Override public List getCompletedLearnerProgressForLesson(Long lessonId, Integer limit, Integer offset, boolean orderAscending) { - Query query = getSession().createQuery(LearnerProgressDAO.LOAD_COMPLETED_PROGRESS_BY_LESSON - .replaceAll("", orderAscending ? "ASC" : "DESC")).setParameter("lessonId", lessonId); + Query query = getSession().createQuery( + LearnerProgressDAO.LOAD_COMPLETED_PROGRESS_BY_LESSON.replaceAll("", + orderAscending ? "ASC" : "DESC")).setParameter("lessonId", lessonId); if (limit != null) { query.setMaxResults(limit); } @@ -362,7 +366,7 @@ public Integer getNumUsersCurrentActivity(Activity activity) { Object value = getSession().createQuery(LearnerProgressDAO.COUNT_SINGLE_CURRENT_ACTIVITY) .setParameter("activityId", activity.getActivityId().longValue()).uniqueResult(); - return new Integer(((Number) value).intValue()); + return Integer.valueOf(((Number) value).intValue()); } @Override @@ -375,7 +379,7 @@ @Override public LearnerProgressArchive getLearnerProgressArchive(Long lessonId, Integer userId, Date archiveDate) { return (LearnerProgressArchive) getSession().createQuery(LearnerProgressDAO.FIND_PROGRESS_ARCHIVE_BY_DATE) - .setParameter("learnerId", userId).setParameter("lessonId", lessonId).setTimestamp("archiveDate", archiveDate) - .setCacheable(true).uniqueResult(); + .setParameter("learnerId", userId).setParameter("lessonId", lessonId) + .setParameter("archiveDate", archiveDate).setCacheable(true).uniqueResult(); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java (.../LessonDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -180,7 +180,7 @@ Query query = getSession().createQuery(LessonDAO.COUNT_ACTIVE_LEARNERS); query.setParameter("lessonId", lessonId); Object value = query.uniqueResult(); - return new Integer(((Number) value).intValue()); + return Integer.valueOf(((Number) value).intValue()); } @SuppressWarnings("unchecked") Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -150,7 +150,7 @@ if (lesson != null) { dto = lesson.getLessonDetails(); Integer active = getCountActiveLessonLearners(lessonId); - dto.setNumberStartedLearners(active != null ? active : new Integer(0)); + dto.setNumberStartedLearners(active != null ? active : Integer.valueOf(0)); } return dto; } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerProgressComparator.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerProgressComparator.java (.../LearnerProgressComparator.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerProgressComparator.java (.../LearnerProgressComparator.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -51,6 +51,6 @@ return 1; } - return new Integer(o2.getCompletedActivities().size()).compareTo(o1.getCompletedActivities().size()); + return Integer.valueOf(o2.getCompletedActivities().size()).compareTo(o1.getCompletedActivities().size()); } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java (.../Policy.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_common/src/java/org/lamsfoundation/lams/policies/Policy.java (.../Policy.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -23,18 +23,18 @@ public class Policy { /** active policy */ - public static final Integer STATUS_ACTIVE = new Integer(1); + public static final Integer STATUS_ACTIVE = Integer.valueOf(1); /** inactive policy */ - public static final Integer STATUS_INACTIVE = new Integer(2); + public static final Integer STATUS_INACTIVE = Integer.valueOf(2); /** site policy */ - public static final Integer TYPE_SITE_POLICY = new Integer(1); + public static final Integer TYPE_SITE_POLICY = Integer.valueOf(1); /** privacy policy */ - public static final Integer TYPE_PRIVACY_POLICY = new Integer(2); + public static final Integer TYPE_PRIVACY_POLICY = Integer.valueOf(2); /** third party policy */ - public static final Integer TYPE_THIRD_PARTIES_POLICY = new Integer(3); + public static final Integer TYPE_THIRD_PARTIES_POLICY = Integer.valueOf(3); /** other policy */ - public static final Integer TYPE_OTHER = new Integer(4); + public static final Integer TYPE_OTHER = Integer.valueOf(4); @Id @Column Index: lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java (.../RatingCriteria.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingCriteria.java (.../RatingCriteria.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -263,7 +263,7 @@ ratingCriteria = new LessonRatingCriteria(); break; } - ratingCriteria.setRatingCriteriaTypeId(new Integer(ratingCriteriaType)); + ratingCriteria.setRatingCriteriaTypeId(Integer.valueOf(ratingCriteriaType)); return ratingCriteria; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java (.../OutputFactory.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/tool/OutputFactory.java (.../OutputFactory.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -287,11 +287,11 @@ Boolean.FALSE, Boolean.class); List conditions = new ArrayList(); - conditions.add(new BranchCondition(null, null, new Integer(1), definitionName, + conditions.add(new BranchCondition(null, null, Integer.valueOf(1), definitionName, getI18NText(definitionName + ".true", true), OutputType.OUTPUT_BOOLEAN.toString(), null, null, Boolean.TRUE.toString())); - conditions.add(new BranchCondition(null, null, new Integer(2), definitionName, + conditions.add(new BranchCondition(null, null, Integer.valueOf(2), definitionName, getI18NText(definitionName + ".false", true), OutputType.OUTPUT_BOOLEAN.toString(), null, null, Boolean.FALSE.toString())); Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputValue.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputValue.java (.../ToolOutputValue.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputValue.java (.../ToolOutputValue.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -23,8 +23,8 @@ package org.lamsfoundation.lams.tool; /** - * The ToolOutputValue is the actual output data from the tool, as wrapped up in a - * ToolOutput object and defined by a ToolOutputDefinition. + * The ToolOutputValue is the actual output data from the tool, as wrapped up in a ToolOutput object and defined by a + * ToolOutputDefinition. */ public class ToolOutputValue { private OutputType type; @@ -34,7 +34,7 @@ * Create a ToolOutputValue based on a Boolean. This will create a value of type OUTPUT_BOOLEAN * * @param val - * mandatory + * mandatory */ public ToolOutputValue(Boolean val) { this.type = OutputType.OUTPUT_BOOLEAN; @@ -45,7 +45,7 @@ * Create a ToolOutputValue based on a Long. This will create a value of type OUTPUT_LONG. * * @param val - * mandatory + * mandatory */ public ToolOutputValue(Long val) { this.type = OutputType.OUTPUT_LONG; @@ -56,7 +56,7 @@ * Create a ToolOutputValue based on a Integer. This will create a value of type OUTPUT_LONG. * * @param val - * mandatory + * mandatory */ public ToolOutputValue(Integer val) { this.type = OutputType.OUTPUT_LONG; @@ -67,7 +67,7 @@ * Create a ToolOutputValue based on a Double. This will create a value of type OUTPUT_DOUBLE. * * @param val - * mandatory + * mandatory */ public ToolOutputValue(Double val) { this.type = OutputType.OUTPUT_DOUBLE; @@ -78,7 +78,7 @@ * Create a ToolOutputValue based on a Integer. This will create a value of type OUTPUT_DOUBLE. * * @param val - * mandatory + * mandatory */ public ToolOutputValue(Float val) { this.type = OutputType.OUTPUT_DOUBLE; @@ -89,7 +89,7 @@ * Create a ToolOutputValue based on a String. This will create a value of type OUTPUT_STRING. * * @param val - * mandatory + * mandatory */ public ToolOutputValue(String val) { this.type = OutputType.OUTPUT_STRING; @@ -99,10 +99,10 @@ /** * Create a ToolOutputValue based on a String. It tries to convert it to the type defined by the type. * - * @throws ToolOutputFormatException - * If unable to convert the value to the requested type. * @param val - * mandatory + * mandatory + * @throws ToolOutputFormatException + * If unable to convert the value to the requested type. */ public ToolOutputValue(String val, OutputType type) { this.type = type; @@ -131,14 +131,14 @@ } /** - * Create a Complex ToolOutputValue based on an Object. This will create a value of type OUTPUT_COMPLEX. The - * junk parameter is to ensure this method isn't "accidently" in place of one of the other constructors. ie to stop + * Create a Complex ToolOutputValue based on an Object. This will create a value of type OUTPUT_COMPLEX. The junk + * parameter is to ensure this method isn't "accidently" in place of one of the other constructors. ie to stop * accidental bugs! * * @param val - * mandatory + * mandatory * @param junk - * ignored + * ignored */ public ToolOutputValue(Object val, Boolean junk) { type = OutputType.OUTPUT_COMPLEX; @@ -154,8 +154,8 @@ /** * Get the raw value. Useful if you want to know about its type or you have some other code will look at the - * object's class directly. Normally you would use getString(), getLong(), etc as all the mucking around - * with types is done for you. + * object's class directly. Normally you would use getString(), getLong(), etc as all the mucking around with types + * is done for you. */ public Object getValue() { return value; @@ -165,7 +165,7 @@ * Returns a string representation of the value. Available for any type of output. * * @throws ToolOutputFormatException - * If unable to convert the value to a string. + * If unable to convert the value to a string. */ public String getString() throws ToolOutputFormatException { switch (type) { @@ -193,12 +193,11 @@ } /** - * Returns a Long representation of the value. This should always work for OUTPUT_LONG - * and we will try to convert other types but that isn't guaranteed. A boolean value will convert to 1 or 0. - * A double value may round. + * Returns a Long representation of the value. This should always work for OUTPUT_LONG and we will try to convert + * other types but that isn't guaranteed. A boolean value will convert to 1 or 0. A double value may round. * * @throws ToolOutputFormatException - * If unable to convert the value to a Long. + * If unable to convert the value to a Long. */ public Long getLong() throws ToolOutputFormatException { @@ -211,7 +210,7 @@ return new Long(((Double) value).longValue()); case OUTPUT_BOOLEAN: - return ((Boolean) value).booleanValue() ? new Long(1) : new Long(0); + return ((Boolean) value).booleanValue() ? 1L : 0L; case OUTPUT_STRING: return Long.parseLong((String) value); @@ -229,11 +228,11 @@ } /** - * Returns a Double representation of the value. This should always work for OUTPUT_DOUBLE - * and we will try to convert other types but that isn't guaranteed. A boolean value will convert to 1 or 0. + * Returns a Double representation of the value. This should always work for OUTPUT_DOUBLE and we will try to + * convert other types but that isn't guaranteed. A boolean value will convert to 1 or 0. * * @throws ToolOutputFormatException - * If unable to convert the value to a Double. + * If unable to convert the value to a Double. */ public Double getDouble() throws ToolOutputFormatException { @@ -264,12 +263,11 @@ } /** - * Returns a boolean representation of the value. This should always work for OUTPUT_BOOLEAN - * and we will try to convert other types but that isn't guaranteed. A numeric of 1 will be converted to true, - * otherwise false. + * Returns a boolean representation of the value. This should always work for OUTPUT_BOOLEAN and we will try to + * convert other types but that isn't guaranteed. A numeric of 1 will be converted to true, otherwise false. * * @throws ToolOutputFormatException - * If unable to convert the value to a boolean. + * If unable to convert the value to a boolean. */ public Boolean getBoolean() throws ToolOutputFormatException { @@ -305,4 +303,4 @@ public Object getComplex() throws ToolOutputFormatException { return value; } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java (.../ToolDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -31,10 +31,8 @@ import org.springframework.stereotype.Repository; /** - * * @author Jacky Fang 8/02/2005 * @author Ozgur Demirtas 24/06/2005 - * */ @Repository public class ToolDAO extends LAMSBaseDAO implements IToolDAO { @@ -55,7 +53,7 @@ @Override public Tool getToolBySignature(final String toolSignature) { - return (Tool) getSession().createQuery(LOAD_TOOL_BY_SIG).setString("toolSignature", toolSignature) + return (Tool) getSession().createQuery(LOAD_TOOL_BY_SIG).setParameter("toolSignature", toolSignature) .setCacheable(true).uniqueResult(); } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -74,7 +74,7 @@ Query query = getSession().createQuery(queryStr); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); if (!isAppadmin) { query.setParameter("userId", userId); } @@ -131,7 +131,7 @@ Query query = getSession().createQuery(queryStr); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); if (!isAppadmin) { query.setParameter("userId", userId); } @@ -165,7 +165,7 @@ query.setParameter("parentOrgId", parentOrgId); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); query.setFirstResult(page * size); query.setMaxResults(size); query.setCacheable(true); @@ -181,7 +181,7 @@ query.setParameter("stateId", stateId); // support for custom search from a toolbar searchString = searchString == null ? "" : searchString; - query.setString("searchString", searchString); + query.setParameter("searchString", searchString); return ((Number) query.uniqueResult()).intValue(); } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java (.../RoleDAO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -51,7 +51,7 @@ @Override public User getUserByOrganisationAndRole(Integer userId, Integer roleId, Organisation organisation) { return (User) getSession().createQuery(RoleDAO.LOAD_USER_BY_ORG_AND_ROLE).setParameter("userId", userId) - .setEntity("org", organisation).setParameter("roleId", roleId).uniqueResult(); + .setParameter("org", organisation).setParameter("roleId", roleId).uniqueResult(); } @Override @@ -70,6 +70,6 @@ query.setParameterList("roleIds", roleIds); query.setParameter("orgId", orgId.intValue()); Object value = query.uniqueResult(); - return new Integer(((Number) value).intValue()); + return Integer.valueOf(((Number) value).intValue()); } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java (.../OrganisationDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java (.../OrganisationDTO.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -68,7 +68,7 @@ public OrganisationDTO(Organisation organisation) { this.organisationID = organisation.getOrganisationId(); - this.parentID = (organisation.getParentOrganisation() == null) ? new Integer(-1) + this.parentID = (organisation.getParentOrganisation() == null) ? Integer.valueOf(-1) : organisation.getParentOrganisation().getOrganisationId(); this.name = organisation.getName(); this.description = organisation.getDescription(); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java (.../LdapService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java (.../LdapService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -460,7 +460,7 @@ // get page size int pageSize = 100; try { - pageSize = new Integer(Configuration.get(ConfigurationKeys.LDAP_SEARCH_RESULTS_PAGE_SIZE)).intValue(); + pageSize = Integer.valueOf(Configuration.get(ConfigurationKeys.LDAP_SEARCH_RESULTS_PAGE_SIZE)).intValue(); } catch (Exception e) { log.error("Couldn't read " + ConfigurationKeys.LDAP_SEARCH_RESULTS_PAGE_SIZE + ", using default page size of 100."); Index: lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java (.../TransactionAwareSessionContext.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java (.../TransactionAwareSessionContext.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -3,10 +3,12 @@ import java.util.Arrays; import java.util.List; +import jakarta.persistence.FlushModeType; import jakarta.transaction.Synchronization; import org.apache.commons.lang3.Validate; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -59,7 +61,7 @@ * Creates a new session context and sets the related session factory. * * @param theSessionFactory - * Context session factory. Cannot be null. + * Context session factory. Cannot be null. */ public TransactionAwareSessionContext(final SessionFactoryImplementor theSessionFactory) { Validate.notNull(theSessionFactory, "The session factory cannot be null."); @@ -89,8 +91,9 @@ Session session; session = sessionFactory.openSession(); - TransactionAwareSessionContext.logger.warn("No Session bound to current Thread. Opened new Session [" - + session + "]. Transaction: " + session.getTransaction()); + TransactionAwareSessionContext.logger.warn( + "No Session bound to current Thread. Opened new Session [" + session + "]. Transaction: " + + session.getTransaction()); if (registerSynchronization(session)) { // Normalizes Session flush mode, defaulting it to AUTO. Required for @@ -99,7 +102,7 @@ if (FlushMode.MANUAL.equals(flushMode) && !TransactionSynchronizationManager.isCurrentTransactionReadOnly()) { - session.setFlushMode(FlushMode.AUTO); + session.setFlushMode(FlushModeType.AUTO); } } ManagedSessionContext.bind(session); @@ -113,9 +116,9 @@ * finishes. * * @param session - * Session to register into transaction synchronization. Cannot be null. + * Session to register into transaction synchronization. Cannot be null. * @return Returns true if the session was register into any available synchronization strategy, - * false otherwise. + * false otherwise. */ private boolean registerSynchronization(final Session session) { // Tries Spring's transaction manager synchronization. @@ -148,7 +151,7 @@ * Creates a transaction synchronization object for the specified session. * * @param session - * Session to synchronize using the created object. Cannot be null. + * Session to synchronize using the created object. Cannot be null. * @return A valid transaction synchronization. Never returns null. */ private TransactionSynchronization createTransactionSynchronization(final Session session) { Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java (.../ToolContentHandler.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java (.../ToolContentHandler.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -224,7 +224,7 @@ throws RepositoryCheckedException, InvalidParameterException, RepositoryCheckedException { log.error( "uploadPackage(String dirPath, String startFile) to be removed - it sets the owner of files in the content repository to 1. Some tool needs to be updated."); - return uploadPackage(dirPath, startFile, new Integer(1)); + return uploadPackage(dirPath, startFile, 1); } /** Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/SimpleRepository.java (.../SimpleRepository.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -23,7 +23,8 @@ package org.lamsfoundation.lams.contentrepository.service; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.lamsfoundation.lams.contentrepository.*; import org.lamsfoundation.lams.contentrepository.dao.ICredentialDAO; import org.lamsfoundation.lams.contentrepository.dao.IWorkspaceDAO; @@ -37,6 +38,7 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import jakarta.servlet.http.HttpSession; + import java.io.*; import java.util.*; @@ -768,7 +770,7 @@ } // get the first version of the node and delete from there. - SimpleVersionedNode latestNodeVersion = nodeFactory.getNode(ticket.getWorkspaceId(), uuid, new Long(1)); + SimpleVersionedNode latestNodeVersion = nodeFactory.getNode(ticket.getWorkspaceId(), uuid, 1L); if (latestNodeVersion.hasParentNode()) { throw new InvalidParameterException("You cannot delete a node that is in a package (ie has a parent). " + "Please delete the parent. Node UUID " + uuid); @@ -787,7 +789,7 @@ } // get the first version of the node and delete from there. - SimpleVersionedNode latestNodeVersion = nodeFactory.getNode(ticket.getWorkspaceId(), portraitUuid, new Long(1)); + SimpleVersionedNode latestNodeVersion = nodeFactory.getNode(ticket.getWorkspaceId(), portraitUuid, 1L); if (latestNodeVersion.hasParentNode()) { throw new InvalidParameterException("You cannot delete a node that is in a package (ie has a parent). " + "Please delete the parent. Node UUID " + portraitUuid); Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -78,7 +78,7 @@ if (rowLimit < gridRows.size()) { totalPages = new Double( - Math.ceil(new Integer(gridRows.size()).doubleValue() / new Integer(rowLimit).doubleValue())) + Math.ceil(Integer.valueOf(gridRows.size()).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); int firstRow = (page - 1) * rowLimit; int lastRow = firstRow + rowLimit; Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java (.../GradebookController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java (.../GradebookController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -386,7 +386,7 @@ //calculate totalPages int totalPages = new Double( - Math.ceil(new Integer(totalUsers).doubleValue() / new Integer(rowLimit).doubleValue())).intValue(); + Math.ceil(Integer.valueOf(totalUsers).doubleValue() / Integer.valueOf(rowLimit).doubleValue())).intValue(); String ret = GradebookUtil.toGridXML(gradebookUserDTOs, page, totalPages, view); response.setContentType("text/xml; charset=utf-8"); @@ -492,7 +492,7 @@ String ret; if (view == GBGridView.MON_COURSE || view == GBGridView.LIST) { int totalPages = new Double( - Math.ceil(new Integer(lessons.size()).doubleValue() / new Integer(rowLimit).doubleValue())) + Math.ceil(Integer.valueOf(lessons.size()).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); ret = GradebookUtil.toGridXML(gradebookLessonDTOs, page, totalPages, view); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java (.../KumaliveService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java (.../KumaliveService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -184,7 +184,7 @@ int totalPages = 1; if (rowLimit < kumalives.size()) { totalPages = new Double( - Math.ceil(new Integer(kumalives.size()).doubleValue() / new Integer(rowLimit).doubleValue())) + Math.ceil(Integer.valueOf(kumalives.size()).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); int firstRow = (page - 1) * rowLimit; int lastRow = firstRow + rowLimit; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -540,7 +540,7 @@ } else { Long lessonId = toolSession.getLesson().getLessonId(); - LearnerProgress currentProgress = getProgress(new Integer(learnerId.intValue()), lessonId); + LearnerProgress currentProgress = getProgress(Integer.valueOf(learnerId.intValue()), lessonId); // TODO Cache the learner progress in the session, but mark it with the progress id. Then get the progress // out of the session // for ActivityAction.java.completeActivity(). Update LearningWebUtil to look under the progress id, so we Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -445,7 +445,7 @@ Lesson precedingLesson) { // copy the current learning design LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign, - new Integer(copyType), user, workspaceFolder, true, null, customCSV); + Integer.valueOf(copyType), user, workspaceFolder, true, null, customCSV); learningDesignDAO.insertOrUpdate(copiedLearningDesign); // Make all efforts to make sure it has a title @@ -540,7 +540,7 @@ ? "" : requestedLesson.getUser().getFullName())) .usingJobData(MonitoringConstants.KEY_LESSON_ID, new Long(lessonId)) - .usingJobData(MonitoringConstants.KEY_USER_ID, new Integer(userId)).build(); + .usingJobData(MonitoringConstants.KEY_USER_ID, Integer.valueOf(userId)).build(); // create customized triggers startLessonTrigger = TriggerBuilder.newTrigger().withIdentity(triggerName).startAt(tzStartLessonDate) @@ -617,7 +617,7 @@ ? "" : requestedLesson.getUser().getFullName())) .usingJobData(MonitoringConstants.KEY_LESSON_ID, new Long(lessonId)) - .usingJobData(MonitoringConstants.KEY_USER_ID, new Integer(userId)).build(); + .usingJobData(MonitoringConstants.KEY_USER_ID, Integer.valueOf(userId)).build(); finishLessonTrigger = TriggerBuilder.newTrigger().withIdentity(triggerName).startAt(endDate) .build(); @@ -779,7 +779,7 @@ MonitoringService.log.debug( "startLesson: Created chosen grouping " + grouping + " for branching activity " + activity); } - newMaxId = new Integer(currentMaxId.intValue() + 1); + newMaxId = Integer.valueOf(currentMaxId.intValue() + 1); activity.setInitialised(true); } return newMaxId; @@ -2338,7 +2338,7 @@ for (String strlearnerID : learnerIDs) { boolean added = false; try { - Integer learnerID = new Integer(Integer.parseInt(strlearnerID)); + Integer learnerID = Integer.valueOf(Integer.parseInt(strlearnerID)); User learner = baseDAO.find(User.class, learnerID); if (learner != null) { learners.add(learner); @@ -2491,7 +2491,7 @@ Grouping grouping = branchingActivity.getGrouping(); LearningDesign design = branchingActivity.getLearningDesign(); - Integer nextUIID = new Integer(design.getMaxID().intValue() + 1); + Integer nextUIID = Integer.valueOf(design.getMaxID().intValue() + 1); for (String groupIDString : groupIDs) { Long groupID = Long.parseLong(groupIDString); @@ -2514,7 +2514,7 @@ groupingDAO.update(group); } - design.setMaxID(new Integer(nextUIID.intValue() + 1)); + design.setMaxID(Integer.valueOf(nextUIID.intValue() + 1)); learningDesignDAO.update(design); } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -972,7 +972,7 @@ public String getLearnerActivityURL(HttpServletRequest request, HttpServletResponse response) throws IOException, LamsToolServiceException { - Integer learnerUserID = new Integer(WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID)); + Integer learnerUserID = Integer.valueOf(WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID)); Long activityID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID)); Long lessonID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID)); try { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -27,9 +27,9 @@ public static final String TOOL_SIGNATURE = "lachat11"; // Chat session status - public static final Integer SESSION_NOT_STARTED = new Integer(0); - public static final Integer SESSION_IN_PROGRESS = new Integer(1); - public static final Integer SESSION_COMPLETED = new Integer(2); + public static final Integer SESSION_NOT_STARTED = Integer.valueOf(0); + public static final Integer SESSION_IN_PROGRESS = Integer.valueOf(1); + public static final Integer SESSION_COMPLETED = Integer.valueOf(2); public static final String AUTHORING_DEFAULT_TAB = "1"; public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringChatConditionController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringChatConditionController.java (.../AuthoringChatConditionController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/AuthoringChatConditionController.java (.../AuthoringChatConditionController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -311,7 +311,7 @@ SortedSet conditionList = getChatConditionSet(sessionMap); for (ChatCondition condition : conditionList) { if (formConditionName.equals(condition.getName()) - && !formConditionSequenceId.equals(new Integer(condition.getOrderId() - 1).toString())) { + && !formConditionSequenceId.equals(Integer.valueOf(condition.getOrderId() - 1).toString())) { errorMap.add("GLOBAL", messageService.getMessage("error.condition.duplicated.name")); break; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/Patch20161122.java =================================================================== diff -u -r129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/Patch20161122.java (.../Patch20161122.java) (revision 129d0eb39f81fcdb4ef6e3b5ec15c1c94d9324b3) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/Patch20161122.java (.../Patch20161122.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -38,7 +38,7 @@ import com.tacitknowledge.util.migration.jdbc.DataSourceMigrationContext; public class Patch20161122 extends MigrationTaskSupport { - private static final Integer LEVEL = new Integer(20161122); + private static final Integer LEVEL = Integer.valueOf(20161122); private static final String NAME = "FixDateFormatting"; Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -437,7 +437,7 @@ form.setQuestionRequired(question.isRequired()); form.setSummary(question.getSummary()); if (questionIndex >= 0) { - form.setQuestionIndex(new Integer(questionIndex).toString()); + form.setQuestionIndex(Integer.valueOf(questionIndex).toString()); } Float min = question.getMin(); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -180,8 +180,8 @@ sessionMap.put(ForumConstants.ATTR_MAXIMUM_RATE, forum.getMaximumRate()); sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS, forum.isAllowNewTopic()); sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR, allowRichEditor); - sessionMap.put(ForumConstants.ATTR_MIN_CHARACTERS, new Integer(minCharacters)); - sessionMap.put(ForumConstants.ATTR_MAX_CHARACTERS, new Integer(maxCharacters)); + sessionMap.put(ForumConstants.ATTR_MIN_CHARACTERS, Integer.valueOf(minCharacters)); + sessionMap.put(ForumConstants.ATTR_MAX_CHARACTERS, Integer.valueOf(maxCharacters)); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); sessionMap.put(ForumConstants.ATTR_FORUM_TITLE, forum.getTitle()); sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION, forum.getInstructions()); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -486,7 +486,7 @@ sessionTopicsMap.put(sessionDto, topicList); sessionAvaMarkMap.put(session.getSessionId(), averMark); - sessionTotalMsgMap.put(session.getSessionId(), new Integer(totalMsg)); + sessionTotalMsgMap.put(session.getSessionId(), Integer.valueOf(totalMsg)); } request.setAttribute("topicList", sessionTopicsMap); request.setAttribute("markAverage", sessionAvaMarkMap); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java =================================================================== diff -u -r2d25efe07e8e17bb68d4b9bc25095791a57c1f57 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision 2d25efe07e8e17bb68d4b9bc25095791a57c1f57) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -83,7 +83,7 @@ Map summaryList = new HashMap(result.size()); for (Object[] list : result) { if (list[1] != null) { - summaryList.put((Long) list[0], new Integer(((Number) list[1]).intValue())); + summaryList.put((Long) list[0], Integer.valueOf(((Number) list[1]).intValue())); } } @@ -104,4 +104,4 @@ Object[] values = query.list().get(0); return values; } -} +} \ No newline at end of file Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -197,7 +197,7 @@ int miniView = res.getMiniViewCommonCartridgeNumber(); // construct dto fields; res.setMiniViewNumberStr( - messageService.getMessage("label.learning.minimum.review", new Object[] { new Integer(miniView) })); + messageService.getMessage("label.learning.minimum.review", new Object[] { Integer.valueOf(miniView) })); return res; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/util/LamsBasicLTIUtil.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/util/LamsBasicLTIUtil.java (.../LamsBasicLTIUtil.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/util/LamsBasicLTIUtil.java (.../LamsBasicLTIUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -66,7 +66,7 @@ LamsBasicLTIUtil.setProperty(info, "secret", basicLTIItem.getSecret()); LamsBasicLTIUtil.setProperty(info, "key", basicLTIItem.getKey()); LamsBasicLTIUtil.setProperty(info, "debug", "false"); - LamsBasicLTIUtil.setProperty(info, "frameheight", new Integer(basicLTIItem.getFrameHeight()).toString()); + LamsBasicLTIUtil.setProperty(info, "frameheight", Integer.valueOf(basicLTIItem.getFrameHeight()).toString()); LamsBasicLTIUtil.setProperty(info, "newwindow", new Boolean(basicLTIItem.isOpenUrlNewWindow()).toString()); LamsBasicLTIUtil.setProperty(info, "title", basicLTIItem.getTitle()); LamsBasicLTIUtil.setProperty(info, BasicLTIUtil.BASICLTI_SUBMIT, basicLTIItem.getButtonText()); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -601,7 +601,7 @@ form.setDescription(item.getDescription()); form.setTitle(item.getTitle()); if (itemIdx >= 0) { - form.setItemIndex(new Integer(itemIdx).toString()); + form.setItemIndex(Integer.valueOf(itemIdx).toString()); } if (StringUtils.isBlank(item.getLaunchUrl()) && StringUtils.isNotBlank(item.getSecureLaunchUrl())) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java (.../McUsrAttempt.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java (.../McUsrAttempt.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -179,7 +179,7 @@ // if (isAttemptCorrect() && (!allowRetries || (allowRetries && isPassed()))) { // return getMark(); // } else { -// return new Integer(0); +// return Integer.valueOf(0); // } return getMark(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -26,7 +26,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFRow; @@ -99,6 +100,7 @@ import org.springframework.dao.DataAccessException; import jakarta.servlet.http.HttpSession; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -621,7 +623,7 @@ Map mapSessionUsersData = new TreeMap( new McStringComparator()); - Long mapIndex = new Long(1); + Long mapIndex = 1L; while (usersIterator.hasNext()) { McQueUsr user = usersIterator.next(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java (.../AuthoringUtil.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java (.../AuthoringUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -61,7 +61,7 @@ ++counter; McOptionDTO optionDto = (McOptionDTO) iter.next(); - if (new Integer(intOriginalCandidateIndex).toString().equals(new Integer(counter).toString())) { + if (Integer.valueOf(intOriginalCandidateIndex).toString().equals(Integer.valueOf(counter).toString())) { return optionDto; } } @@ -185,7 +185,7 @@ for (McQuestionDTO questionDto : questionDTOs) { String mark = questionDto.getMark(); if (StringUtils.isNotBlank(mark)) { - int intMark = new Integer(mark).intValue(); + int intMark = Integer.valueOf(mark).intValue(); totalMark += intMark; } } @@ -196,7 +196,7 @@ passmarkStr = "0"; } //passmark can't be more than total mark - Integer passmark = new Integer(passmarkStr); + Integer passmark = Integer.valueOf(passmarkStr); if (totalMark < passmark) { passmark = totalMark; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java (.../LearningUtil.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java (.../LearningUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -65,7 +65,7 @@ mcGeneralLearnerFlowDTO.setPassMark(mcContent.getPassMark()); mcGeneralLearnerFlowDTO.setReportTitleLearner("Report"); - mcGeneralLearnerFlowDTO.setTotalQuestionCount(new Integer(mcContent.getMcQueContents().size())); + mcGeneralLearnerFlowDTO.setTotalQuestionCount(Integer.valueOf(mcContent.getMcQueContents().size())); return mcGeneralLearnerFlowDTO; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -241,7 +241,7 @@ int displayOrder = 1; for (McQueContent question : sortedQuestions) { McQueContent existingQuestion = mcService.getQuestionByUid(question.getUid()); - existingQuestion.setDisplayOrder(new Integer(displayOrder)); + existingQuestion.setDisplayOrder(Integer.valueOf(displayOrder)); mcService.saveOrUpdateMcQueContent(existingQuestion); displayOrder++; } @@ -689,7 +689,7 @@ */ private static List swapOptions(List optionDtos, String optionIndex, String direction) { - int intOptionIndex = new Integer(optionIndex).intValue(); + int intOptionIndex = Integer.valueOf(optionIndex).intValue(); int intOriginalOptionIndex = intOptionIndex; int replacedOptionIndex = 0; @@ -711,14 +711,14 @@ for (McOptionDTO option : optionDtos) { McOptionDTO tempOption = new McOptionDTO(); - if ((!new Integer(queIndex).toString().equals(new Integer(intOriginalOptionIndex).toString())) - && !new Integer(queIndex).toString().equals(new Integer(replacedOptionIndex).toString())) { + if ((!Integer.valueOf(queIndex).toString().equals(Integer.valueOf(intOriginalOptionIndex).toString())) + && !Integer.valueOf(queIndex).toString().equals(Integer.valueOf(replacedOptionIndex).toString())) { // normal copy tempOption = option; - } else if (new Integer(queIndex).toString().equals(new Integer(intOriginalOptionIndex).toString())) { + } else if (Integer.valueOf(queIndex).toString().equals(Integer.valueOf(intOriginalOptionIndex).toString())) { // move type 1 tempOption = replacedOption; - } else if (new Integer(queIndex).toString().equals(new Integer(replacedOptionIndex).toString())) { + } else if (Integer.valueOf(queIndex).toString().equals(Integer.valueOf(replacedOptionIndex).toString())) { // move type 2 tempOption = mainOption; } @@ -750,7 +750,7 @@ for (McOptionDTO mcOptionDTO : optionDtos) { caIndex++; - if (caIndex != new Integer(candidateIndexToRemove).intValue()) { + if (caIndex != Integer.valueOf(candidateIndexToRemove).intValue()) { listFinalCandidatesDTO.add(mcOptionDTO); } } @@ -792,7 +792,7 @@ /* check this logic again */ int intCorrect = 0; if (correct != null) { - intCorrect = new Integer(correct).intValue(); + intCorrect = Integer.valueOf(correct).intValue(); } List optionDtos = new LinkedList<>(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -37,7 +37,8 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.DataMissingException; @@ -185,7 +186,7 @@ McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent); mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString()); - mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(1)); + mcGeneralLearnerFlowDTO.setQuestionIndex(Integer.valueOf(1)); Boolean displayAnswers = mcContent.isDisplayAnswers(); mcGeneralLearnerFlowDTO.setDisplayAnswers(displayAnswers.toString()); @@ -232,7 +233,7 @@ if (groupLeader == null && !mode.equals(ToolAccessMode.TEACHER.toString())) { Set groupUsers = mcSession.getMcQueUsers();// mcService.getUsersBySession(new - // Long(toolSessionID).longValue()); + // Long(toolSessionID).longValue()); request.setAttribute(McAppConstants.ATTR_GROUP_USERS, groupUsers); return "learning/WaitForLeader"; @@ -517,17 +518,17 @@ List questions = mcService.getQuestionsByContentUid(mcContent.getUid()); Iterator listIterator = questions.iterator(); - Long mapIndex = new Long(1); + Long mapIndex = 1L; while (listIterator.hasNext()) { McQueContent mcQueContent = (McQueContent) listIterator.next(); mapQuestionsUidContent.put(mapIndex.toString(), mcQueContent.getUid()); - mapIndex = new Long(mapIndex.longValue() + 1); + mapIndex = mapIndex.longValue() + 1; } //builds a map to hold all the candidate answers for all the questions by accessing the db Map mapStartupGeneralOptionsContent = new TreeMap(new McComparator()); Iterator itMap = mapQuestionsUidContent.entrySet().iterator(); - mapIndex = new Long(1); + mapIndex = 1L; while (itMap.hasNext()) { Map.Entry pairs = (Map.Entry) itMap.next(); String currentQuestionUid = pairs.getValue().toString(); @@ -539,9 +540,8 @@ int mapIndex2 = 0; while (iter.hasNext()) { QbOption option = iter.next(); - String stringIndex = mcContent.isPrefixAnswersWithLetters() - ? LearningUtil.formatPrefixLetter(mapIndex2++) - : Integer.toString(++mapIndex2); + String stringIndex = mcContent.isPrefixAnswersWithLetters() ? LearningUtil.formatPrefixLetter( + mapIndex2++) : Integer.toString(++mapIndex2); mapOptsContent.put(stringIndex, option.getName()); } @@ -572,7 +572,7 @@ McUsrAttempt userAttempt = mcService.getUserAttemptByQuestion(user.getUid(), question.getUid()); if (userAttempt != null) { - attemptMap.put(new Integer(i).toString(), userAttempt); + attemptMap.put(Integer.valueOf(i).toString(), userAttempt); } } mcGeneralLearnerFlowDTO.setAttemptMap(attemptMap); @@ -591,10 +591,10 @@ markStatistics = mcService.getMarkStatistics(mcSession); } if (markStatistics != null) { - mcGeneralLearnerFlowDTO - .setLowestMark(markStatistics[0] != null ? ((Float) markStatistics[0]).intValue() : 0); - mcGeneralLearnerFlowDTO - .setAverageMark(markStatistics[1] != null ? ((Float) markStatistics[1]).intValue() : 0); + mcGeneralLearnerFlowDTO.setLowestMark( + markStatistics[0] != null ? ((Float) markStatistics[0]).intValue() : 0); + mcGeneralLearnerFlowDTO.setAverageMark( + markStatistics[1] != null ? ((Float) markStatistics[1]).intValue() : 0); mcGeneralLearnerFlowDTO.setTopMark(markStatistics[2] != null ? ((Float) markStatistics[2]).intValue() : 0); } else { mcGeneralLearnerFlowDTO.setLowestMark(0); @@ -631,7 +631,7 @@ request.setAttribute(McAppConstants.LEARNER_ANSWER_DTOS, learnerAnswerDtos); McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent); - mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(1)); + mcGeneralLearnerFlowDTO.setQuestionIndex(Integer.valueOf(1)); mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); String passMarkApplicable = new Boolean(mcContent.isPassMarkApplicable()).toString(); @@ -716,8 +716,8 @@ List answers = new LinkedList<>(); if (isQuestionsSequenced) { - List previousAnswers = (List) sessionMap - .get(McAppConstants.QUESTION_AND_CANDIDATE_ANSWERS_KEY); + List previousAnswers = (List) sessionMap.get( + McAppConstants.QUESTION_AND_CANDIDATE_ANSWERS_KEY); answers.addAll(previousAnswers); /* checkedCa refers to candidate answers */ @@ -754,8 +754,8 @@ Map confidenceLevels = new HashMap<>(); if (isQuestionsSequenced) { - Map previousConfidenceLevels = (Map) sessionMap - .get(McAppConstants.CONFIDENCE_LEVELS_KEY); + Map previousConfidenceLevels = (Map) sessionMap.get( + McAppConstants.CONFIDENCE_LEVELS_KEY); if (previousConfidenceLevels != null) { confidenceLevels.putAll(previousConfidenceLevels); } @@ -792,8 +792,9 @@ McSession mcSession = mcService.getMcSessionById(new Long(toolSessionId)); McQueUsr qaUser = mcService.getMcUserBySession(new Long(userId.intValue()), mcSession.getUid()); if (qaUser == null) { - logger.error("Unable to find specified user for Q&A activity. Screens are likely to fail. SessionId=" - + new Long(toolSessionId) + " UserId=" + userId); + logger.error( + "Unable to find specified user for Q&A activity. Screens are likely to fail. SessionId=" + new Long( + toolSessionId) + " UserId=" + userId); } return qaUser; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -181,8 +181,8 @@ countAllUsers += mcSession.getMcQueUsers().size(); } } - mcGeneralMonitoringDTO.setCountAllUsers(new Integer(countAllUsers)); - mcGeneralMonitoringDTO.setCountSessionComplete(new Integer(countSessionComplete)); + mcGeneralMonitoringDTO.setCountAllUsers(Integer.valueOf(countAllUsers)); + mcGeneralMonitoringDTO.setCountSessionComplete(Integer.valueOf(countSessionComplete)); return "monitoring/MonitoringMaincontent"; } @@ -399,7 +399,7 @@ } int totalPages = new Double( - Math.ceil(new Integer(countVisitLogs).doubleValue() / new Integer(rowLimit).doubleValue())).intValue(); + Math.ceil(Integer.valueOf(countVisitLogs).doubleValue() / Integer.valueOf(rowLimit).doubleValue())).intValue(); ArrayNode rows = JsonNodeFactory.instance.arrayNode(); int i = 1; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java (.../LearningUtil.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java (.../LearningUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -76,7 +76,7 @@ generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString()); generalLearnerFlowDTO .setUseSelectLeaderToolOuput(new Boolean(qaContent.isUseSelectLeaderToolOuput()).toString()); - generalLearnerFlowDTO.setTotalQuestionCount(new Integer(qaContent.getQaQueContents().size())); + generalLearnerFlowDTO.setTotalQuestionCount(Integer.valueOf(qaContent.getQaQueContents().size())); //check if allow rate answers is ON and also that there is at least one non-comments rating criteria available generalLearnerFlowDTO.setAllowRateAnswers(service.isRatingsEnabled(qaContent)); @@ -134,7 +134,7 @@ } } String currentAnswer = mapAnswers.get("1"); - generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1)); + generalLearnerFlowDTO.setCurrentQuestionIndex(Integer.valueOf(1)); generalLearnerFlowDTO.setCurrentAnswer(currentAnswer); sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapAnswers); generalLearnerFlowDTO.setMapAnswers(mapAnswers); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringConditionController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -343,7 +343,7 @@ nonHTMLQuestion = nonHTMLQuestion.substring(0, QaAppConstants.QUESTION_CUTOFF_INDEX) + "..."; } } - possibleItems.put(nonHTMLQuestion, new Integer(question.getDisplayOrder()).toString()); + possibleItems.put(nonHTMLQuestion, Integer.valueOf(question.getDisplayOrder()).toString()); } QaConditionForm.setPossibleItems(possibleItems); } @@ -386,7 +386,7 @@ condition.temporaryQaQuestions.clear(); for (Integer selectedItem : selectedItems) { for (QaQueContent question : questions) { - if (selectedItem.equals(new Integer(question.getDisplayOrder()))) { + if (selectedItem.equals(Integer.valueOf(question.getDisplayOrder()))) { condition.temporaryQaQuestions.add(question); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -376,7 +376,7 @@ GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaService, qaContent); String totalQuestionCount = generalLearnerFlowDTO.getTotalQuestionCount().toString(); - int intTotalQuestionCount = new Integer(totalQuestionCount).intValue(); + int intTotalQuestionCount = Integer.valueOf(totalQuestionCount).intValue(); String questionListingMode = generalLearnerFlowDTO.getQuestionListingMode(); @@ -400,7 +400,7 @@ String answerParamName = "answer" + questionIndex + (isTestHarness ? "__textarea" : ""); String answer = request.getParameter(answerParamName); - Integer questionIndexInteger = new Integer(questionIndex); + Integer questionIndexInteger = Integer.valueOf(questionIndex); mapAnswers.put(questionIndexInteger.toString(), answer); mapAnswersPresentable.put(questionIndexInteger.toString(), answer); @@ -505,11 +505,11 @@ String currentQuestionIndex = qaLearningForm.getCurrentQuestionIndex(); String newAnswer = qaLearningForm.getAnswer(); QaQueContent currentQuestion = qaService - .getQuestionByContentAndDisplayOrder(new Integer(currentQuestionIndex), qaContent.getUid()); + .getQuestionByContentAndDisplayOrder(Integer.valueOf(currentQuestionIndex), qaContent.getUid()); boolean isRequiredQuestionMissed = currentQuestion.isAnswerRequired() && isEmpty(newAnswer); if (!isRequiredQuestionMissed) { - qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Integer(currentQuestionIndex), + qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, Integer.valueOf(currentQuestionIndex), true); } } @@ -529,7 +529,7 @@ GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaService, qaContent); - qaLearningForm.setCurrentQuestionIndex(new Integer(1).toString()); + qaLearningForm.setCurrentQuestionIndex(Integer.valueOf(1).toString()); String sessionMapID = qaLearningForm.getSessionMapID(); @@ -543,9 +543,9 @@ // create mapQuestions Map mapQuestions = generalLearnerFlowDTO.getMapQuestionContentLearner(); generalLearnerFlowDTO.setMapQuestions(mapQuestions); - generalLearnerFlowDTO.setTotalQuestionCount(new Integer(mapQuestions.size())); - generalLearnerFlowDTO.setRemainingQuestionCount(new Integer(mapQuestions.size()).toString()); - qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString()); + generalLearnerFlowDTO.setTotalQuestionCount(Integer.valueOf(mapQuestions.size())); + generalLearnerFlowDTO.setRemainingQuestionCount(Integer.valueOf(mapQuestions.size()).toString()); + qaLearningForm.setTotalQuestionCount(Integer.valueOf(mapQuestions.size()).toString()); //in order to track whether redo button is pressed store this info QaQueUsr qaQueUsr = getCurrentUser(toolSessionID); @@ -736,7 +736,7 @@ String newAnswer = qaLearningForm.getAnswer(); Map mapSequentialAnswers = (Map) sessionMap .get(QaAppConstants.MAP_SEQUENTIAL_ANSWERS_KEY); - if (mapSequentialAnswers.size() >= new Integer(currentQuestionIndex).intValue()) { + if (mapSequentialAnswers.size() >= Integer.valueOf(currentQuestionIndex).intValue()) { mapSequentialAnswers.remove(new Long(currentQuestionIndex).toString()); } mapSequentialAnswers.put(new Long(currentQuestionIndex).toString(), newAnswer); @@ -747,32 +747,32 @@ // validation only if trying to go to the next question MultiValueMap errorMap = new LinkedMultiValueMap<>(); if (getNextQuestion) { - errorMap = validateQuestionAnswer(newAnswer, new Integer(currentQuestionIndex), generalLearnerFlowDTO); + errorMap = validateQuestionAnswer(newAnswer, Integer.valueOf(currentQuestionIndex), generalLearnerFlowDTO); } // store if (errorMap.isEmpty()) { qaService.updateResponseWithNewAnswer(newAnswer, qaLearningForm.getToolSessionID(), - new Integer(currentQuestionIndex), false); + Integer.valueOf(currentQuestionIndex), false); } else { request.setAttribute("errorMap", errorMap); nextQuestionOffset = 0; } - int intCurrentQuestionIndex = new Integer(currentQuestionIndex).intValue() + nextQuestionOffset; + int intCurrentQuestionIndex = Integer.valueOf(currentQuestionIndex).intValue() + nextQuestionOffset; String currentAnswer = ""; if (mapAnswers.size() >= intCurrentQuestionIndex) { currentAnswer = mapAnswers.get(new Long(intCurrentQuestionIndex).toString()); } generalLearnerFlowDTO.setCurrentAnswer(currentAnswer); // currentQuestionIndex will be: - generalLearnerFlowDTO.setCurrentQuestionIndex(new Integer(intCurrentQuestionIndex)); + generalLearnerFlowDTO.setCurrentQuestionIndex(Integer.valueOf(intCurrentQuestionIndex)); String totalQuestionCount = qaLearningForm.getTotalQuestionCount(); int remainingQuestionCount = new Long(totalQuestionCount).intValue() - - new Integer(currentQuestionIndex).intValue(); + - Integer.valueOf(currentQuestionIndex).intValue(); String userFeedback = ""; if (remainingQuestionCount != 0) { userFeedback = "Remaining question count: " + remainingQuestionCount; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -118,7 +118,7 @@ } request.setAttribute(LIST_QUESTIONS, questionDTOs); // sessionMap.put(LIST_QUESTIONS, questionDTOs); -// request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size())); +// request.setAttribute(TOTAL_QUESTION_COUNT, Integer.valueOf(questionDTOs.size())); //session dto list List groupDTOs = new LinkedList<>(); @@ -177,8 +177,8 @@ } } } - qaStatsDTO.setCountAllUsers(new Integer(countAllUsers).toString()); - qaStatsDTO.setCountSessionComplete(new Integer(countSessionComplete).toString()); + qaStatsDTO.setCountAllUsers(Integer.valueOf(countAllUsers).toString()); + qaStatsDTO.setCountSessionComplete(Integer.valueOf(countSessionComplete).toString()); request.setAttribute(QA_STATS_DTO, qaStatsDTO); // set SubmissionDeadline, if any Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -232,7 +232,7 @@ int miniView = res.getMiniViewResourceNumber(); // construct dto fields; res.setMiniViewNumberStr( - messageService.getMessage("label.learning.minimum.review", new Object[] { new Integer(miniView) })); + messageService.getMessage("label.learning.minimum.review", new Object[] { Integer.valueOf(miniView) })); return res; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -120,7 +120,7 @@ int countVisitLogs = resourceService.getCountVisitLogsBySessionAndItem(sessionId, itemUid, searchString); int totalPages = new Double( - Math.ceil(new Integer(countVisitLogs).doubleValue() / new Integer(rowLimit).doubleValue())).intValue(); + Math.ceil(Integer.valueOf(countVisitLogs).doubleValue() / Integer.valueOf(rowLimit).doubleValue())).intValue(); ArrayNode rows = JsonNodeFactory.instance.arrayNode(); DateFormat timeTakenFormatter = new SimpleDateFormat("H:mm:ss"); Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/MindmapConstants.java =================================================================== diff -u -r0ac951a5cbd9d468de8081247c169a6f92123126 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/MindmapConstants.java (.../MindmapConstants.java) (revision 0ac951a5cbd9d468de8081247c169a6f92123126) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/MindmapConstants.java (.../MindmapConstants.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -28,9 +28,9 @@ public static final String TOOL_SIGNATURE = "lamind10"; // Mindmap session status - public static final Integer SESSION_NOT_STARTED = new Integer(0); - public static final Integer SESSION_IN_PROGRESS = new Integer(1); - public static final Integer SESSION_COMPLETED = new Integer(2); + public static final Integer SESSION_NOT_STARTED = Integer.valueOf(0); + public static final Integer SESSION_IN_PROGRESS = Integer.valueOf(1); + public static final Integer SESSION_COMPLETED = Integer.valueOf(2); public static final String AUTHORING_DEFAULT_TAB = "1"; public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; @@ -62,4 +62,4 @@ public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; -} +} \ No newline at end of file Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -91,7 +91,7 @@ while (i.hasNext()) { NoticeboardSession session = (NoticeboardSession) i.next(); int numUsersInSession = nbService.getNumberOfUsersInSession(session); - numUsersMap.put(session.getNbSessionName(), new Integer(numUsersInSession)); + numUsersMap.put(session.getNbSessionName(), Integer.valueOf(numUsersInSession)); sessionIdMap.put(session.getNbSessionName(), session.getNbSessionId()); } monitoringDTO.setGroupStatsMap(numUsersMap); Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java (.../NotebookConstants.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java (.../NotebookConstants.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -28,9 +28,9 @@ public static final String TOOL_SIGNATURE = "lantbk11"; // Notebook session status - public static final Integer SESSION_NOT_STARTED = new Integer(0); - public static final Integer SESSION_IN_PROGRESS = new Integer(1); - public static final Integer SESSION_COMPLETED = new Integer(2); + public static final Integer SESSION_NOT_STARTED = Integer.valueOf(0); + public static final Integer SESSION_IN_PROGRESS = Integer.valueOf(1); + public static final Integer SESSION_COMPLETED = Integer.valueOf(2); public static final String AUTHORING_DEFAULT_TAB = "1"; public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java (.../AuthoringNotebookConditionController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java (.../AuthoringNotebookConditionController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -374,7 +374,7 @@ SortedSet conditionList = getNotebookConditionSet(sessionMap); for (NotebookCondition condition : conditionList) { if (formConditionName.equals(condition.getName()) - && !formConditionSequenceId.equals(new Integer(condition.getOrderId() - 1).toString())) { + && !formConditionSequenceId.equals(Integer.valueOf(condition.getOrderId() - 1).toString())) { errorMap.add("GLOBAL", messageService.getMessage(NotebookConstants.ERROR_MSG_NAME_DUPLICATED)); break; } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/util/PixlrConstants.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/util/PixlrConstants.java (.../PixlrConstants.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/util/PixlrConstants.java (.../PixlrConstants.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -34,9 +34,9 @@ public static final String TOOL_SIGNATURE = "lapixl10"; // Pixlr session status - public static final Integer SESSION_NOT_STARTED = new Integer(0); - public static final Integer SESSION_IN_PROGRESS = new Integer(1); - public static final Integer SESSION_COMPLETED = new Integer(2); + public static final Integer SESSION_NOT_STARTED = Integer.valueOf(0); + public static final Integer SESSION_IN_PROGRESS = Integer.valueOf(1); + public static final Integer SESSION_COMPLETED = Integer.valueOf(2); public static final String AUTHORING_DEFAULT_TAB = "1"; public static final String ATTACHMENT_LIST = "attachmentList"; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.java (.../ScribeHeading.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.java (.../ScribeHeading.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -120,7 +120,7 @@ public int compareTo(ScribeHeading o) { int returnValue; - returnValue = new Integer(this.displayOrder).compareTo(new Integer(o.displayOrder)); + returnValue = Integer.valueOf(this.displayOrder).compareTo(Integer.valueOf(o.displayOrder)); if (!this.equals(o) && returnValue == 0) { // something is wrong. return -1 to maintain natural ordering. Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeConstants.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeConstants.java (.../ScribeConstants.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeConstants.java (.../ScribeConstants.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -28,9 +28,9 @@ public static final String TOOL_SIGNATURE = "lascrb11"; // Scribe session status - public static final Integer SESSION_NOT_STARTED = new Integer(0); - public static final Integer SESSION_IN_PROGRESS = new Integer(1); - public static final Integer SESSION_COMPLETED = new Integer(2); + public static final Integer SESSION_NOT_STARTED = Integer.valueOf(0); + public static final Integer SESSION_IN_PROGRESS = Integer.valueOf(1); + public static final Integer SESSION_COMPLETED = Integer.valueOf(2); public static final String AUTHORING_DEFAULT_TAB = "1"; public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; @@ -45,4 +45,4 @@ // Parameter names public static final String PARAM_PARENT_PAGE = "parentPage"; -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -351,7 +351,7 @@ Map possibleItems = new HashMap<>(questions.size()); for (SurveyQuestion question : questions) { if (question.getType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY) { - possibleItems.put(question.getShortTitle(), new Integer(question.getSequenceId()).toString()); + possibleItems.put(question.getShortTitle(), Integer.valueOf(question.getSequenceId()).toString()); } } conditionForm.setPossibleItems(possibleItems); @@ -395,7 +395,7 @@ for (Integer selectedItem : selectedItems) { for (SurveyQuestion question : questions) { - if (selectedItem.equals(new Integer(question.getSequenceId()))) { + if (selectedItem.equals(Integer.valueOf(question.getSequenceId()))) { conditionQuestions.add(question); } } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -703,7 +703,7 @@ item = item.getUid() == null ? item : surveyService.getQuestion(item.getUid()); if (itemIdx >= 0) { - form.setItemIndex(new Integer(itemIdx).toString()); + form.setItemIndex(Integer.valueOf(itemIdx).toString()); } // set questions Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java (.../SurveyConditionForm.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java (.../SurveyConditionForm.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -65,7 +65,7 @@ Integer[] selectedItems = new Integer[condition.getQuestions().size()]; int questionIndex = 0; for (SurveyQuestion question : condition.getQuestions()) { - selectedItems[questionIndex] = new Integer(question.getSequenceId()); + selectedItems[questionIndex] = Integer.valueOf(question.getSequenceId()); questionIndex++; } setSelectedItems(selectedItems); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -592,7 +592,7 @@ taskListItemForm.setDescription(item.getDescription()); taskListItemForm.setTitle(item.getTitle()); if (itemIdx >= 0) { - taskListItemForm.setItemIndex(new Integer(itemIdx).toString()); + taskListItemForm.setItemIndex(Integer.valueOf(itemIdx).toString()); } taskListItemForm.setRequired(item.isRequired()); taskListItemForm.setCommentsAllowed(item.isCommentsAllowed()); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringTaskListConditionController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringTaskListConditionController.java (.../AuthoringTaskListConditionController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringTaskListConditionController.java (.../AuthoringTaskListConditionController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -304,15 +304,15 @@ private void populateConditionToForm(int sequenceId, TaskListCondition condition, TaskListConditionForm taskListConditionForm, HttpServletRequest request) { if (sequenceId >= 0) { - taskListConditionForm.setSequenceId(new Integer(sequenceId).toString()); + taskListConditionForm.setSequenceId(Integer.valueOf(sequenceId).toString()); } taskListConditionForm.setName(condition.getName()); Set itemList = condition.getTaskListItems(); String[] selectedItems = new String[itemList.size()]; int i = 0; for (TaskListItem item : itemList) { - selectedItems[i++] = (new Integer(item.getSequenceId())).toString(); + selectedItems[i++] = (Integer.valueOf(item.getSequenceId())).toString(); } taskListConditionForm.setSelectedItems(selectedItems); } @@ -380,7 +380,7 @@ for (String selectedItem : selectedItems) { for (TaskListItem item : itemList) { - if (selectedItem.equals((new Integer(item.getSequenceId())).toString())) { + if (selectedItem.equals((Integer.valueOf(item.getSequenceId())).toString())) { conditionItemList.add(item); } } @@ -411,7 +411,7 @@ SortedSet conditionList = getTaskListConditionList(sessionMap); for (TaskListCondition condition : conditionList) { if (formConditionName.equals(condition.getName()) - && !formConditionSequenceId.equals((new Integer(condition.getSequenceId() - 1)).toString())) { + && !formConditionSequenceId.equals((Integer.valueOf(condition.getSequenceId() - 1)).toString())) { errorMap.add("GLOBAL", messageService.getMessage("error.condition.duplicated.name")); ; break; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -196,7 +196,7 @@ int countSessionUsers = taskListService.getCountPagedUsersBySession(sessionId, searchString); int totalPages = new Double( - Math.ceil(new Integer(countSessionUsers).doubleValue() / new Integer(rowLimit).doubleValue())) + Math.ceil(Integer.valueOf(countSessionUsers).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); ArrayNode rows = JsonNodeFactory.instance.arrayNode(); @@ -269,7 +269,7 @@ int countSessionUsers = taskListService.getCountPagedUsersBySession(sessionId, searchString); int totalPages = new Double( - Math.ceil(new Integer(countSessionUsers).doubleValue() / new Integer(rowLimit).doubleValue())) + Math.ceil(Integer.valueOf(countSessionUsers).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); //date formatters Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java (.../VoteOutputFactory.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java (.../VoteOutputFactory.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -82,7 +82,7 @@ int conditionOrderId = 1; if (content.isAllowText()) { - conditions.add(new BranchCondition(null, null, new Integer(conditionOrderId++), + conditions.add(new BranchCondition(null, null, Integer.valueOf(conditionOrderId++), buildConditionName(VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION, VoteOutputFactory.FREE_TEXT_NOM_SELECTION_STR), getI18NText("label.open.vote", false), OutputType.OUTPUT_BOOLEAN.toString(), null, null, @@ -94,8 +94,8 @@ VoteQueContent nomination = (VoteQueContent) iter.next(); int displayOrder = nomination.getDisplayOrder(); String name = buildConditionName(VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION, - new Integer(displayOrder).toString()); - conditions.add(new BranchCondition(null, null, new Integer(conditionOrderId++), name, + Integer.valueOf(displayOrder).toString()); + conditions.add(new BranchCondition(null, null, Integer.valueOf(conditionOrderId++), name, VoteUtils.stripHTML(nomination.getQuestion()), OutputType.OUTPUT_BOOLEAN.toString(), null, null, trueString)); } @@ -155,7 +155,7 @@ int displayOrder = 0; try { - displayOrder = new Integer(dcNames[1]).intValue(); + displayOrder = Integer.valueOf(dcNames[1]).intValue(); } catch (NumberFormatException e) { logger.error("Unable to convert the display order to an int for tool output " + VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION + " " @@ -229,7 +229,7 @@ VoteQueContent nomination = (VoteQueContent) contentIter.next(); int displayOrder = nomination.getDisplayOrder(); String name = buildConditionName(VoteOutputFactory.OUTPUT_NAME_NOMINATION_SELECTION, - new Integer(displayOrder).toString()); + Integer.valueOf(displayOrder).toString()); boolean found = false; if (queUser != null) { Set voteAttempts = queUser.getVoteUsrAttempts(); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -259,7 +259,7 @@ if (questionText != null && !questionText.equals("") && (!displayOrder.equals(questionIndexToDelete))) { ++queIndex; - questionDTO.setDisplayOrder(new Integer(queIndex).toString()); + questionDTO.setDisplayOrder(Integer.valueOf(queIndex).toString()); listFinalQuestionDTO.add(questionDTO); } if ((questionText != null) && (!questionText.isEmpty()) && displayOrder.equals(questionIndexToDelete)) { @@ -604,7 +604,7 @@ } try { - //int intMaxNomCount = new Integer(maxNomCount).intValue(); + //int intMaxNomCount = Integer.valueOf(maxNomCount).intValue(); } catch (NumberFormatException e) { errorMap.add("maxNominationCount", messageService.getMessage("maxNomination.invalid")); logger.error("Maximum votes in Advance tab is invalid"); @@ -879,7 +879,7 @@ questionDTO.setUid(question.getUid()); questionDTO.setQuestion(question.getQuestion()); - questionDTO.setDisplayOrder(new Integer(question.getDisplayOrder()).toString()); + questionDTO.setDisplayOrder(Integer.valueOf(question.getDisplayOrder()).toString()); questionDTOs.add(questionDTO); } @@ -986,7 +986,7 @@ private static List swapQuestions(List questionDTOs, String questionIndex, String direction) { - int intQuestionIndex = new Integer(questionIndex).intValue(); + int intQuestionIndex = Integer.valueOf(questionIndex).intValue(); int intOriginalQuestionIndex = intQuestionIndex; int replacedQuestionIndex = 0; @@ -1009,18 +1009,18 @@ VoteQuestionDTO questionDTO = iter.next(); VoteQuestionDTO tempQuestion = new VoteQuestionDTO(); - if (!questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString()) - && !questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) { + if (!questionDTO.getDisplayOrder().equals(Integer.valueOf(intOriginalQuestionIndex).toString()) + && !questionDTO.getDisplayOrder().equals(Integer.valueOf(replacedQuestionIndex).toString())) { logger.info("Normal Copy"); // normal copy tempQuestion = questionDTO; - } else if (questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) { + } else if (questionDTO.getDisplayOrder().equals(Integer.valueOf(intOriginalQuestionIndex).toString())) { // move type 1 logger.info("Move type 1"); tempQuestion = replacedQuestion; - } else if (questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) { + } else if (questionDTO.getDisplayOrder().equals(Integer.valueOf(replacedQuestionIndex).toString())) { // move type 1 logger.info("Move type 1"); tempQuestion = mainQuestion; @@ -1039,7 +1039,7 @@ while (iter.hasNext()) { VoteQuestionDTO voteQuestionDTO = iter.next(); - if (new Integer(intOriginalQuestionIndex).toString().equals(voteQuestionDTO.getDisplayOrder())) { + if (Integer.valueOf(intOriginalQuestionIndex).toString().equals(voteQuestionDTO.getDisplayOrder())) { return voteQuestionDTO; } } @@ -1062,7 +1062,7 @@ ++queIndex; voteQuestionDTO.setNomination(question); - voteQuestionDTO.setDisplayOrder(new Integer(queIndex).toString()); + voteQuestionDTO.setDisplayOrder(Integer.valueOf(queIndex).toString()); listFinalQuestionDTO.add(voteQuestionDTO); } @@ -1101,7 +1101,7 @@ VoteQuestionDTO voteQuestionDTO = iter.next(); queIndex++; - mapQuestion.put(new Integer(queIndex).toString(), voteQuestionDTO.getNomination()); + mapQuestion.put(Integer.valueOf(queIndex).toString(), voteQuestionDTO.getNomination()); } return mapQuestion; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -185,7 +185,7 @@ VoteQueContent voteQueContent = attempt.getVoteQueContent(); order++; if (voteQueContent != null) { - mapQuestionsContent.put(new Integer(order).toString(), voteQueContent.getQuestion()); + mapQuestionsContent.put(Integer.valueOf(order).toString(), voteQueContent.getQuestion()); } } request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapQuestionsContent); @@ -350,7 +350,7 @@ int intMaxNominationCount = 0; if (maxNominationCount != null) { - intMaxNominationCount = new Integer(maxNominationCount).intValue(); + intMaxNominationCount = Integer.valueOf(maxNominationCount).intValue(); } if (castVoteCount > intMaxNominationCount) { @@ -786,9 +786,9 @@ String questionUid = attempt.getVoteQueContent().getUid().toString(); if (entry != null) { if (entry.equals("sample nomination") && questionUid.equals("1")) { - localMapQuestionsContent.put(new Integer(order).toString(), attempt.getUserEntry()); + localMapQuestionsContent.put(Integer.valueOf(order).toString(), attempt.getUserEntry()); } else { - localMapQuestionsContent.put(new Integer(order).toString(), voteQueContent.getQuestion()); + localMapQuestionsContent.put(Integer.valueOf(order).toString(), voteQueContent.getQuestion()); } } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -367,7 +367,7 @@ if (voteQueContent != null) { voteQuestionDTO.setQuestion(voteQueContent.getQuestion()); - voteQuestionDTO.setDisplayOrder(new Integer(voteQueContent.getDisplayOrder()).toString()); + voteQuestionDTO.setDisplayOrder(Integer.valueOf(voteQueContent.getDisplayOrder()).toString()); listQuestionDTO.add(voteQuestionDTO); } } @@ -412,14 +412,14 @@ Map map = new TreeMap<>(new VoteComparator()); Iterator listIterator = list.iterator(); - Long mapIndex = new Long(1); + Long mapIndex = 1L; while (listIterator.hasNext()) { ; VoteMonitoredUserDTO data = listIterator.next(); map.put(mapIndex.toString(), data); - mapIndex = new Long(mapIndex.longValue() + 1); + mapIndex = mapIndex.longValue() + 1; } return map; } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -687,7 +687,7 @@ wikiPageContent.setBody(wikiPageForm.getNewPageWikiBody()); wikiPageContent.setEditDate(new Date()); wikiPageContent.setEditor(user); - wikiPageContent.setVersion(new Long(1)); + wikiPageContent.setVersion(1L); wikiPageContent.setWikiPage(wikiPage); wikiPageContentDAO.saveOrUpdate(wikiPageContent); @@ -1044,7 +1044,7 @@ wikiPageContent.setBody(JsonUtil.optString(pageData, "body")); wikiPageContent.setEditDate(updateDate); wikiPageContent.setEditor(null); - wikiPageContent.setVersion(new Long(1)); + wikiPageContent.setVersion(1L); wikiPageContent.setWikiPage(wikiPage); // Apply the content to the wiki page and save Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -28,9 +28,9 @@ public static final String TOOL_SIGNATURE = "lawiki10"; // Wiki session status - public static final Integer SESSION_NOT_STARTED = new Integer(0); - public static final Integer SESSION_IN_PROGRESS = new Integer(1); - public static final Integer SESSION_COMPLETED = new Integer(2); + public static final Integer SESSION_NOT_STARTED = Integer.valueOf(0); + public static final Integer SESSION_IN_PROGRESS = Integer.valueOf(1); + public static final Integer SESSION_COMPLETED = Integer.valueOf(2); public static final String AUTHORING_DEFAULT_TAB = "1"; public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; @@ -84,4 +84,4 @@ public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString"; public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; -} +} \ No newline at end of file Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/diff/Diff.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc11264f3271f40971838dd015db6b5107f3bc55e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/diff/Diff.java (.../Diff.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/diff/Diff.java (.../Diff.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) @@ -260,11 +260,11 @@ TreeMap matches = new TreeMap(); while (aStart <= aEnd && bStart <= bEnd && equals(a[aStart], b[bStart])) { - matches.put(new Integer(aStart++), new Integer(bStart++)); + matches.put(Integer.valueOf(aStart++), Integer.valueOf(bStart++)); } while (aStart <= aEnd && bStart <= bEnd && equals(a[aEnd], b[bEnd])) { - matches.put(new Integer(aEnd--), new Integer(bEnd--)); + matches.put(Integer.valueOf(aEnd--), Integer.valueOf(bEnd--)); } Map bMatches = null; @@ -290,7 +290,7 @@ positions = new ArrayList(); bMatches.put(key, positions); } - positions.add(new Integer(bi)); + positions.add(Integer.valueOf(bi)); } thresh = new TreeMap(); @@ -301,7 +301,7 @@ List positions = (List) bMatches.get(aElement); if (positions != null) { - Integer k = new Integer(0); + Integer k = Integer.valueOf(0); ListIterator pit = positions.listIterator(positions.size()); while (pit.hasPrevious()) { Integer j = (Integer) pit.previous(); @@ -311,8 +311,8 @@ if (k == null) { // nothing } else { - Object value = k.intValue() > 0 ? links.get(new Integer(k.intValue() - 1)) : null; - links.put(k, new Object[] { value, new Integer(i), j }); + Object value = k.intValue() > 0 ? links.get(Integer.valueOf(k.intValue() - 1)) : null; + links.put(k, new Object[] { value, Integer.valueOf(i), j }); } } } @@ -387,10 +387,10 @@ protected void append(Integer value) { Integer addIdx = null; if (thresh.size() == 0) { - addIdx = new Integer(0); + addIdx = Integer.valueOf(0); } else { Integer lastKey = (Integer) thresh.lastKey(); - addIdx = new Integer(lastKey.intValue() + 1); + addIdx = Integer.valueOf(lastKey.intValue() + 1); } thresh.put(addIdx, value); } @@ -399,7 +399,7 @@ * Inserts the given values into the threshold map. */ protected Integer insert(Integer j, Integer k) { - if (Diff.isNonzero(k) && isGreaterThan(k, j) && isLessThan(new Integer(k.intValue() - 1), j)) { + if (Diff.isNonzero(k) && isGreaterThan(k, j) && isLessThan(Integer.valueOf(k.intValue() - 1), j)) { thresh.put(k, j); } else { int hi = -1; @@ -413,14 +413,14 @@ // off the end? if (hi == -1 || j.compareTo(getLastValue()) > 0) { append(j); - k = new Integer(hi + 1); + k = Integer.valueOf(hi + 1); } else { // binary search for insertion point: int lo = 0; while (lo <= hi) { int index = (hi + lo) / 2; - Integer val = (Integer) thresh.get(new Integer(index)); + Integer val = (Integer) thresh.get(Integer.valueOf(index)); int cmp = j.compareTo(val); if (cmp == 0) { @@ -432,12 +432,12 @@ } } - thresh.put(new Integer(lo), j); - k = new Integer(lo); + thresh.put(Integer.valueOf(lo), j); + k = Integer.valueOf(lo); } } return k; } -} +} \ No newline at end of file