diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java index 20acd4cf57..7438ee5ed6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java @@ -89,7 +89,7 @@ public abstract class BaseAPI private AlfrescoHttpClientFactory alfrescoHttpClientFactory; @Autowired - private ContentService contentService; + protected ContentService contentService; public static final String NODE_REF_WORKSPACE_SPACES_STORE = "workspace://SpacesStore/"; private static final String FILE_PLAN_PATH = "/Sites/rm/documentLibrary"; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java index 3fe9ab67e6..5ca4b9c1ab 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java @@ -44,7 +44,6 @@ import java.util.Set; import org.alfresco.dataprep.AlfrescoHttpClient; import org.alfresco.dataprep.AlfrescoHttpClientFactory; -import org.alfresco.dataprep.ContentService; import org.alfresco.dataprep.UserService; import org.alfresco.rest.core.v0.BaseAPI; import org.alfresco.rest.core.v0.RMEvents; @@ -97,9 +96,6 @@ public class RMRolesAndActionsAPI extends BaseAPI @Autowired private UserService userService; - @Autowired - private ContentService contentService; - /** * Get all the configured RM roles. * diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java index 82a50deb94..cae9768e39 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java @@ -28,14 +28,12 @@ package org.alfresco.rest.v0; import static org.apache.http.HttpStatus.SC_OK; -import org.alfresco.dataprep.ContentService; import org.alfresco.rest.core.v0.BaseAPI; import org.apache.http.HttpResponse; import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -49,9 +47,6 @@ public class RecordFoldersAPI extends BaseAPI { private static final Logger LOGGER = LoggerFactory.getLogger(RecordFoldersAPI.class); - @Autowired - private ContentService contentService; - /** * Close the record folder * diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java index ac2fe6933f..0598a95d06 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java @@ -33,7 +33,6 @@ import java.text.MessageFormat; import java.util.Map; import org.alfresco.dataprep.CMISUtil.DocumentType; -import org.alfresco.dataprep.ContentService; import org.alfresco.rest.core.v0.BaseAPI; import org.apache.chemistry.opencmis.client.api.CmisObject; import org.apache.commons.lang3.tuple.Pair; @@ -42,7 +41,6 @@ import org.json.JSONException; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -59,9 +57,6 @@ public class RecordsAPI extends BaseAPI private static final String CREATE_NON_ELECTRONIC_RECORD_API = "{0}type/rma:nonElectronicDocument/formprocessor"; - @Autowired - private ContentService contentService; - /** * Declare documents as records * diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java index de56972ccd..48ec3e4cb6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java @@ -675,6 +675,8 @@ public class BaseRMRestTest extends RestTest this.wait(waitInMilliSeconds); } catch (InterruptedException e) { + // Restore interrupted state... + Thread.currentThread().interrupt(); } } @@ -726,6 +728,8 @@ public class BaseRMRestTest extends RestTest } catch (InterruptedException e) { + // Restore interrupted state... + Thread.currentThread().interrupt(); } } @@ -775,6 +779,8 @@ public class BaseRMRestTest extends RestTest } catch (InterruptedException e) { + // Restore interrupted state... + Thread.currentThread().interrupt(); } } result = searchApi.searchForNodePropertyAsUser(user.getUsername(), user.getPassword(), nodeRef, diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareDocumentAsRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareDocumentAsRecordTests.java index 077703bca5..bfcbf1a635 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareDocumentAsRecordTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareDocumentAsRecordTests.java @@ -156,8 +156,8 @@ public class DeclareDocumentAsRecordTests extends BaseRMRestTest try ( InputStream recordInputStream = getRestAPIFactory().getRecordsAPI().getRecordContent(record.getId()).asInputStream(); - InputStream documentInputStream = documentPostFiling.getContentStream().getStream(); - ) + InputStream documentInputStream = documentPostFiling.getContentStream().getStream() + ) { assertEquals(DigestUtils.sha1(recordInputStream), DigestUtils.sha1(documentInputStream)); } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java index 9cd8b476b6..8580839556 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java @@ -775,7 +775,6 @@ public class RecordCategoryTests extends BaseRMRestTest { //is unfiled container containerId = getRestAPIFactory().getUnfiledContainersAPI().getUnfiledContainer(containerAlias).getId(); - ; } // Create a record folder diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/ReadRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/ReadRecordTests.java index 06b513ccac..e2c48d8695 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/ReadRecordTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/ReadRecordTests.java @@ -269,7 +269,7 @@ public class ReadRecordTests extends BaseRMRestTest try ( InputStream recordContentStream = recordsAPI.getRecordContent(binaryRecordId).asInputStream(); - FileInputStream localFileStream = new FileInputStream(getFile(IMAGE_FILE)); + FileInputStream localFileStream = new FileInputStream(getFile(IMAGE_FILE)) ) { assertEquals(DigestUtils.sha1(recordContentStream), DigestUtils.sha1(localFileStream)); diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml index 7cfa9ae906..d008a44c01 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml @@ -85,14 +85,12 @@ - - @@ -110,7 +108,6 @@ - - - @@ -197,7 +192,6 @@ - - diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java index 20c8d60a2f..6c6a8f0937 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/RecordsManagementServiceImpl.java @@ -248,7 +248,7 @@ public class RecordsManagementServiceImpl extends ServiceBaseImpl @Override public List getFilePlans() { - return new ArrayList(getFilePlanService().getFilePlans()); + return new ArrayList<>(getFilePlanService().getFilePlans()); } /** diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java index cb68247654..b15a5e1fc5 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java @@ -42,7 +42,7 @@ import java.util.Map; static Map> getPivot(Map> source) { - Map> pivot = new HashMap>(); + Map> pivot = new HashMap<>(); for (Map.Entry> entry : source.entrySet()) { @@ -59,7 +59,7 @@ import java.util.Map; else { // New value - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(authority); pivot.put(value, list); } diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java index 536a619db8..079e5944a9 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigComponentImpl.java @@ -106,11 +106,11 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon // Default private StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"); - private List caveatAspectURINames = new ArrayList(0); - private List caveatAspectQNames = new ArrayList(0); + private List caveatAspectURINames = new ArrayList<>(0); + private List caveatAspectQNames = new ArrayList<>(0); - private List caveatModelURINames = new ArrayList(0); - private List caveatModelQNames = new ArrayList(0); + private List caveatModelURINames = new ArrayList<>(0); + private List caveatModelQNames = new ArrayList<>(0); private static final String CAVEAT_CONFIG_NAME = "caveatConfig.json"; @@ -307,9 +307,9 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon logger.trace(caveatConfigData); } - Set models = new HashSet(1); - Set props = new HashSet(10); - Set expectedPrefixes = new HashSet(10); + Set models = new HashSet<>(1); + Set props = new HashSet<>(10); + Set expectedPrefixes = new HashSet<>(10); if (caveatModelQNames.size() > 0) { @@ -553,7 +553,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon // Get allowed values for given caveat (for current user) public List getRMAllowedValues(String constraintName) { - List allowedValues = new ArrayList(0); + List allowedValues = new ArrayList<>(0); String userName = AuthenticationUtil.getRunAsUser(); if (userName != null && !(AuthenticationUtil.isMtEnabled() && AuthenticationUtil.isRunAsUserTheSystemUser())) @@ -570,7 +570,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon private List getRMAllowedValues(String userName, Set userGroupFullNames, String constraintName) { - SetallowedValues = new HashSet(); + SetallowedValues = new HashSet<>(); // note: userName and userGroupNames must not be null Map> caveatConstraintDef = null; @@ -602,7 +602,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon } } - Listret = new ArrayList(); + Listret = new ArrayList<>(); ret.addAll(allowedValues); return Collections.unmodifiableList(ret); } @@ -676,7 +676,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon Object val = entry.getValue(); if (val instanceof String) { - propValues = new ArrayList(1); + propValues = new ArrayList<>(1); propValues.add((String)val); } else if (val instanceof List) @@ -857,13 +857,13 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon if(members == null) { // Create the new list, with the authority name - Map> constraint = new HashMap>(0); - constraint.put(authorityName, new ArrayList(values)); + Map> constraint = new HashMap<>(0); + constraint.put(authorityName, new ArrayList<>(values)); members = constraint; } else { - members.put(authorityName, new ArrayList(values)); + members.put(authorityName, new ArrayList<>(values)); } caveatConfig.put(listName, members); @@ -893,7 +893,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon if(members == null) { // Members List does not exist - Map> emptyConstraint = new HashMap>(0); + Map> emptyConstraint = new HashMap<>(0); caveatConfig.put(listName, emptyConstraint); members = emptyConstraint; @@ -918,7 +918,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon List vals = members.get(authority); if(vals == null) { - vals= new ArrayList(); + vals= new ArrayList<>(); members.put(authority, vals); } vals.add(valueName); @@ -1022,13 +1022,12 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon for (String listName : listNames) { Map> members = config.get(listName); - - Set authorityNames = members.keySet(); JSONObject listMembers = new JSONObject(); - for (String authorityName : authorityNames) + for (Map.Entry> member : members.entrySet()) { - List authorities = members.get(authorityName); + final String authorityName = member.getKey(); + final List authorities = member.getValue(); try { listMembers.put(authorityName, authorities); @@ -1134,7 +1133,7 @@ public class RMCaveatConfigComponentImpl implements ContentServicePolicies.OnCon try { writeLock.lock(); - Map> emptyConstraint = new HashMap>(0); + Map> emptyConstraint = new HashMap<>(0); caveatConfig.put(listName, emptyConstraint); updateOrCreateCaveatConfig(convertToJSONString(caveatConfig)); } diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java index a42e3cf013..baa7227fa2 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigServiceImpl.java @@ -150,7 +150,7 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService listName = sb.toString(); } - ListallowedValues = new ArrayList(); + ListallowedValues = new ArrayList<>(); for(String value : values) { allowedValues.add(value); @@ -262,9 +262,9 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService */ public Set getAllRMConstraints() { - Set info = new HashSet(); + Set info = new HashSet<>(); - List defs = new ArrayList(10); + List defs = new ArrayList<>(10); for (QName caveatModelQName : rmCaveatConfigComponent.getRMCaveatModels()) { defs.addAll(recordsManagementAdminService.getCustomConstraintDefinitions(caveatModelQName)); @@ -358,7 +358,7 @@ public class RMCaveatConfigServiceImpl implements RMCaveatConfigService if(allowedValues != null) { - ListallowedValueList = new ArrayList(); + ListallowedValueList = new ArrayList<>(); for(String value : allowedValues) { allowedValueList.add(value); diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java index e0de5e8dff..a3e03633d8 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java @@ -64,7 +64,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint // closed marking - all values must match AND, // open marking - at least one value must match - OR; + OR } // note: alternative to static init could be to use 'registered' constraint @@ -112,7 +112,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint // get allowed values for current user List allowedForUser = caveatConfigService.getRMAllowedValues(getShortName()); - List filteredList = new ArrayList(allowedForUser.size()); + List filteredList = new ArrayList<>(allowedForUser.size()); for (String allowed : allowedForUser) { if (this.allowedValues.contains(allowed)) @@ -153,7 +153,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint // get allowed values for current user List allowedForUser = caveatConfigService.getRMAllowedValues(getType()); - List filteredList = new ArrayList(allowedForUser.size()); + List filteredList = new ArrayList<>(allowedForUser.size()); for (String allowed : allowedForUser) { if (this.allowedValuesUpper.contains(allowed.toUpperCase())) @@ -186,7 +186,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint this.allowedValues = Collections.unmodifiableList(allowedValues); // make the upper case versions - this.allowedValuesUpper = new ArrayList(valueCount); + this.allowedValuesUpper = new ArrayList<>(valueCount); for (String allowedValue : this.allowedValues) { allowedValuesUpper.add(allowedValue.toUpperCase()); @@ -202,7 +202,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint @Override public Map getParameters() { - Map params = new HashMap(2); + Map params = new HashMap<>(2); params.put("caseSensitive", isCaseSensitive()); params.put("allowedValues", getAllowedValues()); diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java index a17f38dc92..3e815afe1e 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptConstraint.java @@ -97,21 +97,15 @@ public class ScriptConstraint implements Serializable return new ScriptConstraintAuthority[0]; } - // Here with some data to return - Set authorities = values.keySet(); - - ArrayList constraints = new ArrayList(values.size()); - for(String authority : authorities) + ArrayList constraints = new ArrayList<>(values.size()); + for (Map.Entry> entry : values.entrySet()) { ScriptConstraintAuthority constraint = new ScriptConstraintAuthority(); - constraint.setAuthorityName(authority); - constraint.setValues(values.get(authority)); + constraint.setAuthorityName(entry.getKey()); + constraint.setValues(entry.getValue()); constraints.add(constraint); } - - ScriptConstraintAuthority[] retVal = constraints.toArray(new ScriptConstraintAuthority[constraints.size()]); - - return retVal; + return constraints.toArray(new ScriptConstraintAuthority[constraints.size()]); } /** @@ -144,7 +138,7 @@ public class ScriptConstraint implements Serializable JSONObject obj = bodge.getJSONObject(i); String value = obj.getString("value"); JSONArray authorities = obj.getJSONArray("authorities"); - List aList = new ArrayList(); + List aList = new ArrayList<>(); for(int j = 0; j < authorities.length();j++) { aList.add(authorities.getString(j)); @@ -170,7 +164,7 @@ public class ScriptConstraint implements Serializable */ public void deleteAuthority(String authority) { - + //Do nothing } /** @@ -179,7 +173,7 @@ public class ScriptConstraint implements Serializable */ public void deleteValue(String value) { - + //Do nothing } @@ -209,24 +203,21 @@ public class ScriptConstraint implements Serializable if (details == null) { - details = new HashMap>(); + details = new HashMap<>(); } // values, authorities Map> pivot = PivotUtil.getPivot(details); - // Here with some data to return - Set values = pivot.keySet(); - - ArrayList constraints = new ArrayList(pivot.size()); - for(String value : values) + ArrayList constraints = new ArrayList<>(pivot.size()); + for (Map.Entry> entry : pivot.entrySet()) { ScriptConstraintValue constraint = new ScriptConstraintValue(); - constraint.setValueName(value); - constraint.setValueTitle(value); + constraint.setValueName(entry.getKey()); + constraint.setValueTitle(entry.getKey()); - Listauthorities = pivot.get(value); - List sauth = new ArrayList(); + List authorities = entry.getValue(); + List sauth = new ArrayList<>(); for(String authority : authorities) { ScriptAuthority a = new ScriptAuthority(); @@ -250,6 +241,7 @@ public class ScriptConstraint implements Serializable /** * Now go through and add any "empty" values */ + Set values = pivot.keySet(); for(String value : info.getAllowedValues()) { if(!values.contains(value)) @@ -257,7 +249,7 @@ public class ScriptConstraint implements Serializable ScriptConstraintValue constraint = new ScriptConstraintValue(); constraint.setValueName(value); constraint.setValueTitle(value); - List sauth = new ArrayList(); + List sauth = new ArrayList<>(); constraint.setAuthorities(sauth); constraints.add(constraint); } diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java index 2544e04f6e..d126209409 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/ScriptRMCaveatConfigService.java @@ -93,7 +93,7 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension { Set values = caveatConfigService.getAllRMConstraints(); - List vals = new ArrayList(values.size()); + List vals = new ArrayList<>(values.size()); for(RMConstraintInfo value : values) { ScriptConstraint c = new ScriptConstraint(value, caveatConfigService, getAuthorityService()); @@ -132,7 +132,7 @@ public class ScriptRMCaveatConfigService extends BaseScopableProcessorExtension */ public void updateConstraintValues(String listName, String authorityName, String[]values) { - List vals = new ArrayList(); + List vals = new ArrayList<>(); caveatConfigService.updateRMConstraintListAuthority(listName, authorityName, vals); } diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java index 36806134f7..1c60ae5d01 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java @@ -154,7 +154,7 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut boolean result = false; Map, Boolean> transactionCache = TransactionalResourceHelper.getMap(getTransactionCacheName()); - Pair key = new Pair(nodeRef, userName); + Pair key = new Pair<>(nodeRef, userName); if (transactionCache.containsKey(key)) { diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java index 834d6f52d8..2ffed36d1b 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/ExtendedWriterDynamicAuthority.java @@ -65,7 +65,7 @@ public class ExtendedWriterDynamicAuthority extends ExtendedSecurityBaseDynamicA { if (requiredFor == null) { - requiredFor = new HashSet(3); + requiredFor = new HashSet<>(3); Collections.addAll(requiredFor, getModelDAO().getPermissionReference(null, RMPermissionModel.READ_RECORDS), getModelDAO().getPermissionReference(null, RMPermissionModel.FILING), diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java index 792c997805..3d42518c60 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/security/Role.java @@ -54,7 +54,7 @@ public class Role extends org.alfresco.module.org_alfresco_module_rm.role.Role */ public static Set toRoleSet(Set roles) { - Set result = new HashSet(roles.size()); + Set result = new HashSet<>(roles.size()); for (org.alfresco.module.org_alfresco_module_rm.role.Role role : roles) { result.add(Role.toRole(role)); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java index 135501c1d0..95d5a24161 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java @@ -133,7 +133,7 @@ public abstract class RMActionExecuterAbstractBase extends PropertySubActionExe private IdentifierService identifierService; /** List of kinds for which this action is applicable */ - protected Set applicableKinds = new HashSet(); + protected Set applicableKinds = new HashSet<>(); /** * Get the transaction service diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java index e671096fc9..81755f456e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionCondition.java @@ -43,7 +43,7 @@ public interface RecordsManagementActionCondition * * @return String action condition name */ - String getName(); + String getBeanName(); /** * Get the label of the action condition diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java index ab3c4ada31..30e4f4c0b3 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionConditionEvaluatorAbstractBase.java @@ -56,7 +56,7 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte private FilePlanService filePlanService; /** bean name */ - private String name; + private String beanName; /** public condition */ private boolean publicCondition = true; @@ -145,16 +145,16 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte @Override public void setBeanName(String name) { - this.name = name; + this.beanName = name; super.setBeanName(name); } /** - * @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getName() + * @see org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionCondition#getBeanName() */ - public String getName() + public String getBeanName() { - return this.name; + return this.beanName; } /** @@ -184,11 +184,11 @@ public abstract class RecordsManagementActionConditionEvaluatorAbstractBase exte { if (this.actionConditionDefinition == null) { - this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(name); + this.actionConditionDefinition = new RecordsManagementActionConditionDefinitionImpl(beanName); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setTitleKey(getTitleKey()); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setDescriptionKey(getDescriptionKey()); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setAdhocPropertiesAllowed(getAdhocPropertiesAllowed()); - ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(name); + ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setConditionEvaluator(beanName); ((RecordsManagementActionConditionDefinitionImpl)actionConditionDefinition).setLocalizedParameterDefinitions(getLocalizedParameterDefinitions()); } return this.actionConditionDefinition; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java index b86ea5e3b9..e6262e0787 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java @@ -63,10 +63,10 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi private static Log logger = LogFactory.getLog(RecordsManagementActionServiceImpl.class); /** Registered records management actions */ - private Map rmActions = new HashMap(13); - private Map rmConditions = new HashMap(13); + private Map rmActions = new HashMap<>(13); + private Map rmConditions = new HashMap<>(13); - private Map dispositionActions = new HashMap(5); + private Map dispositionActions = new HashMap<>(5); /** Policy component */ private PolicyComponent policyComponent; @@ -142,9 +142,9 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi public void register(RecordsManagementActionCondition rmCondition) { - if (!rmConditions.containsKey(rmCondition.getName())) + if (!rmConditions.containsKey(rmCondition.getBeanName())) { - rmConditions.put(rmCondition.getName(), rmCondition); + rmConditions.put(rmCondition.getBeanName(), rmCondition); } } @@ -185,7 +185,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi */ public List getRecordsManagementActions() { - List result = new ArrayList(this.rmActions.size()); + List result = new ArrayList<>(this.rmActions.size()); result.addAll(this.rmActions.values()); return Collections.unmodifiableList(result); } @@ -196,7 +196,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi @Override public List getRecordsManagementActionConditions() { - List result = new ArrayList(rmConditions.size()); + List result = new ArrayList<>(rmConditions.size()); result.addAll(rmConditions.values()); return Collections.unmodifiableList(result); } @@ -210,7 +210,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi @SuppressWarnings("unused") public List getDispositionActions(NodeRef nodeRef) { - List result = new ArrayList(this.rmActions.size()); + List result = new ArrayList<>(this.rmActions.size()); for (RecordsManagementAction action : this.rmActions.values()) { @@ -225,7 +225,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi */ public List getDispositionActions() { - List result = new ArrayList(dispositionActions.size()); + List result = new ArrayList<>(dispositionActions.size()); result.addAll(dispositionActions.values()); return Collections.unmodifiableList(result); } @@ -325,7 +325,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi public Map executeRecordsManagementAction(List nodeRefs, String name, Map parameters) { // Execute the action on each node in the list - Map results = new HashMap(nodeRefs.size()); + Map results = new HashMap<>(nodeRefs.size()); for (NodeRef nodeRef : nodeRefs) { RecordsManagementActionResult result = executeRecordsManagementAction(nodeRef, name, parameters); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java index 7a8c7e42cb..28b4769c97 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/CustomParameterConstraint.java @@ -58,7 +58,7 @@ public class CustomParameterConstraint extends BaseParameterConstraint */ protected Map getAllowableValuesImpl() { - Map allowableValues = new HashMap(parameterValues.size()); + Map allowableValues = new HashMap<>(parameterValues.size()); for (Object parameterValue : parameterValues) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java index d228dcad05..5c1d4b393c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/DispositionActionParameterConstraint.java @@ -60,7 +60,7 @@ public class DispositionActionParameterConstraint extends BaseParameterConstrain { List rmActions = rmActionService.getDispositionActions(); - Map result = new HashMap(rmActions.size()); + Map result = new HashMap<>(rmActions.size()); for (RecordsManagementAction rmAction : rmActions) { result.put(rmAction.getName(), rmAction.getLabel()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java index cdc4e055d4..f72ee45b6d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/ManualEventParameterConstraint.java @@ -59,7 +59,7 @@ public class ManualEventParameterConstraint extends BaseParameterConstraint protected Map getAllowableValuesImpl() { List events = recordsManagementEventService.getEvents(); - Map result = new HashMap(events.size()); + Map result = new HashMap<>(events.size()); for (RecordsManagementEvent event : events) { RecordsManagementEventType eventType = recordsManagementEventService.getEventType(event.getType()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java index 05d9c0c0fb..a3916715ee 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/RecordTypeParameterConstraint.java @@ -108,7 +108,7 @@ public class RecordTypeParameterConstraint extends BaseParameterConstraint { Set recordTypes = recordService.getRecordMetadataAspects(filePlan); - result = new HashMap(recordTypes.size()); + result = new HashMap<>(recordTypes.size()); for (QName recordType : recordTypes) { AspectDefinition aspectDefinition = dictionaryService.getAspect(recordType); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/VersionParameterConstraint.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/VersionParameterConstraint.java index bfe114ebb3..d1f400c1fa 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/VersionParameterConstraint.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/constraint/VersionParameterConstraint.java @@ -48,7 +48,7 @@ public class VersionParameterConstraint extends BaseParameterConstraint protected Map getAllowableValuesImpl() { RecordableVersionPolicy[] recordableVersionPolicies = RecordableVersionPolicy.values(); - Map allowableValues = new HashMap(recordableVersionPolicies.length); + Map allowableValues = new HashMap<>(recordableVersionPolicies.length); for (RecordableVersionPolicy recordableVersionPolicy : recordableVersionPolicies) { String policy = recordableVersionPolicy.toString(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java index 37c9793115..6efa240d1e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java @@ -35,5 +35,5 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator; */ public enum DispositionActionRelativePositions { - ANY, NEXT, PREVIOUS; + ANY, NEXT, PREVIOUS } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java index 61a4fdfc3b..b99da6a2b4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java @@ -114,7 +114,7 @@ public class ApplyCustomTypeAction extends RMActionExecuterAbstractBase { Map paramValues = action.getParameterValues(); - Map result = new HashMap(paramValues.size()); + Map result = new HashMap<>(paramValues.size()); for (Map.Entry entry : paramValues.entrySet()) { QName propQName = QName.createQName(entry.getKey(), this.getNamespaceService()); @@ -138,7 +138,7 @@ public class ApplyCustomTypeAction extends RMActionExecuterAbstractBase Map props = aspectDefinition.getProperties(); - this.parameterDefinitions = new ArrayList(props.size()); + this.parameterDefinitions = new ArrayList<>(props.size()); for (Map.Entry entry : props.entrySet()) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java index 9e68395cef..00e082b45b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java @@ -168,7 +168,7 @@ public class BroadcastDispositionActionDefinitionUpdateAction extends RMActionEx } List events = da.getEventCompletionDetails(); - List list = new ArrayList(events.size()); + List list = new ArrayList<>(events.size()); for (EventCompletionDetails event : events) { list.add(event.getEventName()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java index fd08f8e252..87b64617da 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java @@ -77,7 +77,7 @@ public abstract class CopyMoveLinkFileToBaseAction extends RMActionExecuterAbstr public enum CopyMoveLinkFileToActionMode { COPY, MOVE, LINK - }; + } /** Action Mode */ private CopyMoveLinkFileToActionMode mode; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java index 604c83ca8a..d78f65f985 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java @@ -94,7 +94,7 @@ public class RequestInfoAction extends RMActionExecuterAbstractBase !getRecordService().isDeclared(actionedUponNodeRef)) { String workflowDefinitionId = workflowService.getDefinitionByName(REQUEST_INFO_WORKFLOW_DEFINITION_NAME).getId(); - Map parameters = new HashMap(); + Map parameters = new HashMap<>(); parameters.put(WorkflowModel.ASSOC_PACKAGE, getWorkflowPackage(action, actionedUponNodeRef)); parameters.put(RMWorkflowModel.RM_MIXED_ASSIGNEES, getAssignees(action)); @@ -144,7 +144,7 @@ public class RequestInfoAction extends RMActionExecuterAbstractBase */ private Serializable getAssignees(Action action) { - List assigneesList = new ArrayList(); + List assigneesList = new ArrayList<>(); String assigneesAsString = (String) action.getParameterValue(PARAM_ASSIGNEES); String[] assignees = StringUtils.split(assigneesAsString, ','); for (String assignee : assignees) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java index f3230b6635..5606f27424 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java @@ -247,7 +247,7 @@ public class SplitEmailAction extends RMActionExecuterAbstractBase ContentType contentType = new ContentType(part.getContentType()); - Map docProps = new HashMap(1); + Map docProps = new HashMap<>(1); docProps.put(ContentModel.PROP_NAME, messageTitle + " - " + fileName); docProps.put(ContentModel.PROP_TITLE, fileName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminBase.java index 89a65cf18a..5c604a53ef 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminBase.java @@ -203,7 +203,7 @@ public class RecordsManagementAdminBase implements RecordsManagementCustomModel */ protected Map getCustomAssociations() { - Map customAssociations = new HashMap(); + Map customAssociations = new HashMap<>(); AspectDefinition aspectDefn = getDictionaryService().getAspect(ASPECT_CUSTOM_ASSOCIATIONS); if (aspectDefn != null) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java index a696f7d85b..91be9ba7ca 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java @@ -329,7 +329,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas { mandatory("customisableTypes", customisableTypes); - pendingCustomisableTypes = new ArrayList(); + pendingCustomisableTypes = new ArrayList<>(); for (String customisableType : customisableTypes) { pendingCustomisableTypes.add(QName.createQName(customisableType, getNamespaceService())); @@ -352,7 +352,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas { mandatory("nodeRef", nodeRef); - Set result = new HashSet(5); + Set result = new HashSet<>(5); // Check the nodes hierarchy for customisable types QName type = getNodeService().getType(nodeRef); @@ -410,7 +410,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas */ private void initCustomMap() { - customisableTypes = new HashMap(7); + customisableTypes = new HashMap<>(7); Collection aspects = getDictionaryService().getAspects(RM_CUSTOM_MODEL); for (QName aspect : aspects) { @@ -636,7 +636,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas */ public Map getCustomPropertyDefinitions() { - Map result = new HashMap(); + Map result = new HashMap<>(); for (QName customisableType : getCustomisable()) { Map props = getCustomPropertyDefinitions(customisableType); @@ -1268,7 +1268,7 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas } } - return new ArrayList(conDefs); + return new ArrayList<>(conDefs); } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java index 9f0e982da0..073a1a4ebb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditEntry.java @@ -251,26 +251,27 @@ public final class RecordsManagementAuditEntry { if (this.beforeProperties != null && this.afterProperties != null) { - this.changedProperties = new HashMap>( - this.beforeProperties.size() + this.afterProperties.size()); + this.changedProperties = new HashMap<>( + this.beforeProperties.size() + this.afterProperties.size()); // add all the properties present before the audited action - for (QName valuePropName : this.beforeProperties.keySet()) + for (Map.Entry entry : this.beforeProperties.entrySet()) { - Pair values = new Pair( - this.beforeProperties.get(valuePropName), - this.afterProperties.get(valuePropName)); + final QName valuePropName = entry.getKey(); + Pair values = new Pair<>( + entry.getValue(), + this.afterProperties.get(valuePropName)); this.changedProperties.put(valuePropName, values); } // add all the properties present after the audited action that // have not already been added - for (QName valuePropName : this.afterProperties.keySet()) + for (Map.Entry entry : this.afterProperties.entrySet()) { + final QName valuePropName = entry.getKey(); if (!this.beforeProperties.containsKey(valuePropName)) { - Pair values = new Pair(null, - this.afterProperties.get(valuePropName)); + Pair values = new Pair<>(null, entry.getValue()); this.changedProperties.put(valuePropName, values); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java index 20712b9af7..b9a671967d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java @@ -55,6 +55,7 @@ public final class RecordsManagementAuditQueryParameters */ public RecordsManagementAuditQueryParameters() { + //Default constructor } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index 8e816549d8..4321ac0c09 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -210,12 +210,12 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean private List ignoredAuditProperties; - private List propertiesToBeRemoved = new ArrayList(); + private List propertiesToBeRemoved = new ArrayList<>(); private RMAuditTxnListener txnListener = new RMAuditTxnListener(); /** Registered and initialised records management auditEvents */ - private Map auditEvents = new HashMap(); + private Map auditEvents = new HashMap<>(); /** * Set the component used to bind to behaviour callbacks @@ -622,7 +622,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean */ private Map buildAuditMap(NodeRef nodeRef, String eventName, Map propertiesBefore, Map propertiesAfter, boolean removeOnNoPropertyChange) { - Map auditMap = new HashMap(13); + Map auditMap = new HashMap<>(13); auditMap.put( AuditApplication.buildPath( RM_AUDIT_SNIPPET_EVENT, @@ -796,7 +796,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean format == ReportFormat.HTML ? AUDIT_TRAIL_HTML_FILE_SUFFIX : AUDIT_TRAIL_JSON_FILE_SUFFIX); try (FileOutputStream fileOutputStream = new FileOutputStream(auditTrailFile); - Writer fileWriter = new BufferedWriter(new OutputStreamWriter(fileOutputStream,"UTF8"));) + Writer fileWriter = new BufferedWriter(new OutputStreamWriter(fileOutputStream,"UTF8"))) { // Get the results, dumping to file getAuditTrailImpl(params, null, fileWriter, format); @@ -817,7 +817,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean { ParameterCheck.mandatory("params", params); - List entries = new ArrayList(50); + List entries = new ArrayList<>(50); try { getAuditTrailImpl(params, entries, null, null); @@ -1072,7 +1072,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean NodeRef nodeRef = params.getNodeRef(); int maxEntries = params.getMaxEntries(); // Reverse order if the results are limited - boolean forward = maxEntries > 0 ? false : true; + boolean forward = maxEntries <= 0; // start the audit trail report writeAuditTrailHeader(writer, params, reportFormat); @@ -1255,7 +1255,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean try { - Map properties = new HashMap(1); + Map properties = new HashMap<>(1); properties.put(ContentModel.PROP_NAME, auditTrail.getName()); // file the audit log as an undeclared record @@ -1292,7 +1292,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean @Override public List getAuditEvents() { - List listAuditEvents = new ArrayList(this.auditEvents.size()); + List listAuditEvents = new ArrayList<>(this.auditEvents.size()); listAuditEvents.addAll(this.auditEvents.values()); Collections.sort(listAuditEvents); return listAuditEvents; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java index f2f29675dd..fcbe2deeac 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/AuthenticatedUserRolesDataExtractor.java @@ -28,6 +28,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; +import java.util.Objects; import java.util.Set; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; @@ -124,4 +125,30 @@ public final class AuthenticatedUserRolesDataExtractor extends AbstractDataExtra // Done return sb.toString(); } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + if (!super.equals(o)) + { + return false; + } + AuthenticatedUserRolesDataExtractor that = (AuthenticatedUserRolesDataExtractor) o; + return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) + && Objects.equals(filePlanRoleService, that.filePlanRoleService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService, filePlanService, filePlanRoleService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java index 2847504a6e..2ef6fbce78 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanIdentifierDataExtractor.java @@ -28,6 +28,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; +import java.util.Objects; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.repo.audit.extractor.AbstractDataExtractor; @@ -76,4 +77,29 @@ public final class FilePlanIdentifierDataExtractor extends AbstractDataExtractor // Done return identifier; } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + if (!super.equals(o)) + { + return false; + } + FilePlanIdentifierDataExtractor that = (FilePlanIdentifierDataExtractor) o; + return Objects.equals(nodeService, that.nodeService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java index a0adcd0a68..67e6bd68fc 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java @@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; import java.util.List; +import java.util.Objects; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; @@ -126,4 +127,30 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor return extractedData; } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + if (!super.equals(o)) + { + return false; + } + FilePlanNamePathDataExtractor that = (FilePlanNamePathDataExtractor) o; + return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) + && Objects.equals(ruleService, that.ruleService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService, filePlanService, ruleService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java index 6e536d1811..0f9d85c0d9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNodeRefPathDataExtractor.java @@ -29,6 +29,7 @@ package org.alfresco.module.org_alfresco_module_rm.audit.extractor; import java.io.Serializable; import java.util.List; +import java.util.Objects; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; @@ -112,4 +113,30 @@ public final class FilePlanNodeRefPathDataExtractor extends AbstractDataExtracto return extractedData; } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + if (!super.equals(o)) + { + return false; + } + FilePlanNodeRefPathDataExtractor that = (FilePlanNodeRefPathDataExtractor) o; + return Objects.equals(nodeService, that.nodeService) && Objects.equals(filePlanService, that.filePlanService) + && Objects.equals(ruleService, that.ruleService); + } + + @Override + public int hashCode() + { + return Objects.hash(nodeService, filePlanService, ruleService); + } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java index 0d130d8a55..e9d1b41cdb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java @@ -47,10 +47,10 @@ import org.alfresco.util.ParameterCheck; public class CapabilityServiceImpl implements CapabilityService { /** Capabilities */ - private Map capabilities = new HashMap(57); + private Map capabilities = new HashMap<>(57); /** Groups */ - private Map groups = new HashMap(13); + private Map groups = new HashMap<>(13); /** * @see org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService#getCapability(java.lang.String) @@ -92,11 +92,11 @@ public class CapabilityServiceImpl implements CapabilityService Set result = null; if (includePrivate) { - result = new HashSet(capabilities.values()); + result = new HashSet<>(capabilities.values()); } else { - result = new HashSet(capabilities.size()); + result = new HashSet<>(capabilities.size()); for (Capability capability : capabilities.values()) { if (!capability.isPrivate()) @@ -127,7 +127,7 @@ public class CapabilityServiceImpl implements CapabilityService ParameterCheck.mandatory("nodeRef", nodeRef); Set listOfCapabilites = getCapabilities(includePrivate); - HashMap answer = new HashMap(); + HashMap answer = new HashMap<>(); for (Capability capability : listOfCapabilites) { AccessStatus status = capability.hasPermission(nodeRef); @@ -147,7 +147,7 @@ public class CapabilityServiceImpl implements CapabilityService ParameterCheck.mandatory("nodeRef", nodeRef); ParameterCheck.mandatory("capabilityNames", capabilityNames); - HashMap answer = new HashMap(); + HashMap answer = new HashMap<>(); for (String capabilityName : capabilityNames) { Capability capability = capabilities.get(capabilityName); @@ -189,7 +189,7 @@ public class CapabilityServiceImpl implements CapabilityService @Override public List getGroups() { - List groups = new ArrayList(); + List groups = new ArrayList<>(); for (Map.Entry entry : this.groups.entrySet()) { groups.add(entry.getValue()); @@ -217,7 +217,7 @@ public class CapabilityServiceImpl implements CapabilityService String id = this.groups.get(groupId).getId(); - List capabilities = new ArrayList(); + List capabilities = new ArrayList<>(); for (Capability capability : getCapabilities()) { Group group = capability.getGroup(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index bfd09e8ef9..44d168b8f1 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -49,7 +49,6 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.repo.search.SimpleResultSetMetaData; import org.alfresco.repo.search.impl.lucene.PagingLuceneResultSet; import org.alfresco.repo.search.impl.querymodel.QueryEngineResults; -import org.alfresco.repo.search.impl.solr.SolrSQLJSONResultSet; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.PermissionCheckCollection; import org.alfresco.repo.security.permissions.PermissionCheckValue; @@ -99,6 +98,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon public void afterPropertiesSet() { + //Do nothing } /** @@ -422,7 +422,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon return null; } - // FIXME + // FIXME see: RM-6895 if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase("solr-sql")) { return returnedObject; @@ -572,7 +572,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon private QueryEngineResults decide(Authentication authentication, Object object, ConfigAttributeDefinition config, QueryEngineResults returnedObject) { Map, ResultSet> map = returnedObject.getResults(); - Map, ResultSet> answer = new HashMap, ResultSet>(map.size(), 1.0f); + Map, ResultSet> answer = new HashMap<>(map.size(), 1.0f); for (Map.Entry, ResultSet> entry : map.entrySet()) { @@ -636,7 +636,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon int count = 0; // Keep values explicitly - List keepValues = new ArrayList(returnedObject.size()); + List keepValues = new ArrayList<>(returnedObject.size()); for (Object nextObject : returnedObject) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java index bfe7ae2f58..c0b6b54c5b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java @@ -80,7 +80,7 @@ public class RMEntryVoter extends RMSecurityCommon private AuthenticationUtil authenticationUtil; /** Policy map */ - private Map policies = new HashMap(); + private Map policies = new HashMap<>(); /** * @param capabilityService capability service @@ -258,67 +258,75 @@ public class RMEntryVoter extends RMSecurityCommon } else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM_CAP)) { - switch(checkCapability(invocation, params, cad)) - { - case AccessDecisionVoter.ACCESS_DENIED: - { - return AccessDecisionVoter.ACCESS_DENIED; - } - case AccessDecisionVoter.ACCESS_ABSTAIN: - { - if(logger.isDebugEnabled()) - { - if(logger.isTraceEnabled()) - { - logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException()); - } - else - { - logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod()); - } - } - // abstain denies - return AccessDecisionVoter.ACCESS_DENIED; - } - case AccessDecisionVoter.ACCESS_GRANTED: - { - break; - } - } + switch (checkCapability(invocation, params, cad)) + { + case AccessDecisionVoter.ACCESS_DENIED: + { + return AccessDecisionVoter.ACCESS_DENIED; + } + case AccessDecisionVoter.ACCESS_ABSTAIN: + { + if (logger.isDebugEnabled()) + { + if (logger.isTraceEnabled()) + { + logger.trace("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod(), new IllegalStateException()); + } + else + { + logger.debug("Capability " + cad.getRequired() + " abstained for " + invocation.getMethod()); + } + } + // abstain denies + return AccessDecisionVoter.ACCESS_DENIED; + } + case AccessDecisionVoter.ACCESS_GRANTED: + { + break; + } + default: + { + //do nothing + } + } } else if (cad.getTypeString().equals(ConfigAttributeDefinition.RM)) - { - switch(checkPolicy(invocation, params, cad)) - { - case AccessDecisionVoter.ACCESS_DENIED: - { - // log message - RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied."); + { + switch (checkPolicy(invocation, params, cad)) + { + case AccessDecisionVoter.ACCESS_DENIED: + { + // log message + RMMethodSecurityInterceptor.addMessage("Policy " + cad.getPolicyName() + " denied."); - return AccessDecisionVoter.ACCESS_DENIED; - } - case AccessDecisionVoter.ACCESS_ABSTAIN: - { - if(logger.isDebugEnabled()) - { - if(logger.isTraceEnabled()) - { - logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException()); - } - else - { - logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod()); - } - } - // abstain denies - return AccessDecisionVoter.ACCESS_DENIED; - } - case AccessDecisionVoter.ACCESS_GRANTED: - { - break; - } - } - } + return AccessDecisionVoter.ACCESS_DENIED; + } + case AccessDecisionVoter.ACCESS_ABSTAIN: + { + if (logger.isDebugEnabled()) + { + if (logger.isTraceEnabled()) + { + logger.trace("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod(), new IllegalStateException()); + } + else + { + logger.debug("Policy " + cad.getPolicyName() + " abstained for " + invocation.getMethod()); + } + } + // abstain denies + return AccessDecisionVoter.ACCESS_DENIED; + } + case AccessDecisionVoter.ACCESS_GRANTED: + { + break; + } + default: + { + //do nothing + } + } + } } } finally @@ -385,6 +393,7 @@ public class RMEntryVoter extends RMSecurityCommon */ public void afterPropertiesSet() { + //Do nothing } /** @@ -395,7 +404,7 @@ public class RMEntryVoter extends RMSecurityCommon @SuppressWarnings("rawtypes") private List extractSupportedDefinitions(net.sf.acegisecurity.ConfigAttributeDefinition config) { - List definitions = new ArrayList(2); + List definitions = new ArrayList<>(2); Iterator iter = config.getConfigAttributes(); while (iter.hasNext()) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java index 7f54377bc1..a0376ad756 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java @@ -227,7 +227,7 @@ public class RMSecurityCommon implements ApplicationContextAware int result = AccessDecisionVoter.ACCESS_ABSTAIN; Map, Integer> transactionCache = TransactionalResourceHelper.getMap("rm.security.checkRMRead"); - Pair key = new Pair(AuthenticationUtil.getRunAsUser(), nodeRef); + Pair key = new Pair<>(AuthenticationUtil.getRunAsUser(), nodeRef); if (transactionCache.containsKey(key)) { @@ -282,7 +282,7 @@ public class RMSecurityCommon implements ApplicationContextAware private AccessStatus hasViewCapability(NodeRef filePlan) { Map, AccessStatus> transactionCache = TransactionalResourceHelper.getMap("rm.security.hasViewCapability"); - Pair key = new Pair(AuthenticationUtil.getRunAsUser(), filePlan); + Pair key = new Pair<>(AuthenticationUtil.getRunAsUser(), filePlan); if (transactionCache.containsKey(key)) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java index 86c8d5c83b..1efc5373c9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java @@ -151,7 +151,7 @@ public class DeclarativeCapability extends AbstractCapability */ public void setPermission(String permission) { - List permissions = new ArrayList(1); + List permissions = new ArrayList<>(1); permissions.add(permission); this.permissions = permissions; } @@ -273,7 +273,7 @@ public class DeclarativeCapability extends AbstractCapability { if (kinds != null && availableKinds == null) { - availableKinds = new HashSet(kinds.size()); + availableKinds = new HashSet<>(kinds.size()); for (String kindString : kinds) { FilePlanComponentKind kind = FilePlanComponentKind.valueOf(kindString); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java index 9fcf4f04be..a2cf48c900 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** @@ -39,17 +38,6 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class HasDispositionDateCapabilityCondition extends AbstractCapabilityCondition { - /** Disposition service */ - private DispositionService dispositionService; - - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java index 5702c03beb..e75db13930 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** @@ -39,17 +38,6 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class HasEventsCapabilityCondition extends AbstractCapabilityCondition { - /** Disposition service */ - private DispositionService dispositionService; - - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityCondition.java index 87898f74e2..5aaea0befd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityCondition.java @@ -45,7 +45,7 @@ import org.alfresco.service.cmr.security.AccessStatus; public class HoldCapabilityCondition extends AbstractCapabilityCondition { /** indicates whether to evaluate holds that the node is within or not within */ - private boolean includedInHold = false;; + private boolean includedInHold = false; /** hold service */ private HoldService holdService; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java index 40bca0db1d..e4bfd3cbd6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** @@ -40,17 +39,6 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class IsClassifiedCapabilityCondition extends AbstractCapabilityCondition { - /** Disposition service */ - private DispositionService dispositionService; - - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java index 1499f80f61..f94913536d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** @@ -42,9 +41,6 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition /** Disposition action */ private String dispositionAction; - /** Disposition service */ - private DispositionService dispositionService; - /** * @param dispositionAction disposition action */ @@ -53,14 +49,6 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition this.dispositionAction = dispositionAction; } - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java index dfda81bcde..975ca5a4da 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java @@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** @@ -39,15 +38,9 @@ import org.alfresco.service.cmr.repository.NodeRef; */ public class LastDispositionActionCondition extends AbstractCapabilityCondition { - private DispositionService dispositionService; private String dispositionActionName; - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - public void setDispositionActionName(String dispositionActionName) { this.dispositionActionName = dispositionActionName; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java index 894b618119..f3ce7cf02d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java @@ -30,7 +30,6 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condit import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; -import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.service.cmr.repository.NodeRef; /** @@ -43,9 +42,6 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi /** Disposition action */ private String dispositionAction; - /** Disposition service */ - private DispositionService dispositionService; - /** * @param dispositionAction disposition action */ @@ -54,14 +50,6 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi this.dispositionAction = dispositionAction; } - /** - * @param dispositionService disposition service - */ - public void setDispositionService(DispositionService dispositionService) - { - this.dispositionService = dispositionService; - } - /** * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef) */ diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java index d53e2f5880..26438489d9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java @@ -124,7 +124,7 @@ public class CreateCapability extends DeclarativeCapability } // Build the conditions map - Map conditions = new HashMap(5); + Map conditions = new HashMap<>(5); conditions.put("capabilityCondition.filling", Boolean.TRUE); conditions.put("capabilityCondition.frozen", Boolean.FALSE); conditions.put("capabilityCondition.closed", Boolean.FALSE); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java index 65c735d349..ba358e8ffd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java @@ -64,7 +64,7 @@ public class ConfigAttributeDefinition private SimplePermissionReference required; /** parameter position map */ - private Map parameters = new HashMap(2, 1.0f); + private Map parameters = new HashMap<>(2, 1.0f); /** is parent */ private boolean parent = false; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java index c51581cbd6..ed286d89f3 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java @@ -76,7 +76,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode private static Log logger = LogFactory.getLog(DataSetServiceImpl.class); /** Registered data set implementations */ - private Map dataSets = new HashMap(); + private Map dataSets = new HashMap<>(); /** Spaces store */ private static final StoreRef SPACES_STORE = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore"); @@ -244,7 +244,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode ParameterCheck.mandatory("excludeLoaded", excludeLoaded); // Get the list of all available data sets - Map dataSets = new HashMap(getDataSets()); + Map dataSets = new HashMap<>(getDataSets()); // Should the list of unloaded data sets be retrieved if (excludeLoaded) @@ -330,7 +330,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode ParameterCheck.mandatory("filePlan", filePlan); // Get the list of available data sets - Map availableDataSets = new HashMap(getDataSets()); + Map availableDataSets = new HashMap<>(getDataSets()); // Get the property value of the aspect Serializable dataSetIds = nodeService.getProperty(filePlan, PROP_LOADED_DATA_SET_IDS); @@ -353,7 +353,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode return availableDataSets; } - return new HashMap(); + return new HashMap<>(); } /** @@ -397,7 +397,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode // Create "all" role group for root node String allRoles = authorityService.createAuthority(AuthorityType.GROUP, allRoleShortName, - RMAuthority.ALL_ROLES_DISPLAY_NAME, new HashSet(Arrays.asList(RMAuthority.ZONE_APP_RM))); + RMAuthority.ALL_ROLES_DISPLAY_NAME, new HashSet<>(Arrays.asList(RMAuthority.ZONE_APP_RM))); // Put all the role groups in it Set roles = filePlanRoleService.getRoles(rmRoot); @@ -504,7 +504,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode // Check if any data set has been imported if (dataSetIds == null) { - Map aspectProperties = new HashMap(1); + Map aspectProperties = new HashMap<>(1); aspectProperties.put(PROP_LOADED_DATA_SET_IDS, (Serializable) new ArrayList()); nodeService.addAspect(filePlan, ASPECT_LOADED_DATA_SET_ID, aspectProperties); loadedDataSetIds = (ArrayList) nodeService.getProperty(filePlan, PROP_LOADED_DATA_SET_IDS); @@ -516,7 +516,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode // Add the new loaded data set id loadedDataSetIds.add(dataSetId); - Map aspectProperties = new HashMap(1); + Map aspectProperties = new HashMap<>(1); aspectProperties.put(PROP_LOADED_DATA_SET_IDS, (Serializable) loadedDataSetIds); nodeService.addAspect(filePlan, ASPECT_LOADED_DATA_SET_ID, aspectProperties); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java index 4963de8248..339b7363a4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionDefinitionImpl.java @@ -203,7 +203,7 @@ public class DispositionActionDefinitionImpl implements DispositionActionDefinit Collection eventNames = (Collection)nodeService.getProperty(this.dispositionActionNodeRef, PROP_DISPOSITION_EVENT); if (eventNames != null) { - events = new ArrayList(eventNames.size()); + events = new ArrayList<>(eventNames.size()); for (String eventName : eventNames) { RecordsManagementEvent event = recordsManagementEventService.getEvent(eventName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java index 8329406e2b..d05cb64a85 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java @@ -211,7 +211,7 @@ public class DispositionActionImpl implements DispositionAction, this.dispositionNodeRef, ASSOC_EVENT_EXECUTIONS, RegexQNamePattern.MATCH_ALL); - List result = new ArrayList(assocs.size()); + List result = new ArrayList<>(assocs.size()); for (ChildAssociationRef assoc : assocs) { result.add(getEventCompletionDetailsFromNodeRef(assoc.getChildRef())); @@ -236,16 +236,14 @@ public class DispositionActionImpl implements DispositionAction, String eventName = (String)props.get(PROP_EVENT_EXECUTION_NAME); // create event completion details - EventCompletionDetails ecd = new EventCompletionDetails( + return new EventCompletionDetails( nodeRef, eventName, services.getRecordsManagementEventService().getEvent(eventName).getDisplayLabel(), getBooleanValue(props.get(PROP_EVENT_EXECUTION_AUTOMATIC), false), getBooleanValue(props.get(PROP_EVENT_EXECUTION_COMPLETE), false), - (Date)props.get(PROP_EVENT_EXECUTION_COMPLETED_AT), - (String)props.get(PROP_EVENT_EXECUTION_COMPLETED_BY)); - - return ecd; + (Date) props.get(PROP_EVENT_EXECUTION_COMPLETED_AT), + (String) props.get(PROP_EVENT_EXECUTION_COMPLETED_BY)); } /** @@ -392,7 +390,7 @@ public class DispositionActionImpl implements DispositionAction, List stepEvents = (List) services.getNodeService().getProperty(getDispositionActionDefinition().getNodeRef(), PROP_DISPOSITION_EVENT); List eventsList = getEventCompletionDetails(); - List nextActionEvents = new ArrayList(eventsList.size()); + List nextActionEvents = new ArrayList<>(eventsList.size()); for (EventCompletionDetails event : eventsList) { @@ -456,7 +454,7 @@ public class DispositionActionImpl implements DispositionAction, @Override public void addEventCompletionDetails(RecordsManagementEvent event) { - Map eventProps = new HashMap(7); + Map eventProps = new HashMap<>(7); eventProps.put(PROP_EVENT_EXECUTION_NAME, event.getName()); // TODO display label eventProps.put(PROP_EVENT_EXECUTION_AUTOMATIC, event.getRecordsManagementEventType().isAutomaticEvent()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java index eec7f3db4e..d07f2efc71 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java @@ -116,9 +116,9 @@ public class DispositionScheduleImpl implements DispositionSchedule, Boolean value = (Boolean)nodeService.getProperty(dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION); if (value != null) { - return value.booleanValue(); + return value; } - return null; + return false; } }); } @@ -179,10 +179,10 @@ public class DispositionScheduleImpl implements DispositionSchedule, this.dispositionDefinitionNodeRef, ASSOC_DISPOSITION_ACTION_DEFINITIONS, RegexQNamePattern.MATCH_ALL); - this.actions = new ArrayList(assocs.size()); - this.actionsById = new HashMap(assocs.size()); - this.actionsByName = new HashMap(assocs.size()); - this.actionsByDispositionActionName = new HashMap(assocs.size()); + this.actions = new ArrayList<>(assocs.size()); + this.actionsById = new HashMap<>(assocs.size()); + this.actionsByName = new HashMap<>(assocs.size()); + this.actionsByDispositionActionName = new HashMap<>(assocs.size()); int index = 0; for (ChildAssociationRef assoc : assocs) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java index 8d058be8ec..d3497a101a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionSelectionStrategy.java @@ -95,7 +95,7 @@ public class DispositionSelectionStrategy implements RecordsManagementModel } else { - SortedSet sortedFolders = new TreeSet(new DispositionableNodeRefComparator()); + SortedSet sortedFolders = new TreeSet<>(new DispositionableNodeRefComparator()); sortedFolders.addAll(recordFolders); recordFolder = sortedFolders.first(); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 5ea4319945..a0f76bab82 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -95,7 +95,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl * disposition schedule impl node under a record or folder. */ DATE_AND_NAME - }; + } /** Behaviour filter */ private BehaviourFilter behaviourFilter; @@ -116,7 +116,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl private FreezeService freezeService; /** Disposition properties */ - private Map dispositionProperties = new HashMap(4); + private Map dispositionProperties = new HashMap<>(4); /** * Set node service @@ -210,7 +210,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl nodeService.addAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE, null); } } - }; + } /** * @see org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService#refreshDispositionAction(NodeRef) @@ -254,7 +254,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl public Collection getDispositionProperties(boolean isRecordLevel, String dispositionAction) { Collection values = dispositionProperties.values(); - List result = new ArrayList(values.size()); + List result = new ArrayList<>(values.size()); for (DispositionProperty dispositionProperty : values) { boolean test = dispositionProperty.applies(isRecordLevel, dispositionAction); @@ -524,7 +524,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl private List getDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer) { List items = filePlanService.getAllContained(rmContainer); - List result = new ArrayList(items.size()); + List result = new ArrayList<>(items.size()); for (NodeRef item : items) { if (recordFolderService.isRecordFolder(item)) @@ -706,7 +706,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl } // Create the properties - Map props = new HashMap(10); + Map props = new HashMap<>(10); Date asOfDate = calculateAsOfDate(nodeRef, dispositionActionDefinition); @@ -925,7 +925,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl public List getCompletedDispositionActions(NodeRef nodeRef) { List assocs = nodeService.getChildAssocs(nodeRef, ASSOC_DISPOSITION_ACTION_HISTORY, RegexQNamePattern.MATCH_ALL); - List result = new ArrayList(assocs.size()); + List result = new ArrayList<>(assocs.size()); for (ChildAssociationRef assoc : assocs) { NodeRef dispositionActionNodeRef = assoc.getChildRef(); @@ -1192,7 +1192,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl public Void doWork() { // Apply the cut off aspect and set cut off date - Map cutOffProps = new HashMap(1); + Map cutOffProps = new HashMap<>(1); cutOffProps.put(PROP_CUT_OFF_DATE, new Date()); nodeService.addAspect(nodeRef, ASPECT_CUT_OFF, cutOffProps); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java index 214229395a..e025f2c042 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java @@ -166,7 +166,7 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme } else { - customMappings = new HashSet(); + customMappings = new HashSet<>(); // load the contents of the extractors property file Map> currentMapping = extracter.getCurrentMapping(); @@ -293,14 +293,14 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme private void updateExtractor() { // convert the mapping information into the form understood by the extractor - Map> newMapping = new HashMap>(17); + Map> newMapping = new HashMap<>(17); for(CustomMapping mapping : getCustomMappings()) { QName newQName = QName.createQName(mapping.getTo(), nspr); Set values = newMapping.get(mapping.getFrom()); if(values == null) { - values = new HashSet(); + values = new HashSet<>(); newMapping.put(mapping.getFrom(), values); } values.add(newQName); @@ -317,7 +317,7 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme */ private Set loadConfig() { - Set result = new HashSet(); + Set result = new HashSet<>(); ContentReader cr = contentService.getReader(CONFIG_NODE_REF, ContentModel.PROP_CONTENT); if (cr != null) { @@ -353,7 +353,7 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme if (!nodeService.exists(CONFIG_NODE_REF)) { // create the config node - Map properties = new HashMap(2); + Map properties = new HashMap<>(2); properties.put(ContentModel.PROP_NAME, CONFIG_NAME); properties.put(ContentModel.PROP_NODE_UUID, CONFIG_NODE_REF.getId()); nodeService.createNode( @@ -463,7 +463,7 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme */ private Set readOldConfig(NodeRef nodeRef) { - Set newMappings = new HashSet(); + Set newMappings = new HashSet<>(); ContentReader cr = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT); if (cr != null) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java index ae6113deed..9c510515a3 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java @@ -79,7 +79,7 @@ public class RFC822MetadataExtracter extends org.alfresco.repo.content.metadata. if (!nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD)) { // Remove all rm namespace properties from the system map - Map clone = new HashMap(systemProperties); + Map clone = new HashMap<>(systemProperties); for (QName propName : clone.keySet()) { if (RecordsManagementModel.RM_URI.equals(propName.getNamespaceURI())) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java index 66513469ac..3ebb01e7d7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java @@ -131,7 +131,7 @@ public class OnReferenceCreateEventType extends SimpleRecordsManagementEventType rmEvent.getType().equals(getName())) { // Complete the event - Map params = new HashMap(3); + Map params = new HashMap<>(3); params.put(CompleteEventAction.PARAM_EVENT_NAME, event.getEventName()); params.put(CompleteEventAction.PARAM_EVENT_COMPLETED_BY, AuthenticationUtil.getFullyAuthenticatedUser()); params.put(CompleteEventAction.PARAM_EVENT_COMPLETED_AT, new Date()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java index 1d3750d246..d2b09e1c75 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java @@ -246,7 +246,7 @@ public class OnReferencedRecordActionedUpon extends SimpleRecordsManagementEvent rmEvent.getType().equals(getName())) { // Complete the event - Map params = new HashMap(3); + Map params = new HashMap<>(3); params.put(CompleteEventAction.PARAM_EVENT_NAME, event.getEventName()); params.put(CompleteEventAction.PARAM_EVENT_COMPLETED_BY, AuthenticationUtil.getFullyAuthenticatedUser()); params.put(CompleteEventAction.PARAM_EVENT_COMPLETED_AT, new Date()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java index c161c04036..286a6cfe21 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java @@ -66,7 +66,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent private ContentService contentService; /** Registered event types */ - private Map eventTypes = new HashMap(7); + private Map eventTypes = new HashMap<>(7); /** Available events */ private Map events; @@ -104,7 +104,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent */ public List getEventTypes() { - return new ArrayList(this.eventTypes.values()); + return new ArrayList<>(this.eventTypes.values()); } /** @@ -112,7 +112,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent */ public List getEvents() { - return new ArrayList(this.getEventMap().values()); + return new ArrayList<>(this.getEventMap().values()); } /** @@ -300,7 +300,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent JSONObject configJSON = new JSONObject(jsonString); JSONArray eventsJSON = configJSON.getJSONArray("events"); - events = new HashMap(eventsJSON.length()); + events = new HashMap<>(eventsJSON.length()); for (int i = 0; i < eventsJSON.length(); i++) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java index a4d3fe75da..70a7b4bdc9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java @@ -51,5 +51,5 @@ public enum FilePlanComponentKind HOLD_CONTAINER, DISPOSITION_SCHEDULE, UNFILED_RECORD_CONTAINER, - UNFILED_RECORD_FOLDER; + UNFILED_RECORD_FOLDER } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java index 24a637367e..87e922b0e2 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java @@ -182,8 +182,8 @@ public class FilePlanServiceImpl extends ServiceBaseImpl { ParameterCheck.mandatory("storeRef", storeRef); - final Set results = new HashSet(); - Set aspects = new HashSet(1); + final Set results = new HashSet<>(); + Set aspects = new HashSet<>(1); aspects.add(ASPECT_RECORDS_MANAGEMENT_ROOT); getNodeDAO().getNodesWithAspects(aspects, Long.MIN_VALUE, Long.MAX_VALUE, new NodeDAO.NodeRefQueryCallback() { @@ -275,7 +275,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl } NodeRef result = null; - Pair key = new Pair(filePlan, containerName); + Pair key = new Pair<>(filePlan, containerName); if (!rootContainerCache.contains(key)) { @@ -344,7 +344,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl String allRoles = getFilePlanRoleService().getAllRolesContainerGroup(filePlan); // create the properties map - Map properties = new HashMap(1); + Map properties = new HashMap<>(1); properties.put(ContentModel.PROP_NAME, containerName); // create the unfiled container @@ -389,7 +389,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl } // Build map of properties - Map rmRootProps = new HashMap(1); + Map rmRootProps = new HashMap<>(1); if (properties != null && properties.size() != 0) { rmRootProps.putAll(properties); @@ -439,7 +439,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl */ public List getNodeRefPath(NodeRef nodeRef) { - LinkedList nodeRefPath = new LinkedList(); + LinkedList nodeRefPath = new LinkedList<>(); try { getNodeRefPathRecursive(nodeRef, nodeRefPath); @@ -501,7 +501,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl } // Set the properties for the record category - Map props = new HashMap(1); + Map props = new HashMap<>(1); if (properties != null && properties.size() != 0) { props.putAll(properties); @@ -576,7 +576,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CONTAINER_EXPECTED)); } - List result = new ArrayList(1); + List result = new ArrayList<>(1); List assocs = this.nodeService.getChildAssocs(container, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); for (ChildAssociationRef assoc : assocs) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java index 65724d81bb..809094fc34 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java @@ -127,7 +127,7 @@ public class FreezeServiceImpl extends ServiceBaseImpl @Deprecated public Set getFrozen(NodeRef hold) { - return new HashSet(getHoldService().getHeld(hold)); + return new HashSet<>(getHoldService().getHeld(hold)); } /** @@ -168,7 +168,7 @@ public class FreezeServiceImpl extends ServiceBaseImpl NodeRef hold = null; if (!nodeRefs.isEmpty()) { - List list = new ArrayList(nodeRefs); + List list = new ArrayList<>(nodeRefs); hold = createHold(list.get(0), reason); getHoldService().addToHold(hold, list); } @@ -260,7 +260,7 @@ public class FreezeServiceImpl extends ServiceBaseImpl { ParameterCheck.mandatory("filePlan", filePlan); - return new HashSet(getHoldService().getHolds(filePlan)); + return new HashSet<>(getHoldService().getHolds(filePlan)); } /** @@ -312,7 +312,7 @@ public class FreezeServiceImpl extends ServiceBaseImpl } // add aspect and set count - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(PROP_HELD_CHILDREN_COUNT, heldCount); getInternalNodeService().addAspect(nodeRef, ASPECT_HELD_CHILDREN, props); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java index 0cf330856e..a44f3c996b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java @@ -253,7 +253,7 @@ public class HoldServiceImpl extends ServiceBaseImpl { ParameterCheck.mandatory("filePlan", filePlan); - List holds = new ArrayList(); + List holds = new ArrayList<>(); // get the root hold container NodeRef holdContainer = filePlanService.getHoldContainer(filePlan); @@ -305,11 +305,11 @@ public class HoldServiceImpl extends ServiceBaseImpl // invert list to get list of holds that do not contain this node NodeRef filePlan = filePlanService.getFilePlan(nodeRef); List allHolds = getHolds(filePlan); - result = ListUtils.subtract(allHolds, new ArrayList(holdsNotIncludingNodeRef)); + result = ListUtils.subtract(allHolds, new ArrayList<>(holdsNotIncludingNodeRef)); } else { - result = new ArrayList(holdsNotIncludingNodeRef); + result = new ArrayList<>(holdsNotIncludingNodeRef); } return result; @@ -324,7 +324,7 @@ public class HoldServiceImpl extends ServiceBaseImpl private Set getParentHolds(NodeRef nodeRef) { List holdsAssocs = nodeService.getParentAssocs(nodeRef, ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_RECORDS); - Set holds = new HashSet(holdsAssocs.size()); + Set holds = new HashSet<>(holdsAssocs.size()); for (ChildAssociationRef holdAssoc : holdsAssocs) { holds.add(holdAssoc.getParentRef()); @@ -362,7 +362,7 @@ public class HoldServiceImpl extends ServiceBaseImpl public List getHeld(NodeRef hold) { ParameterCheck.mandatory("hold", hold); - List children = new ArrayList(); + List children = new ArrayList<>(); if (!isHold(hold)) { @@ -395,7 +395,7 @@ public class HoldServiceImpl extends ServiceBaseImpl NodeRef holdContainer = filePlanService.getHoldContainer(filePlan); // create map of properties - Map properties = new HashMap(3); + Map properties = new HashMap<>(3); properties.put(ContentModel.PROP_NAME, name); properties.put(PROP_HOLD_REASON, reason); if (description != null && !description.isEmpty()) @@ -468,7 +468,7 @@ public class HoldServiceImpl extends ServiceBaseImpl } }); - List heldNames = new ArrayList(); + List heldNames = new ArrayList<>(); for (NodeRef nodeRef : held) { try @@ -510,7 +510,7 @@ public class HoldServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("hold", hold); ParameterCheck.mandatory("nodeRef", nodeRef); - List holds = new ArrayList(1); + List holds = new ArrayList<>(1); holds.add(hold); addToHolds(Collections.unmodifiableList(holds), nodeRef); } @@ -576,7 +576,7 @@ public class HoldServiceImpl extends ServiceBaseImpl public Void doWork() { // gather freeze properties - Map props = new HashMap(2); + Map props = new HashMap<>(2); props.put(PROP_FROZEN_AT, new Date()); props.put(PROP_FROZEN_BY, AuthenticationUtil.getFullyAuthenticatedUser()); @@ -651,7 +651,7 @@ public class HoldServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("hold", hold); ParameterCheck.mandatory("nodeRef", nodeRef); - List holds = new ArrayList(1); + List holds = new ArrayList<>(1); holds.add(hold); removeFromHolds(Collections.unmodifiableList(holds), nodeRef); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java index b615c3cad0..b4637310d9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/identifier/IdentifierServiceImpl.java @@ -51,7 +51,7 @@ public class IdentifierServiceImpl implements IdentifierService private static Log logger = LogFactory.getLog(IdentifierServiceImpl.class); /** Registry map */ - private Map register = new HashMap(5); + private Map register = new HashMap<>(5); /** Node service */ private NodeService nodeService; @@ -88,7 +88,7 @@ public class IdentifierServiceImpl implements IdentifierService ParameterCheck.mandatory("type", type); // Build the context - Map context = new HashMap(2); + Map context = new HashMap<>(2); if (parent != null) { context.put(CONTEXT_PARENT_NODEREF, parent); @@ -107,7 +107,7 @@ public class IdentifierServiceImpl implements IdentifierService { ParameterCheck.mandatory("nodeRef", nodeRef); - Map context = new HashMap(3); + Map context = new HashMap<>(3); // Set the original type QName type = nodeService.getType(nodeRef); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index 5416c936a9..e59d5970e8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -226,7 +226,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute ChildAssociationRef parent = nodeService.getPrimaryParent(actionNode); if (parent.getTypeQName().equals(RecordsManagementModel.ASSOC_NEXT_DISPOSITION_ACTION)) { - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(RMDispositionActionExecuterAbstractBase.PARAM_NO_ERROR_CHECK, Boolean.FALSE); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java index 47e70aaa02..9e965071dd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/PublishUpdatesJobExecuter.java @@ -177,7 +177,7 @@ public class PublishUpdatesJobExecuter extends RecordsManagementJobExecuter } } return null; - }; + } }, AuthenticationUtil.getSystemUserName()); if (logger.isDebugEnabled()) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java index 0633165a22..cd4d4ed076 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/DispositionActionDefinitionPublishExecutor.java @@ -89,7 +89,7 @@ public class DispositionActionDefinitionPublishExecutor extends BasePublishExecu List updatedProps = (List)nodeService.getProperty(nodeRef, RecordsManagementModel.PROP_UPDATED_PROPERTIES); if (updatedProps != null) { - Map params = new HashMap(); + Map params = new HashMap<>(); params.put(BroadcastDispositionActionDefinitionUpdateAction.CHANGED_PROPERTIES, (Serializable)updatedProps); rmActionService.executeRecordsManagementAction(nodeRef, BroadcastDispositionActionDefinitionUpdateAction.NAME, params); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java index bd42b7158d..2510542a4c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/publish/PublishExecutorRegistry.java @@ -38,7 +38,7 @@ import java.util.Map; public class PublishExecutorRegistry { /** Map of publish executors */ - private Map publishExectors = new HashMap(3); + private Map publishExectors = new HashMap<>(3); /** * Register a publish executor diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java index 120b26c4d1..63088bf05e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java @@ -214,7 +214,7 @@ public abstract class BaseEvaluator implements RecordsManagementModel, BeanNameA */ public void setCapability(String capability) { - List list = new ArrayList(1); + List list = new ArrayList<>(1); list.add(capability); this.capabilities = list; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 04ca0201a0..f4f1891ba0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -110,10 +110,10 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS private DispositionService dispositionService; /** Indicators */ - private List indicators = new ArrayList(); + private List indicators = new ArrayList<>(); /** Actions */ - private List actions = new ArrayList(); + private List actions = new ArrayList<>(); /** The policy component */ private PolicyComponent policyComponent; @@ -443,7 +443,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS { public Map doWork() throws Exception { - Map result = new HashMap(); + Map result = new HashMap<>(); // File plan node reference NodeRef filePlan = filePlanService.getFilePlan(nodeRef); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java index 142c9d213f..9714f7ff1c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java @@ -65,7 +65,7 @@ public abstract class BaseBehaviourBean extends ServiceBaseImpl protected BehaviourFilter behaviourFilter; /** behaviour map */ - protected Map behaviours = new HashMap(7); + protected Map behaviours = new HashMap<>(7); /** * @param behaviourFilter behaviour filter diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java index 9c1770ea8a..95a77f610f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java @@ -667,7 +667,7 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel List eventsList = da.getEventCompletionDetails(); if (eventsList.size() > 0) { - eventNames = new ArrayList(eventsList.size()); + eventNames = new ArrayList<>(eventsList.size()); for (EventCompletionDetails event : eventsList) { eventNames.add(event.getEventName()); @@ -750,7 +750,7 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel // Only care about record folders if (nodeService.exists(nodeRef) && recordFolderService.isRecordFolder(nodeRef)) { - Set props = new HashSet(1); + Set props = new HashSet<>(1); props.add(PROP_REVIEW_PERIOD); Set changed = determineChangedProps(before, after); changed.retainAll(props); @@ -893,7 +893,7 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel */ private Set determineChangedProps(Map oldProps, Map newProps) { - Set result = new HashSet(); + Set result = new HashSet<>(); for (Map.Entry entry : oldProps.entrySet()) { QName qn = entry.getKey(); @@ -921,7 +921,7 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel */ private List getRecordFolders(NodeRef recordCategoryNode) { - List results = new ArrayList(8); + List results = new ArrayList<>(8); List folderAssocs = nodeService.getChildAssocs(recordCategoryNode, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java index 6364cea652..e23c242cbe 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java @@ -161,7 +161,7 @@ public class FilePlanComponentAspect extends BaseBehaviourBean { List scriptRefs = lookupScripts(oldProps, newProps); - Map objectModel = new HashMap(1); + Map objectModel = new HashMap<>(1); objectModel.put("node", nodeWithChangedProperties); objectModel.put("oldProperties", oldProps); objectModel.put("newProperties", newProps); @@ -183,7 +183,7 @@ public class FilePlanComponentAspect extends BaseBehaviourBean */ private List lookupScripts(Map oldProps, Map newProps) { - List result = new ArrayList(); + List result = new ArrayList<>(); Map changedProps = PropertyMap.getChangedProperties(oldProps, newProps); for (QName propQName : changedProps.keySet()) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java index d39e02a2f8..a5e2fe56eb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/QShareAspect.java @@ -36,7 +36,6 @@ import org.alfresco.repo.policy.annotation.Behaviour; import org.alfresco.repo.policy.annotation.BehaviourBean; import org.alfresco.repo.policy.annotation.BehaviourKind; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; /** @@ -49,13 +48,6 @@ import org.alfresco.service.namespace.QName; @BehaviourBean(defaultType = "qshare:shared") public class QShareAspect extends BaseBehaviourBean implements NodeServicePolicies.BeforeAddAspectPolicy { - private NodeService nodeService; - - public void setNodeService(NodeService nodeService) - { - this.nodeService = nodeService; - } - /** * Behaviour to prevent sharing a record * diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index cf5e19cf26..cdd64fd86e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -335,7 +335,7 @@ public class RecordAspect extends AbstractDisposableItem NodeRef scriptNodeRef = nodeService.getChildByName(scriptsFolderNodeRef, ContentModel.ASSOC_CONTAINS, expectedScriptName); if (scriptNodeRef != null) { - Map objectModel = new HashMap(1); + Map objectModel = new HashMap<>(1); objectModel.put("node", from); objectModel.put("toNode", to); objectModel.put("policy", policy); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java index a649cf3ebc..9d2a20e4c1 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java @@ -75,13 +75,13 @@ public class DispositionActionDefinitionType extends BaseBehaviourBean if (nodeService.exists(nodeRef)) { // Determine the properties that have changed - Set changedProps = new HashSet(PropertyMap.getChangedProperties(before, after).keySet()); + Set changedProps = new HashSet<>(PropertyMap.getChangedProperties(before, after).keySet()); changedProps.addAll(PropertyMap.getAddedProperties(before, after).keySet()); if (!nodeService.hasAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE)) { // Apply the unpublished aspect - Map props = new HashMap(); + Map props = new HashMap<>(); props.put(PROP_UPDATE_TO, UPDATE_TO_DISPOSITION_ACTION_DEFINITION); props.put(PROP_UPDATED_PROPERTIES, (Serializable)changedProps); nodeService.addAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE, props); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java index 21e70eed60..7e27bb01d7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java @@ -64,7 +64,7 @@ public class RecordCategoryType extends BaseBehaviourBean implements NodeServicePolicies.OnCreateChildAssociationPolicy, NodeServicePolicies.OnCreateNodePolicy { - private final static List ACCEPTED_UNIQUE_CHILD_TYPES = new ArrayList(); + private final static List ACCEPTED_UNIQUE_CHILD_TYPES = new ArrayList<>(); private final static List ACCEPTED_NON_UNIQUE_CHILD_TYPES = Arrays.asList(TYPE_RECORD_CATEGORY, TYPE_RECORD_FOLDER); /** vital record service */ @@ -226,7 +226,7 @@ public class RecordCategoryType extends BaseBehaviourBean @Override public boolean getMustCopy(QName classQName, CopyDetails copyDetails) { - return nodeService.getType(copyDetails.getTargetParentNodeRef()).equals(TYPE_RECORD_FOLDER) ? false : true; + return !nodeService.getType(copyDetails.getTargetParentNodeRef()).equals(TYPE_RECORD_FOLDER); } }; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java index fe2063d735..03ee7632bf 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java @@ -96,7 +96,7 @@ public class RmSiteType extends BaseBehaviourBean private FilePlanType filePlanType; /** Map of file plan type's key'ed by corresponding site types */ - protected Map mapFilePlanType = new HashMap(3); + protected Map mapFilePlanType = new HashMap<>(3); /** * Set the site service @@ -329,7 +329,7 @@ public class RmSiteType extends BaseBehaviourBean { final NodeRef child = childAssocRef.getChildRef(); final NodeRef parent = childAssocRef.getParentRef(); - List acceptedUniqueChildTypes = new ArrayList(); + List acceptedUniqueChildTypes = new ArrayList<>(); SiteInfo siteInfo = siteService.getSite(parent); acceptedUniqueChildTypes.add(getFilePlanType(siteInfo)); // check the created child is of an accepted type diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java index 1e29d2ca66..13df5544dc 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java @@ -73,10 +73,10 @@ public class ModelSecurityServiceImpl extends BaseBehaviourBean private FilePlanService filePlanService; /** Map of protected properties keyed by name */ - private Map protectedProperties = new HashMap(21); + private Map protectedProperties = new HashMap<>(21); /** Map of protected aspects keyed by name */ - private Map protectedAspects= new HashMap(21); + private Map protectedAspects= new HashMap<>(21); /** * @see org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService#setEnabled(boolean) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java index 48da7ad748..b0d6ebe226 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ProtectedModelArtifact.java @@ -88,8 +88,7 @@ public abstract class ProtectedModelArtifact */ public void setName(String name) { - QName qname = QName.createQName(name, namespaceService); - this.name = qname; + this.name = QName.createQName(name, namespaceService); } /** @@ -123,7 +122,7 @@ public abstract class ProtectedModelArtifact { if (capabilityNames == null && capabilities != null) { - capabilityNames = new HashSet(capabilities.size()); + capabilityNames = new HashSet<>(capabilities.size()); for (Capability capability : capabilities) { capabilityNames.add(capability.getName()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java index 28059b88ed..25b2d2266d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java @@ -257,7 +257,7 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod notificationContext.setIgnoreNotificationFailure(true); notificationContext.setBodyTemplate(getDueForReviewTemplate().toString()); - Map args = new HashMap(1, 1.0f); + Map args = new HashMap<>(1, 1.0f); args.put("records", (Serializable) records); args.put("site", getSiteName(root)); notificationContext.setTemplateArgs(args); @@ -300,7 +300,7 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod notificationContext.setIgnoreNotificationFailure(true); notificationContext.setBodyTemplate(supersededTemplate.toString()); - Map args = new HashMap(1, 1.0f); + Map args = new HashMap<>(1, 1.0f); args.put("record", record); args.put("site", getSiteName(root)); notificationContext.setTemplateArgs(args); @@ -335,7 +335,7 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod Date rejectDate = (Date) nodeService.getProperty(record, PROP_RECORD_REJECTION_DATE); String recordName = (String) nodeService.getProperty(record, ContentModel.PROP_NAME); - Map args = new HashMap(8); + Map args = new HashMap<>(8); args.put("record", record); args.put("site", site); args.put("recordCreator", recordCreator); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java index 4b4f995733..bbffd1b7d7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java @@ -64,7 +64,7 @@ public class ModulePatchExecuterImpl extends AbstractModuleComponent protected AttributeService attributeService; /** module patches */ - protected Map modulePatches = new HashMap(21); + protected Map modulePatches = new HashMap<>(21); /** * @param attributeService attribute service @@ -119,7 +119,7 @@ public class ModulePatchExecuterImpl extends AbstractModuleComponent if (moduleSchema > currentSchema) { // determine what patches should be applied - List patchesToApply = new ArrayList(13); + List patchesToApply = new ArrayList<>(13); for (ModulePatch modulePatch : modulePatches.values()) { if (modulePatch.getFixesFromSchema() <= currentSchema && diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java index 7ae4f1eed9..a56609bb9d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java @@ -176,7 +176,7 @@ public class NotificationTemplatePatch extends ModulePatchComponent nodeService.addAspect(template, ContentModel.ASPECT_VERSIONABLE, null); // Create version (before template is updated) - Map versionProperties = new HashMap(2); + Map versionProperties = new HashMap<>(2); versionProperties.put(Version.PROP_DESCRIPTION, "Initial version"); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); versionService.createVersion(template, versionProperties); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java index 53111b5c15..0e866b0b3a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java @@ -101,7 +101,7 @@ public class NotificationTemplatePatch_v21 extends RMv21PatchComponent NodeRef parent = nodeService.getPrimaryParent(supersededTemplate).getParentRef(); // build the node properties - Map props = new HashMap(4); + Map props = new HashMap<>(4); props.put(ContentModel.PROP_DESCRIPTION, "Record superseded email template."); props.put(ContentModel.PROP_TITLE, "record-rejected-email.ftl"); props.put(ContentModel.PROP_NAME, "record-rejected-email.ftl"); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java index 8927506745..02e7b39edb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java @@ -120,7 +120,7 @@ public class RMv21BehaviorScriptsPatch extends RMv21PatchComponent implements Be String newBehaviorScriptsNodeUUID = "rm_behavior_scripts"; String newBehaviorScriptsAssocQName = "records_management_behavior_scripts"; - Map newBehaviorScriptsFolderProps = new HashMap(); + Map newBehaviorScriptsFolderProps = new HashMap<>(); newBehaviorScriptsFolderProps.put(ContentModel.PROP_NODE_UUID, newBehaviorScriptsNodeUUID); newBehaviorScriptsFolderProps.put(ContentModel.PROP_NAME, newBehaviorScriptsFolderName); newBehaviorScriptsFolderProps.put(ContentModel.PROP_TITLE, newBehaviorScriptsFolderName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java index 117c771702..7bc09b0899 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21InPlacePatch.java @@ -186,7 +186,7 @@ public class RMv21InPlacePatch extends RMv21PatchComponent private Set getCapabilities(String[] capabilityNames) { - Set capabilities = new HashSet(3); + Set capabilities = new HashSet<>(3); for (String capabilityName : capabilityNames) { capabilities.add(capabilityService.getCapability(capabilityName)); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java index 31d217df98..588e7ebe78 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java @@ -127,7 +127,7 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent private NodeRef createNode(NodeRef parent, QName type, String id, String name, String assocName, String title, String description) { - Map props = new HashMap(4); + Map props = new HashMap<>(4); props.put(ContentModel.PROP_DESCRIPTION, description); props.put(ContentModel.PROP_TITLE, title); props.put(ContentModel.PROP_NAME, name); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java index d6fd453761..a68b403c0b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java @@ -113,6 +113,6 @@ public class RMv21RolesPatch extends RMv21PatchComponent implements BeanNameAwar private void addAuthorityToZone(String roleGroupName) { - authorityService.addAuthorityToZones(roleGroupName, new HashSet(Arrays.asList(RMAuthority.ZONE_APP_RM))); + authorityService.addAuthorityToZones(roleGroupName, new HashSet<>(Arrays.asList(RMAuthority.ZONE_APP_RM))); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java index f69cd476cf..6edff9c748 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22GhostOnDestroyDispositionActionPatch.java @@ -121,7 +121,7 @@ public class RMv22GhostOnDestroyDispositionActionPatch extends AbstractModulePat */ private void processFilePlan(NodeRef filePlan) { - Set dispositionSchedules = new HashSet(); + Set dispositionSchedules = new HashSet<>(); getDispositionSchedules(filePlan, dispositionSchedules); for (DispositionSchedule dispositionSchedule : dispositionSchedules) { @@ -178,7 +178,7 @@ public class RMv22GhostOnDestroyDispositionActionPatch extends AbstractModulePat RecordsManagementModel.PROP_DISPOSITION_ACTION_GHOST_ON_DESTROY); if (ghostOnDestroyValue == null) { - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_GHOST_ON_DESTROY, this.ghostingEnabled ? "ghost" : "destroy"); this.dispositionService.updateDispositionActionDefinition(actionDefinition, props); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22HoldReportPatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22HoldReportPatch.java index 5711c2c994..48c79cd4df 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22HoldReportPatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22HoldReportPatch.java @@ -93,7 +93,7 @@ public class RMv22HoldReportPatch extends AbstractModulePatch QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName("report_rmr_holdReport.html.ftl")); // build the node properties - Map props = new HashMap(4); + Map props = new HashMap<>(4); props.put(ContentModel.PROP_DESCRIPTION, "Hold report template."); props.put(ContentModel.PROP_TITLE, "Hold Report Template"); props.put(ContentModel.PROP_NAME, "report_rmr_holdReport.html.ftl"); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java index 20e94bb14f..59729c79a0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java @@ -97,7 +97,7 @@ public class RMv22ReportTemplatePatch extends AbstractModulePatch QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName("report_rmr_transferReport.html.ftl")); // build the node properties - Map props = new HashMap(4); + Map props = new HashMap<>(4); props.put(ContentModel.PROP_DESCRIPTION, "Transfer report template."); props.put(ContentModel.PROP_TITLE, "Transfer Report Template"); props.put(ContentModel.PROP_NAME, "report_rmr_transferReport.html.ftl"); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java index 207f3f69d5..57e879cc0b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java @@ -101,7 +101,7 @@ public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO, if (pair != null) { // create query params - Map params = new HashMap(2); + Map params = new HashMap<>(2); params.put("qnameId", pair.getFirst()); params.put("idValue", identifierValue); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java index 882290659d..927215177b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java @@ -710,7 +710,7 @@ public class RecordServiceImpl extends BaseBehaviourBean if (recordMetaDataAspects == null) { // create map - recordMetaDataAspects = new HashMap>(); + recordMetaDataAspects = new HashMap<>(); // init with legacy aspects initRecordMetaDataMap(); @@ -764,7 +764,7 @@ public class RecordServiceImpl extends BaseBehaviourBean else { // create a new set for the file plan type - filePlanTypes = new HashSet(1); + filePlanTypes = new HashSet<>(1); getRecordMetadataAspectsMap().put(recordMetadataAspect, filePlanTypes); } @@ -834,7 +834,7 @@ public class RecordServiceImpl extends BaseBehaviourBean @Override public Set getRecordMetadataAspects(QName filePlanType) { - Set result = new HashSet(getRecordMetadataAspectsMap().size()); + Set result = new HashSet<>(getRecordMetadataAspectsMap().size()); for (Entry> entry : getRecordMetadataAspectsMap().entrySet()) { @@ -913,7 +913,7 @@ public class RecordServiceImpl extends BaseBehaviourBean } // save the information about the originating details - Map aspectProperties = new HashMap(3); + Map aspectProperties = new HashMap<>(3); aspectProperties.put(PROP_RECORD_ORIGINATING_LOCATION, parentAssoc.getParentRef()); aspectProperties.put(PROP_RECORD_ORIGINATING_USER_ID, owner); aspectProperties.put(PROP_RECORD_ORIGINATING_CREATION_DATE, new Date()); @@ -1731,7 +1731,7 @@ public class RecordServiceImpl extends BaseBehaviourBean { ParameterCheck.mandatory("recordFolder", recordFolder); - List result = new ArrayList(1); + List result = new ArrayList<>(1); if (recordFolderService.isRecordFolder(recordFolder)) { List assocs = nodeService.getChildAssocs(recordFolder, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordableversion/RecordableVersionConfigServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordableversion/RecordableVersionConfigServiceImpl.java index de1885222f..37c207942f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordableversion/RecordableVersionConfigServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordableversion/RecordableVersionConfigServiceImpl.java @@ -81,7 +81,7 @@ public class RecordableVersionConfigServiceImpl implements RecordableVersionConf mandatory("nodeRef", nodeRef); RecordableVersionPolicy[] recordableVersionPolicies = RecordableVersionPolicy.values(); - List versions = new ArrayList(recordableVersionPolicies.length); + List versions = new ArrayList<>(recordableVersionPolicies.length); for (RecordableVersionPolicy recordableVersionPolicy : recordableVersionPolicies) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java index 76c702e2dc..2a1add5bf8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java @@ -220,7 +220,7 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_RECORD_FOLDER_TYPE, type.toString())); } - Map props = new HashMap(1); + Map props = new HashMap<>(1); if (properties != null && properties.size() != 0) { props.putAll(properties); @@ -270,7 +270,7 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl { ParameterCheck.mandatory("record", record); - List result = new ArrayList(1); + List result = new ArrayList<>(1); if (recordService.isRecord(record)) { List assocs = nodeService.getParentAssocs(record, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java index df7d19cfe2..3b13f4aeab 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java @@ -39,5 +39,5 @@ import org.alfresco.api.AlfrescoPublicApi; public enum RelationshipType { BIDIRECTIONAL, - PARENTCHILD; + PARENTCHILD } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java index cf8fec6c8f..b27902abb9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/ReportServiceImpl.java @@ -52,7 +52,7 @@ public class ReportServiceImpl extends ServiceBaseImpl protected RecordService recordService; /** report generator registry */ - private Map registry = new HashMap(); + private Map registry = new HashMap<>(); /** * @param recordService record service diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java index ed8799b00d..2043736369 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java @@ -251,7 +251,7 @@ public class DeclarativeReportGenerator extends BaseReportGenerator */ protected Map createTemplateModel(NodeRef templateNodeRef, NodeRef reportedUponNodeRef, Map properties) { - Map model = new HashMap(); + Map model = new HashMap<>(); // build the default model NodeRef person = repository.getPerson(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java index 395622802e..3c16b07ede 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/ReportInfo.java @@ -49,7 +49,7 @@ import org.springframework.extensions.surf.util.ParameterCheck; private String reportName; - private Map reportProperties = new HashMap(21); + private Map reportProperties = new HashMap<>(21); /** content reader */ private ContentReader reportContent; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/transfer/TransferReportGenerator.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/transfer/TransferReportGenerator.java index 26eaf123e8..8de4d9297c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/transfer/TransferReportGenerator.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/transfer/TransferReportGenerator.java @@ -78,7 +78,7 @@ public class TransferReportGenerator extends DeclarativeReportGenerator String dispositionAuthority = getDispositionAuthority(transferNodes); // Save to the properties map - Map properties = new HashMap(2); + Map properties = new HashMap<>(2); properties.put("transferNodes", (ArrayList) transferNodes); properties.put("dispositionAuthority", dispositionAuthority); @@ -94,7 +94,7 @@ public class TransferReportGenerator extends DeclarativeReportGenerator private List getTransferNodes(NodeRef nodeRef) { List assocs = nodeService.getChildAssocs(nodeRef, RecordsManagementModel.ASSOC_TRANSFERRED, RegexQNamePattern.MATCH_ALL); - List transferNodes = new ArrayList(assocs.size()); + List transferNodes = new ArrayList<>(assocs.size()); for (ChildAssociationRef assoc : assocs) { NodeRef childRef = assoc.getChildRef(); @@ -112,7 +112,7 @@ public class TransferReportGenerator extends DeclarativeReportGenerator */ private Map getTransferNodeProperties(NodeRef childRef) { - Map transferNodeProperties = new HashMap(6); + Map transferNodeProperties = new HashMap<>(6); boolean isFolder = dictionaryService.isSubClass(nodeService.getType(childRef), ContentModel.TYPE_FOLDER); transferNodeProperties.put("isFolder", isFolder); @@ -139,7 +139,7 @@ public class TransferReportGenerator extends DeclarativeReportGenerator */ private List getRecords(NodeRef childRef) { - List records = new ArrayList(4); + List records = new ArrayList<>(4); List assocs = nodeService.getChildAssocs(childRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); for (ChildAssociationRef child : assocs) { @@ -162,7 +162,7 @@ public class TransferReportGenerator extends DeclarativeReportGenerator */ private Map getCommonProperties(NodeRef nodeRef) { - Map transferNodeProperties = new HashMap(3); + Map transferNodeProperties = new HashMap<>(3); Map properties = nodeService.getProperties(nodeRef); String name = (String) properties.get(ContentModel.PROP_NAME); @@ -182,7 +182,7 @@ public class TransferReportGenerator extends DeclarativeReportGenerator */ private Map getFolderProperties(NodeRef folder) { - Map transferNodeProperties = new HashMap(3); + Map transferNodeProperties = new HashMap<>(3); Map commonProperties = getCommonProperties(folder); ArrayList records = (ArrayList) getRecords(folder); @@ -200,7 +200,7 @@ public class TransferReportGenerator extends DeclarativeReportGenerator */ private Map getRecordProperties(NodeRef record) { - Map transferNodeProperties = new HashMap(5); + Map transferNodeProperties = new HashMap<>(5); Map properties = nodeService.getProperties(record); String declaredBy = (String) properties.get(RecordsManagementModel.PROP_DECLARED_BY); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java index 09a55aca95..c7515ee39b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java @@ -176,7 +176,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { public List doWork() { - List systemContainers = new ArrayList(3); + List systemContainers = new ArrayList<>(3); //In a multi tenant store we need to initialize the rm config if it has been done yet NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CONFIG_NODEID); @@ -190,7 +190,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, AuthorityType.GROUP, getAllRolesGroupShortName(filePlan), I18NUtil.getMessage(MSG_ALL_ROLES), - new HashSet(Arrays.asList(RMAuthority.ZONE_APP_RM))); + new HashSet<>(Arrays.asList(RMAuthority.ZONE_APP_RM))); // Set the permissions permissionService.setInheritParentPermissions(filePlan, false); @@ -314,7 +314,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, } // Get the roles capabilities - Set capabilities = new HashSet(30); + Set capabilities = new HashSet<>(30); if (object.has(JSON_CAPABILITIES)) { JSONArray arrCaps = object.getJSONArray(JSON_CAPABILITIES); @@ -408,7 +408,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { public Set doWork() { - Set result = new HashSet(13); + Set result = new HashSet<>(13); Set roleAuthorities = authorityService.getAllAuthoritiesInZone(getZoneName(rmRootNode), AuthorityType.GROUP); for (String roleAuthority : roleAuthorities) @@ -453,7 +453,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { public Set doWork() { - Set result = new HashSet(13); + Set result = new HashSet<>(13); Set roleAuthorities = authorityService.getAllAuthoritiesInZone(getZoneName(rmRootNode), AuthorityType.GROUP); for (String roleAuthority : roleAuthorities) @@ -479,7 +479,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, return result; } }, AuthenticationUtil.getSystemUserName()); - }; + } /** * @@ -550,7 +550,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, private Set getCapabilitiesImpl(NodeRef rmRootNode, String roleAuthority) { Set permissions = permissionService.getAllSetPermissions(rmRootNode); - Set capabilities = new HashSet(52); + Set capabilities = new HashSet<>(52); for (AccessPermission permission : permissions) { if (permission.getAuthority().equals(roleAuthority)) @@ -628,7 +628,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, } // Create a group that relates to the records management role - Set zones = new HashSet(2); + Set zones = new HashSet<>(2); zones.add(getZoneName(filePlan)); zones.add(RMAuthority.ZONE_APP_RM); @@ -791,7 +791,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, ParameterCheck.mandatory("filePlan", filePlan); ParameterCheck.mandatory("roleName", role); - Set result = new HashSet(21); + Set result = new HashSet<>(21); result.addAll(getUsersAssignedToRole(filePlan, role)); result.addAll(getGroupsAssignedToRole(filePlan, role)); return result; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java index 486c3f80ae..130dffa71b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java @@ -132,7 +132,7 @@ public class ApplyDodCertModelFixesGet extends DeclarativeWebScript //MOB-1621. Custom fields should be created as untokenized by default. LOGGER.info("MOB-1621. Custom fields should be created as untokenized by default."); - List allCustomPropertiesAspects = new ArrayList(4); + List allCustomPropertiesAspects = new ArrayList<>(4); allCustomPropertiesAspects.add(RMC_CUSTOM_RECORD_SERIES_PROPERTIES); allCustomPropertiesAspects.add(RMC_CUSTOM_RECORD_CATEGORY_PROPERTIES); allCustomPropertiesAspects.add(RMC_CUSTOM_RECORD_FOLDER_PROPERTIES); @@ -155,7 +155,7 @@ public class ApplyDodCertModelFixesGet extends DeclarativeWebScript LOGGER.info("Completed application of webscript-based patches to RM custom model in the repo."); - Map model = new HashMap(1, 1.0f); + Map model = new HashMap<>(1, 1.0f); model.put("success", true); return model; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java index 9a608da10a..1cbcdeb8e4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java @@ -106,7 +106,7 @@ public class ApplyFixMob1573Get extends DeclarativeWebScript writeCustomContentModel(customModel); - Map model = new HashMap(1, 1.0f); + Map model = new HashMap<>(1, 1.0f); model.put("success", true); return model; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java index 9245d72526..e927c08f14 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogDelete.java @@ -51,7 +51,7 @@ public class AuditLogDelete extends BaseAuditAdminWebScript this.rmAuditService.clearAuditLog(getDefaultFilePlan()); // create model object with the audit status model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("auditstatus", createAuditStatusModel()); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java index 9e880b37bd..a07ff9790d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java @@ -138,7 +138,7 @@ public class AuditLogGet extends BaseAuditRetrievalWebScript boolean attach = false; String attachFileName = null; String export = req.getParameter(PARAM_EXPORT); - if (export != null && Boolean.parseBoolean(export)) + if (Boolean.parseBoolean(export)) { attach = true; attachFileName = auditTrail.getName(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java index fc21b7d627..e3cf5e6b3f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogPut.java @@ -78,7 +78,7 @@ public class AuditLogPut extends BaseAuditAdminWebScript } // create model object with the audit status model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("auditstatus", createAuditStatusModel()); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java index 78b0da1824..b1316465ab 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogStatusGet.java @@ -76,7 +76,7 @@ public class AuditLogStatusGet extends DeclarativeWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("enabled", Boolean.valueOf(rmAuditService.isAuditLogEnabled(getDefaultFilePlan()))); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java index 261ca51d9b..f81b467762 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseAuditAdminWebScript.java @@ -75,7 +75,7 @@ public class BaseAuditAdminWebScript extends DeclarativeWebScript */ protected Map createAuditStatusModel() { - Map auditStatus = new HashMap(3); + Map auditStatus = new HashMap<>(3); auditStatus.put("started", ISO8601DateFormat.format(rmAuditService.getDateAuditLogLastStarted(getDefaultFilePlan()))); auditStatus.put("stopped", ISO8601DateFormat.format(rmAuditService.getDateAuditLogLastStopped(getDefaultFilePlan()))); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java index f7f2f60bd5..593aa2a6b8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java @@ -83,7 +83,7 @@ public abstract class BaseTransferWebScript extends StreamACP // construct model for template Status status = new Status(); Cache cache = new Cache(getDescription().getRequiredCache()); - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("status", status); model.put("cache", cache); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java index 6e6e747f7c..fd6387024a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java @@ -219,7 +219,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript recordsManagementSearchBehaviour, dispositionService, recordFolderService); - Map model = new HashMap(1, 1.0f); + Map model = new HashMap<>(1, 1.0f); model.put("success", true); return model; @@ -269,7 +269,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript String allRoles = authorityService.createAuthority(AuthorityType.GROUP, allRoleShortName, RMAuthority.ALL_ROLES_DISPLAY_NAME, - new HashSet(Arrays.asList(RMAuthority.ZONE_APP_RM))); + new HashSet<>(Arrays.asList(RMAuthority.ZONE_APP_RM))); // Put all the role groups in it Set roles = recordsManagementSecurityService.getRoles(rmRoot); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java index 16ee58cc04..27ab24f82a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java @@ -111,7 +111,7 @@ public class CustomPropertyDefinitionDelete extends AbstractRmWebScript */ protected Map removePropertyDefinition(QName propQName) throws JSONException { - Map result = new HashMap(); + Map result = new HashMap<>(); rmAdminService.removeCustomPropertyDefinition(propQName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java index c75c72c20e..12ce54b397 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPost.java @@ -91,7 +91,7 @@ public class CustomPropertyDefinitionPost extends BaseCustomPropertyWebScript catch (CustomMetadataException e) { status.setCode(Status.STATUS_BAD_REQUEST); - ftlModel = new HashMap(); + ftlModel = new HashMap<>(); ftlModel.put(MESSAGE, e.getMessage()); } } @@ -115,7 +115,7 @@ public class CustomPropertyDefinitionPost extends BaseCustomPropertyWebScript protected Map createPropertyDefinition(WebScriptRequest req, JSONObject json) throws JSONException, CustomMetadataException { - Map result = new HashMap(); + Map result = new HashMap<>(); Map params = getParamsFromUrlAndJson(req, json); QName propertyQName = createNewPropertyDefinition(params); @@ -134,7 +134,7 @@ public class CustomPropertyDefinitionPost extends BaseCustomPropertyWebScript throws JSONException { Map params; - params = new HashMap(); + params = new HashMap<>(); params.put(PARAM_ELEMENT, req.getParameter(PARAM_ELEMENT)); for (Iterator iter = json.keys(); iter.hasNext(); ) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java index 6399a5f393..f490951e4c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java @@ -84,7 +84,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript catch (CustomMetadataException e) { status.setCode(Status.STATUS_BAD_REQUEST); - ftlModel = new HashMap(); + ftlModel = new HashMap<>(); ftlModel.put(MESSAGE, e.getMessage()); } } @@ -109,7 +109,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript protected Map handlePropertyDefinitionUpdate(WebScriptRequest req, JSONObject json) throws JSONException, CustomMetadataException { - Map result = new HashMap(); + Map result = new HashMap<>(); Map params = getParamsFromUrlAndJson(req, json); @@ -161,7 +161,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript if (constraintRef == null) { result = rmAdminService.removeCustomPropertyDefinitionConstraints(propQName); - updated = constraints.isEmpty() ? false : true; + updated = !constraints.isEmpty(); } else { @@ -209,7 +209,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript throws JSONException { Map params; - params = new HashMap(); + params = new HashMap<>(); Map templateVars = req.getServiceMatch().getTemplateVars(); String propId = templateVars.get(PROP_ID); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java index c305521f7c..16c8c85a3b 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java @@ -73,7 +73,7 @@ public class CustomPropertyDefinitionsGet extends BaseCustomPropertyWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); Map templateVars = req.getServiceMatch().getTemplateVars(); String propId = templateVars.get(PROP_ID); @@ -90,7 +90,7 @@ public class CustomPropertyDefinitionsGet extends BaseCustomPropertyWebScript // If propId has been provided then this is a request for a single custom-property-defn. // else it is a request for all defined on the specified element. - List propData = new ArrayList(); + List propData = new ArrayList<>(); if (propId != null) { QName propQName = rmAdminService.getQNameForClientId(propId); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java index 26783d2e98..e0ef973a6c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefDelete.java @@ -108,7 +108,7 @@ public class CustomRefDelete extends AbstractRmWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); try { getRuleService().disableRuleType(RuleType.OUTBOUND); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java index 15a8c9a4f4..3974eee7b9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java @@ -109,7 +109,7 @@ public class CustomRefPost extends AbstractRmWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); try { getRuleService().disableRuleType(RuleType.INBOUND); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java index e826d736fd..1c2b69f138 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPost.java @@ -60,7 +60,7 @@ public class CustomReferenceDefinitionPost extends CustomReferenceDefinitionBase RelationshipDisplayName displayName = createDisplayName(requestContent); RelationshipDefinition relationshipDefinition = getRelationshipService().createRelationshipDefinition(displayName); - Map model = new HashMap(); + Map model = new HashMap<>(); String servicePath = req.getServicePath(); Map customRelationshipData = createRelationshipDefinitionData(relationshipDefinition, servicePath); model.putAll(customRelationshipData); @@ -77,7 +77,7 @@ public class CustomReferenceDefinitionPost extends CustomReferenceDefinitionBase */ private Map createRelationshipDefinitionData(RelationshipDefinition relationshipDefinition, String servicePath) { - Map relationshipDefinitionData = new HashMap(4); + Map relationshipDefinitionData = new HashMap<>(4); String uniqueName = relationshipDefinition.getUniqueName(); relationshipDefinitionData.put(REFERENCE_TYPE, relationshipDefinition.getType().toString()); relationshipDefinitionData.put(REF_ID, uniqueName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java index d0312e18e6..ce98d6d4b9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionPut.java @@ -62,7 +62,7 @@ public class CustomReferenceDefinitionPut extends CustomReferenceDefinitionBase RelationshipDisplayName displayName = createDisplayName(requestContent); getRelationshipService().updateRelationshipDefinition(uniqueName, displayName); - Map model = new HashMap(); + Map model = new HashMap<>(); String servicePath = req.getServicePath(); Map customReferenceData = createRelationshipDefinitionData(servicePath, uniqueName); model.putAll(customReferenceData); @@ -79,7 +79,7 @@ public class CustomReferenceDefinitionPut extends CustomReferenceDefinitionBase */ private Map createRelationshipDefinitionData(String servicePath, String uniqueName) { - Map relationshipDefinitionData = new HashMap(3); + Map relationshipDefinitionData = new HashMap<>(3); relationshipDefinitionData.put(URL, servicePath); relationshipDefinitionData.put(REF_ID, uniqueName); relationshipDefinitionData.put(SUCCESS, Boolean.TRUE); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java index 11293b516b..330ab54d9d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomReferenceDefinitionsGet.java @@ -65,7 +65,7 @@ public class CustomReferenceDefinitionsGet extends CustomReferenceDefinitionBase Set relationshipDefinitions = getRelationshipDefinitons(uniqueName); List> relationshipDefinitionData = createRelationshipDefinitionData(relationshipDefinitions); - Map model = new HashMap(); + Map model = new HashMap<>(); model.put(CUSTOM_REFS, relationshipDefinitionData); return model; } @@ -80,7 +80,7 @@ public class CustomReferenceDefinitionsGet extends CustomReferenceDefinitionBase */ private Set getRelationshipDefinitons(String uniqueName) { - Set relationshipDefinitions = new HashSet(); + Set relationshipDefinitions = new HashSet<>(); if (isBlank(uniqueName)) { @@ -106,11 +106,11 @@ public class CustomReferenceDefinitionsGet extends CustomReferenceDefinitionBase */ private List> createRelationshipDefinitionData(Set relationshipDefinitions) { - List> relationshipDefinitionData = new ArrayList>(); + List> relationshipDefinitionData = new ArrayList<>(); for (RelationshipDefinition relationshipDefinition : relationshipDefinitions) { - Map data = new HashMap(); + Map data = new HashMap<>(); RelationshipType type = relationshipDefinition.getType(); RelationshipDisplayName displayName = relationshipDefinition.getDisplayName(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java index 1a2618359e..0e82825f0e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefsGet.java @@ -126,7 +126,7 @@ public class CustomRefsGet extends AbstractRmWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(4); + Map model = new HashMap<>(4); NodeRef nodeRef = parseRequestForNodeRef(req); model.put(NODE_NAME, getNodeService().getProperty(nodeRef, ContentModel.PROP_NAME)); model.put(NODE_TITLE, getNodeService().getProperty(nodeRef, ContentModel.PROP_TITLE)); @@ -143,7 +143,7 @@ public class CustomRefsGet extends AbstractRmWebScript */ private List> getOutwardReferences(NodeRef nodeRef) { - List> outwardReferenceData = new ArrayList>(); + List> outwardReferenceData = new ArrayList<>(); Set relationships = getRelationshipService().getRelationshipsFrom(nodeRef); outwardReferenceData.addAll(getRelationshipData(relationships)); return outwardReferenceData; @@ -157,7 +157,7 @@ public class CustomRefsGet extends AbstractRmWebScript */ private List> getInwardReferenceData(NodeRef nodeRef) { - List> inwardReferenceData = new ArrayList>(); + List> inwardReferenceData = new ArrayList<>(); Set relationships = getRelationshipService().getRelationshipsTo(nodeRef); inwardReferenceData.addAll(getRelationshipData(relationships)); return inwardReferenceData; @@ -171,7 +171,7 @@ public class CustomRefsGet extends AbstractRmWebScript */ private List> getRelationshipData(Set relationships) { - List> relationshipData = new ArrayList>(); + List> relationshipData = new ArrayList<>(); for (Relationship relationship : relationships) { @@ -183,7 +183,7 @@ public class CustomRefsGet extends AbstractRmWebScript if (relationshipDefinition != null && hasView(source) && hasView(target)) { - Map data = new HashMap(); + Map data = new HashMap<>(); RelationshipType type = relationshipDefinition.getType(); RelationshipDisplayName displayName = relationshipDefinition.getDisplayName(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java index fe832f5473..12ba7a2999 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomisableGet.java @@ -89,10 +89,10 @@ public class CustomisableGet extends DeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); Set qnames = rmAdminService.getCustomisable(); - ArrayList items = new ArrayList(qnames.size()); + ArrayList items = new ArrayList<>(qnames.size()); for (QName qname : qnames) { ClassDefinition definition = dictionaryService.getClass(qname); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java index 00335ef0c5..d8c3533da4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetPost.java @@ -89,7 +89,7 @@ public class DataSetPost extends DeclarativeWebScript implements RecordsManageme @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1, 1.0f); + Map model = new HashMap<>(1, 1.0f); try { // Resolve data set id diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java index bd2f8881e6..2ee57b7e40 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java @@ -104,11 +104,11 @@ public class DataSetsGet extends DeclarativeWebScript // Get the loaded/unloaded data sets depending on the "unloadedOnly" parameter Map dataSets = dataSetService.getDataSets(filePlan, unloadedOnly); - List> dataSetList = new ArrayList>(dataSets.size()); + List> dataSetList = new ArrayList<>(dataSets.size()); for (Map.Entry entry : dataSets.entrySet()) { - Map dataSet = new HashMap(3); + Map dataSet = new HashMap<>(3); DataSet value = entry.getValue(); // Data set details @@ -123,7 +123,7 @@ public class DataSetsGet extends DeclarativeWebScript dataSetList.add(dataSet); } - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("datasets", dataSetList); return model; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java index ff6a5540e9..e28236f8f0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionAbstractBase.java @@ -124,7 +124,7 @@ public class DispositionAbstractBase extends AbstractRmWebScript protected Map createActionDefModel(DispositionActionDefinition actionDef, String url) { - Map model = new HashMap(8); + Map model = new HashMap<>(8); model.put("id", actionDef.getId()); model.put("index", actionDef.getIndex()); @@ -161,7 +161,7 @@ public class DispositionAbstractBase extends AbstractRmWebScript List events = actionDef.getEvents(); if (events != null && events.size() > 0) { - List eventNames = new ArrayList(events.size()); + List eventNames = new ArrayList<>(events.size()); for (RecordsManagementEvent event : events) { eventNames.add(event.getName()); @@ -189,7 +189,7 @@ public class DispositionAbstractBase extends AbstractRmWebScript DispositionSchedule schedule = parseRequestForSchedule(req); // add all the schedule data to Map - Map scheduleModel = new HashMap(8); + Map scheduleModel = new HashMap<>(8); // build url String serviceUrl = req.getServiceContextPath() + req.getPathInfo(); @@ -214,7 +214,7 @@ public class DispositionAbstractBase extends AbstractRmWebScript boolean unpublishedUpdates = false; boolean publishInProgress = false; - List> actions = new ArrayList>(); + List> actions = new ArrayList<>(); for (DispositionActionDefinition actionDef : schedule.getDispositionActionDefinitions()) { NodeRef actionDefNodeRef = actionDef.getNodeRef(); @@ -231,7 +231,7 @@ public class DispositionAbstractBase extends AbstractRmWebScript scheduleModel.put("publishInProgress", publishInProgress); // create model object with just the schedule data - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("schedule", scheduleModel); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java index 54f689fd93..82cbca4306 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java @@ -84,7 +84,7 @@ public class DispositionActionDefinitionPost extends DispositionAbstractBase } // create model object with just the action data - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("action", createActionDefModel(actionDef, req.getURL() + "/" + actionDef.getId())); return model; } @@ -107,7 +107,7 @@ public class DispositionActionDefinitionPost extends DispositionAbstractBase } // create the properties for the action definition - Map props = new HashMap(8); + Map props = new HashMap<>(8); String name = json.getString("name"); props.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, name); @@ -148,7 +148,7 @@ public class DispositionActionDefinitionPost extends DispositionAbstractBase if (json.has("events")) { JSONArray events = json.getJSONArray("events"); - List eventsList = new ArrayList(events.length()); + List eventsList = new ArrayList<>(events.length()); for (int x = 0; x < events.length(); x++) { eventsList.add(events.getString(x)); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java index 6171f0cb1f..771f82433c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPut.java @@ -86,7 +86,7 @@ public class DispositionActionDefinitionPut extends DispositionAbstractBase } // create model object with just the action data - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("action", createActionDefModel(actionDef, req.getURL())); return model; } @@ -102,7 +102,7 @@ public class DispositionActionDefinitionPut extends DispositionAbstractBase JSONObject json) throws JSONException { // create the properties for the action definition - Map props = new HashMap(8); + Map props = new HashMap<>(8); if (json.has("name")) { @@ -146,7 +146,7 @@ public class DispositionActionDefinitionPut extends DispositionAbstractBase if (json.has("events")) { JSONArray events = json.getJSONArray("events"); - List eventsList = new ArrayList(events.length()); + List eventsList = new ArrayList<>(events.length()); for (int x = 0; x < events.length(); x++) { eventsList.add(events.getString(x)); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java index 196a64b430..ca35da96c7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java @@ -75,17 +75,17 @@ public class DispositionLifecycleGet extends DispositionAbstractBase DispositionAction nextAction = getDispositionService().getNextDispositionAction(nodeRef); if (nextAction == null) { - Map nextActionModel = new HashMap(2); + Map nextActionModel = new HashMap<>(2); nextActionModel.put("notFound", true); nextActionModel.put("message", "Node " + nodeRef.toString() + " does not have a disposition lifecycle"); - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("nextaction", nextActionModel); return model; } else { // add all the next action data to Map - Map nextActionModel = new HashMap(8); + Map nextActionModel = new HashMap<>(8); String serviceUrl = req.getServiceContextPath() + req.getPathInfo(); nextActionModel.put("url", serviceUrl); nextActionModel.put("name", nextAction.getName()); @@ -121,7 +121,7 @@ public class DispositionLifecycleGet extends DispositionAbstractBase addUsersRealName(nextActionModel, completedBy, "completedBy"); } - List> events = new ArrayList>(); + List> events = new ArrayList<>(); for (EventCompletionDetails event : nextAction.getEventCompletionDetails()) { events.add(createEventModel(event)); @@ -129,7 +129,7 @@ public class DispositionLifecycleGet extends DispositionAbstractBase nextActionModel.put("events", events); // create model object with just the schedule data - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("nextaction", nextActionModel); return model; } @@ -143,7 +143,7 @@ public class DispositionLifecycleGet extends DispositionAbstractBase */ protected Map createEventModel(EventCompletionDetails event) { - Map model = new HashMap(8); + Map model = new HashMap<>(8); model.put("name", event.getEventName()); model.put("label", event.getEventLabel()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java index f160c3310b..6d2ce3bd6a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionPropertiesGet.java @@ -99,7 +99,7 @@ public class DispositionPropertiesGet extends DeclarativeWebScript String dispositionAction = req.getParameter("dispositionaction"); Collection dispositionProperties = dispositionService.getDispositionProperties(recordLevel, dispositionAction); - List> items = new ArrayList>(dispositionProperties.size()); + List> items = new ArrayList<>(dispositionProperties.size()); for (DispositionProperty dispositionProperty : dispositionProperties) { PropertyDefinition propDef = dispositionProperty.getPropertyDefinition(); @@ -107,7 +107,7 @@ public class DispositionPropertiesGet extends DeclarativeWebScript if (propDef != null) { - Map item = new HashMap(2); + Map item = new HashMap<>(2); String propTitle = propDef.getTitle(dictionaryService); if (propTitle == null || propTitle.length() == 0) { @@ -120,7 +120,7 @@ public class DispositionPropertiesGet extends DeclarativeWebScript } // create model object with the lists model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("properties", items); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java index fdd881cc0e..0159299914 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/DodCustomTypesGet.java @@ -63,9 +63,9 @@ public class DodCustomTypesGet extends DeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); - List customTypeAspectDefinitions = new ArrayList(4); + List customTypeAspectDefinitions = new ArrayList<>(4); for (QName aspectQName : CUSTOM_TYPE_ASPECTS) { AspectDefinition nextAspectDef = dictionaryService.getAspect(aspectQName); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java index c70166c3ff..c350ca64bd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapDelete.java @@ -75,7 +75,7 @@ public class EmailMapDelete extends DeclarativeWebScript customEmailMappingService.deleteCustomMapping(json.getString("from"), json.getString("to")); // Create model object with the lists of custom mappings - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("emailmap", customEmailMappingService.getCustomMappings()); return model; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java index 6b9765d0bb..4cdf3e6f56 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapGet.java @@ -64,7 +64,7 @@ public class EmailMapGet extends DeclarativeWebScript protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { // Create model object with the lists of custom mappings - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("emailmap", customEmailMappingService.getCustomMappings()); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java index 4b75a7c660..d376595959 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapKeysGet.java @@ -61,7 +61,7 @@ public class EmailMapKeysGet extends DeclarativeWebScript public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { // Create model object with the lists of email mapping keys - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("emailmapkeys", customEmailMappingService.getEmailMappingKeys()); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java index 7b49399f8b..78e689a3de 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/EmailMapPost.java @@ -69,7 +69,7 @@ public class EmailMapPost extends DeclarativeWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); try { // Get the data from the content diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java index 8c05fb4cc2..992fe57be6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ImportPost.java @@ -234,7 +234,7 @@ public class ImportPost extends DeclarativeWebScript }, AuthenticationUtil.getSystemUserName()); // create and return model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("success", true); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java index cf4dcd5ca4..8a56a7acd2 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/ListOfValuesGet.java @@ -136,7 +136,7 @@ public class ListOfValuesGet extends DeclarativeWebScript protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { // add all the lists data to a Map - Map listsModel = new HashMap(4); + Map listsModel = new HashMap<>(4); String requestUrl = req.getURL(); listsModel.put("dispositionActions", createDispositionActionsModel(requestUrl)); listsModel.put("events", createEventsModel(requestUrl)); @@ -145,7 +145,7 @@ public class ListOfValuesGet extends DeclarativeWebScript listsModel.put("auditEvents", createAuditEventsModel(requestUrl)); // create model object with the lists model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("lists", listsModel); return model; } @@ -160,17 +160,17 @@ public class ListOfValuesGet extends DeclarativeWebScript { // iterate over the disposition actions List dispositionActions = this.rmActionService.getDispositionActions(); - List> items = new ArrayList>(dispositionActions.size()); + List> items = new ArrayList<>(dispositionActions.size()); for (RecordsManagementAction dispositionAction : dispositionActions) { - Map item = new HashMap(2); + Map item = new HashMap<>(2); item.put("label", dispositionAction.getLabel()); item.put("value", dispositionAction.getName()); items.add(item); } // create the model - Map model = new HashMap(2); + Map model = new HashMap<>(2); model.put("url", baseUrl + "/dispositionactions"); model.put("items", items); @@ -187,10 +187,10 @@ public class ListOfValuesGet extends DeclarativeWebScript { // get all the events including their display labels from the event service List events = this.rmEventService.getEvents(); - List> items = new ArrayList>(events.size()); + List> items = new ArrayList<>(events.size()); for (RecordsManagementEvent event : events) { - Map item = new HashMap(3); + Map item = new HashMap<>(3); item.put("label", event.getDisplayLabel()); item.put("value", event.getName()); item.put("automatic", @@ -199,7 +199,7 @@ public class ListOfValuesGet extends DeclarativeWebScript } // create the model - Map model = new HashMap(2); + Map model = new HashMap<>(2); model.put("url", baseUrl + "/events"); model.put("items", items); @@ -216,13 +216,13 @@ public class ListOfValuesGet extends DeclarativeWebScript { // iterate over all period provides, but ignore 'cron' Set providers = Period.getProviderNames(); - List> items = new ArrayList>(providers.size()); + List> items = new ArrayList<>(providers.size()); for (String provider : providers) { PeriodProvider pp = Period.getProvider(provider); if (!pp.getPeriodType().equals("cron")) { - Map item = new HashMap(2); + Map item = new HashMap<>(2); item.put("label", pp.getDisplayLabel()); item.put("value", pp.getPeriodType()); items.add(item); @@ -230,7 +230,7 @@ public class ListOfValuesGet extends DeclarativeWebScript } // create the model - Map model = new HashMap(2); + Map model = new HashMap<>(2); model.put("url", baseUrl + "/periodtypes"); model.put("items", items); @@ -247,7 +247,7 @@ public class ListOfValuesGet extends DeclarativeWebScript { // iterate over all period properties and get the label from their type definition Collection dispositionProperties = dispositionService.getDispositionProperties(); - List> items = new ArrayList>(dispositionProperties.size()); + List> items = new ArrayList<>(dispositionProperties.size()); for (DispositionProperty dispositionProperty : dispositionProperties) { PropertyDefinition propDef = dispositionProperty.getPropertyDefinition(); @@ -255,7 +255,7 @@ public class ListOfValuesGet extends DeclarativeWebScript if (propDef != null) { - Map item = new HashMap(2); + Map item = new HashMap<>(2); String propTitle = propDef.getTitle(ddService); if (propTitle == null || propTitle.length() == 0) { @@ -268,7 +268,7 @@ public class ListOfValuesGet extends DeclarativeWebScript } // create the model - Map model = new HashMap(2); + Map model = new HashMap<>(2); model.put("url", baseUrl + "/periodproperties"); model.put("items", items); @@ -285,17 +285,17 @@ public class ListOfValuesGet extends DeclarativeWebScript { // iterate over all audit events List auditEvents = this.rmAuditService.getAuditEvents(); - List> items = new ArrayList>(auditEvents.size()); + List> items = new ArrayList<>(auditEvents.size()); for (AuditEvent event : auditEvents) { - Map item = new HashMap(2); + Map item = new HashMap<>(2); item.put("label", event.getLabel()); item.put("value", event.getName()); items.add(item); } // create the model - Map model = new HashMap(2); + Map model = new HashMap<>(2); model.put("url", baseUrl + "/auditevents"); model.put("items", items); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java index c705a38ef0..196b4102cb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RMConstraintGet.java @@ -57,7 +57,7 @@ public class RMConstraintGet extends DeclarativeWebScript List values = caveatConfigService.getRMAllowedValues(constraintName); // create model object with the lists model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("allowedValuesForCurrentUser", values); model.put("constraintName", extensionPath); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java index 6111369122..54e7a0e00d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RecordMetaDataAspectsGet.java @@ -119,14 +119,14 @@ public class RecordMetaDataAspectsGet extends DeclarativeWebScript // Get the details of all the aspects Set aspectQNames = recordService.getRecordMetadataAspects(nodeRef); - List> aspects = new ArrayList>(aspectQNames.size()+1); + List> aspects = new ArrayList<>(aspectQNames.size() + 1); for (QName aspectQName : aspectQNames) { // Get the prefix aspect and default the label to the localname String prefixString = aspectQName.toPrefixString(namespaceService); String label = aspectQName.getLocalName(); - Map aspect = new HashMap(2); + Map aspect = new HashMap<>(2); aspect.put("id", prefixString); // Try and get the aspect definition @@ -143,7 +143,7 @@ public class RecordMetaDataAspectsGet extends DeclarativeWebScript } // create model object with the lists model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("aspects", aspects); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java index 264d09bd6c..8d7573608c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipDelete.java @@ -94,7 +94,7 @@ public class RelationshipDelete extends AbstractRmWebScript getRelationshipService().removeRelationship(uniqueName, source, target); getRelationshipService().removeRelationship(uniqueName, target, source); - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put(SUCCESS, true); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipLabelsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipLabelsGet.java index b2c18016e1..b26d71bf61 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipLabelsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipLabelsGet.java @@ -88,7 +88,7 @@ public class RelationshipLabelsGet extends AbstractRmWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put(RELATIONSHIP_LABELS, getRelationshipsLabels()); return model; } @@ -100,7 +100,7 @@ public class RelationshipLabelsGet extends AbstractRmWebScript */ private List getRelationshipsLabels() { - List relationshipLabels = new ArrayList(); + List relationshipLabels = new ArrayList<>(); Set relationshipDefinitions = getRelationshipService().getRelationshipDefinitions(); for (RelationshipDefinition relationshipDefinition : relationshipDefinitions) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java index e38d03d4a4..5068fdc7d9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RelationshipsGet.java @@ -62,7 +62,7 @@ public class RelationshipsGet extends AbstractRmWebScript private enum RelationshipEndPoint { SOURCE, TARGET - }; + } /** Relationship service */ private RelationshipService relationshipService; @@ -118,7 +118,7 @@ public class RelationshipsGet extends AbstractRmWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); NodeRef nodeRef = parseRequestForNodeRef(req); model.put(RELATIONSHIPS, getRelationships(nodeRef)); return model; @@ -133,7 +133,7 @@ public class RelationshipsGet extends AbstractRmWebScript */ private List getRelationships(NodeRef nodeRef) { - List relationships = new ArrayList(); + List relationships = new ArrayList<>(); Set relationshipsFrom = getRelationshipService().getRelationshipsFrom(nodeRef); relationships.addAll(buildRelationshipData(relationshipsFrom, RelationshipEndPoint.TARGET)); @@ -153,7 +153,7 @@ public class RelationshipsGet extends AbstractRmWebScript */ private List buildRelationshipData(Set relationships, RelationshipEndPoint relationshipEndPoint) { - List result = new ArrayList(); + List result = new ArrayList<>(); for (Relationship relationship : relationships) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java index 1a949dff7f..ae1260ec40 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java @@ -95,8 +95,8 @@ public class RmActionPost extends DeclarativeWebScript } String actionName = null; - List targetNodeRefs = new ArrayList(1); - Map actionParams = new HashMap(3); + List targetNodeRefs = new ArrayList<>(1); + Map actionParams = new HashMap<>(3); try { @@ -119,7 +119,7 @@ public class RmActionPost extends DeclarativeWebScript JSONArray jsonArray = jsonObj.getJSONArray(PARAM_NODE_REFS); if (jsonArray.length() != 0) { - targetNodeRefs = new ArrayList(jsonArray.length()); + targetNodeRefs = new ArrayList<>(jsonArray.length()); for (int i = 0; i < jsonArray.length(); i++) { NodeRef nodeRef = new NodeRef(jsonArray.getString(i)); @@ -197,7 +197,7 @@ public class RmActionPost extends DeclarativeWebScript logger.debug(msg.toString()); } - Map model = new HashMap(); + Map model = new HashMap<>(); if (targetNodeRefs.isEmpty()) { RecordsManagementActionResult result = this.rmActionService.executeRecordsManagementAction(actionName, actionParams); @@ -209,7 +209,7 @@ public class RmActionPost extends DeclarativeWebScript else { Map resultMap = this.rmActionService.executeRecordsManagementAction(targetNodeRefs, actionName, actionParams); - Map results = new HashMap(resultMap.size()); + Map results = new HashMap<>(resultMap.size()); for (Map.Entry entry : resultMap.entrySet()) { Object value = entry.getValue().getValue(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java index 8d3d1430c2..95dff43602 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java @@ -129,7 +129,7 @@ public class TransferReportGet extends BaseTransferWebScript // create the writer try (FileOutputStream fileOutputStream = new FileOutputStream(report); - Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"));) + Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"))) { // get all 'transferred' nodes NodeRef[] itemsToTransfer = getTransferNodes(transferNode); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java index 6716d589ee..fe2fc9fdcb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java @@ -140,7 +140,7 @@ public class TransferReportPost extends BaseTransferWebScript // retrieve requested format String format = req.getFormat(); - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("status", status); model.put("cache", cache); @@ -237,7 +237,7 @@ public class TransferReportPost extends BaseTransferWebScript // create the writer try (FileOutputStream fileOutputStream = new FileOutputStream(report) ; - Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"));) + Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"))) { // get all 'transferred' nodes NodeRef[] itemsToTransfer = getTransferNodes(transferNode); @@ -433,7 +433,7 @@ public class TransferReportPost extends BaseTransferWebScript NodeRef record = null; - Map properties = new HashMap(1); + Map properties = new HashMap<>(1); properties.put(ContentModel.PROP_NAME, report.getName()); // file the transfer report as an undeclared record diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java index a756ddb3b8..133bdedf70 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java @@ -123,9 +123,9 @@ public class UserRightsReportGet extends DeclarativeWebScript } // construct all the maps etc. needed to build the model - Map usersMap = new HashMap(8); - Map rolesMap = new HashMap(8); - Map groupsMap = new HashMap(8); + Map usersMap = new HashMap<>(8); + Map rolesMap = new HashMap<>(8); + Map groupsMap = new HashMap<>(8); // iterate over all the roles for the file plan and construct models Set roles = filePlanRoleService.getRoles(filePlanNode); @@ -198,13 +198,13 @@ public class UserRightsReportGet extends DeclarativeWebScript } // add all the lists data to a Map - Map reportModel = new HashMap(4); + Map reportModel = new HashMap<>(4); reportModel.put("users", usersMap); reportModel.put("roles", rolesMap); reportModel.put("groups", groupsMap); // create model object with the lists model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("report", reportModel); return model; } @@ -216,8 +216,8 @@ public class UserRightsReportGet extends DeclarativeWebScript */ public class RoleModel extends Role { - private Set users = new HashSet(8); - private Set groups = new HashSet(8); + private Set users = new HashSet<>(8); + private Set groups = new HashSet<>(8); public RoleModel(Role role) { @@ -273,8 +273,8 @@ public class UserRightsReportGet extends DeclarativeWebScript this.userName = userName; this.firstName = firstName; this.lastName = lastName; - this.roles = new HashSet(2); - this.groups = new HashSet(2); + this.roles = new HashSet<>(2); + this.groups = new HashSet<>(2); } public String getUserName() @@ -328,7 +328,7 @@ public class UserRightsReportGet extends DeclarativeWebScript { this.name = name; this.label = label; - this.users = new HashSet(4); + this.users = new HashSet<>(4); } public String getName() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java index 13132629bf..a4fdaa35eb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java @@ -65,7 +65,7 @@ public class RmEventDelete extends DeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); // Event name Map templateVars = req.getServiceMatch().getTemplateVars(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java index 0409d0a587..9595c1a748 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java @@ -61,7 +61,7 @@ public class RmEventGet extends DeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); // Event name Map templateVars = req.getServiceMatch().getTemplateVars(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java index e3bf785454..ede41997a6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java @@ -76,7 +76,7 @@ public class RmEventPut extends RMEventBase { ParameterCheck.mandatory("req", req); - Map model = new HashMap(); + Map model = new HashMap<>(); JSONObject json = null; try { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java index b34080fb49..9db3c66cbb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventTypesGet.java @@ -61,7 +61,7 @@ public class RmEventTypesGet extends DeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); // Get the events List events = rmEventService.getEventTypes(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java index 9206059ee8..9f666bec56 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsGet.java @@ -61,7 +61,7 @@ public class RmEventsGet extends DeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); // Get the events List events = rmEventService.getEvents(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java index d85570ac3b..b8593872b1 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java @@ -74,7 +74,7 @@ public class RmEventsPost extends RMEventBase { ParameterCheck.mandatory("req", req); - Map model = new HashMap(); + Map model = new HashMap<>(); JSONObject json = null; try { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java index d174066b30..a676a43647 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java @@ -50,7 +50,7 @@ public class RmRoleDelete extends RoleDeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); // Role name Map templateVars = req.getServiceMatch().getTemplateVars(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java index ae0fb8ea22..8219d5f5c8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java @@ -46,7 +46,7 @@ public class RmRoleGet extends RoleDeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); // Role name Map templateVars = req.getServiceMatch().getTemplateVars(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java index 198ca6dac2..0031a8da75 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java @@ -63,7 +63,7 @@ public class RmRolePut extends RoleDeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); JSONObject json = null; try { @@ -82,7 +82,7 @@ public class RmRolePut extends RoleDeclarativeWebScript // TODO check JSONArray capabilitiesArray = json.getJSONArray("capabilities"); - Set capabilites = new HashSet(capabilitiesArray.length()); + Set capabilites = new HashSet<>(capabilitiesArray.length()); for (int i = 0; i < capabilitiesArray.length(); i++) { Capability capability = capabilityService.getCapability(capabilitiesArray.getString(i)); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java index c91ea3482e..d856d17d9a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesGet.java @@ -51,7 +51,7 @@ public class RmRolesGet extends RoleDeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); Set roles = null; // get the file plan diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java index 0803924f75..9aac30ea3a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolesPost.java @@ -63,7 +63,7 @@ public class RmRolesPost extends RoleDeclarativeWebScript @Override public Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(); + Map model = new HashMap<>(); JSONObject json = null; try { @@ -74,7 +74,7 @@ public class RmRolesPost extends RoleDeclarativeWebScript // TODO check JSONArray capabilitiesArray = json.getJSONArray("capabilities"); - Set capabilites = new HashSet(capabilitiesArray.length()); + Set capabilites = new HashSet<>(capabilitiesArray.length()); for (int i = 0; i < capabilitiesArray.length(); i++) { Capability capability = capabilityService.getCapability(capabilitiesArray.getString(i)); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java index 80123fb390..5088e2d1e2 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java @@ -151,7 +151,7 @@ public class RoleDeclarativeWebScript extends DeclarativeWebScript */ protected Set createRoleItems(NodeRef filePlan, Set roles, boolean showAuths) { - Set items = new HashSet(roles.size()); + Set items = new HashSet<>(roles.size()); for (Role role : roles) { RoleItem item = null; @@ -178,7 +178,7 @@ public class RoleDeclarativeWebScript extends DeclarativeWebScript */ private Set createAuthorityItems(Set authorities) { - Set result = new HashSet(authorities.size()); + Set result = new HashSet<>(authorities.size()); for (String authority : authorities) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java index 0ccb45234c..9c0294f14e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java @@ -109,11 +109,11 @@ public class CapabilitiesGet extends DeclarativeWebScript grouped = Boolean.parseBoolean(groupedString); } - Map model = new TreeMap(); + Map model = new TreeMap<>(); if (grouped) { // Construct the map which is needed to build the model - Map groupedCapabilitiesMap = new TreeMap(); + Map groupedCapabilitiesMap = new TreeMap<>(); List groups = capabilityService.getGroups(); for (Group group : groups) @@ -154,7 +154,7 @@ public class CapabilitiesGet extends DeclarativeWebScript } Map map = capabilityService.getCapabilitiesAccessState(nodeRef, includePrivate); - List list = new ArrayList(map.size()); + List list = new ArrayList<>(map.size()); for (Map.Entry entry : map.entrySet()) { AccessStatus accessStatus = entry.getValue(); @@ -188,7 +188,7 @@ public class CapabilitiesGet extends DeclarativeWebScript this.capabilityGroupTitle = capabilityGroupTitle; this.capabilityName = capabilityName; this.capabilityTitle = capabilityTitle; - this.capabilities = new TreeMap(); + this.capabilities = new TreeMap<>(); } public String getGroupId() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHold.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHold.java index faece1bfb4..a9b30bb8f0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHold.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHold.java @@ -122,7 +122,7 @@ public abstract class BaseHold extends DeclarativeWebScript List holds = getHolds(json); List nodeRefs = getItemNodeRefs(json); doAction(holds, nodeRefs); - return new HashMap(); + return new HashMap<>(); } /** @@ -170,7 +170,7 @@ public abstract class BaseHold extends DeclarativeWebScript */ protected List getItemNodeRefs(JSONObject json) { - List nodeRefs = new ArrayList(); + List nodeRefs = new ArrayList<>(); try { JSONArray nodeRefsArray = json.getJSONArray("nodeRefs"); @@ -218,7 +218,7 @@ public abstract class BaseHold extends DeclarativeWebScript */ protected List getHolds(JSONObject json) { - List holds = new ArrayList(); + List holds = new ArrayList<>(); try { JSONArray holdsArray = json.getJSONArray("holds"); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/HoldsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/HoldsGet.java index c8bc4bad1d..38ba69eb1d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/HoldsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/HoldsGet.java @@ -118,7 +118,7 @@ public class HoldsGet extends DeclarativeWebScript { boolean fileOnly = getFileOnly(req); NodeRef itemNodeRef = getItemNodeRef(req); - List holds = new ArrayList(); + List holds = new ArrayList<>(); if (itemNodeRef == null) { @@ -131,7 +131,7 @@ public class HoldsGet extends DeclarativeWebScript holds.addAll(holdService.heldBy(itemNodeRef, includedInHold)); } - List holdObjects = new ArrayList(holds.size()); + List holdObjects = new ArrayList<>(holds.size()); for (NodeRef nodeRef : holds) { // only add if user has filling permisson on the hold @@ -142,7 +142,7 @@ public class HoldsGet extends DeclarativeWebScript } } - Map model = new HashMap(1); + Map model = new HashMap<>(1); sortHoldByName(holdObjects); model.put("holds", holdObjects); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java index 3f1882b681..27cb9691b3 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesDelete.java @@ -97,7 +97,7 @@ public class RMSavedSearchesDelete extends DeclarativeWebScript recordsManagementSearchService.deleteSavedSearch(siteId, name); // Indicate success in the model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("success", true); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java index ff5e9b460a..2eeb437435 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesGet.java @@ -77,7 +77,7 @@ public class RMSavedSearchesGet extends DeclarativeWebScript protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { // create model object with the lists model - Map model = new HashMap(13); + Map model = new HashMap<>(13); // Get the site id and confirm it is valid Map templateVars = req.getServiceMatch().getTemplateVars(); @@ -93,7 +93,7 @@ public class RMSavedSearchesGet extends DeclarativeWebScript // Get the saved search details List details = recordsManagementSearchService.getSavedSearches(siteId); - List items = new ArrayList(); + List items = new ArrayList<>(); for (SavedSearchDetails savedSearchDetails : details) { String name = savedSearchDetails.getName(); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java index 1a0f9e0429..52dbd352c1 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java @@ -163,7 +163,7 @@ public class RMSavedSearchesPost extends DeclarativeWebScript } // Indicate success in the model - Map model = new HashMap(1); + Map model = new HashMap<>(1); model.put("success", true); return model; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java index 4b5f18819f..b5fa86289a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java @@ -183,7 +183,7 @@ public class RMSearchGet extends DeclarativeWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); try { // Get the site id and confirm it is valid @@ -229,10 +229,10 @@ public class RMSearchGet extends DeclarativeWebScript List> results = recordsManagementSearchService.search(siteId, query, searchParameters); // Reset person data cache - personDataCache = new HashMap(57); + personDataCache = new HashMap<>(57); // Process the result items - List items = new ArrayList(results.size()); + List items = new ArrayList<>(results.size()); for (Pair pair : results) { // FIXME: See RM-478 @@ -358,7 +358,7 @@ public class RMSearchGet extends DeclarativeWebScript this.createdBy = getDisplayName(getCreatedByUser()); // Process the custom properties - properties = new HashMap(nodeProperties.size()); + properties = new HashMap<>(nodeProperties.size()); for (Map.Entry entry : nodeProperties.entrySet()) { QName qName = entry.getKey().getPrefixedQName(namespaceService); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java index 0765e8852b..663d932e42 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchPropertiesGet.java @@ -109,9 +109,9 @@ public class RMSearchPropertiesGet extends DeclarativeWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(13); + Map model = new HashMap<>(13); - List groups = new ArrayList(5); + List groups = new ArrayList<>(5); // get the file plan // TODO the file plan should be passed to this web script diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigGet.java index 212c2d29da..ecb6bc0dc7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigGet.java @@ -77,7 +77,7 @@ public class RecordedVersionConfigGet extends AbstractRmWebScript @Override protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { - Map model = new HashMap(1); + Map model = new HashMap<>(1); NodeRef nodeRef = parseRequestForNodeRef(req); List recordableVersions = getRecordableVersionConfigService().getVersions(nodeRef); model.put("recordableVersions", recordableVersions); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java index 0bfab96fef..3f19b4fb76 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RecordedVersionConfigPost.java @@ -86,7 +86,7 @@ public class RecordedVersionConfigPost extends AbstractRmWebScript NodeRef nodeRef = parseRequestForNodeRef(req); String policy = getRecordableVersionPolicy(req); getRecordableVersionConfigService().setVersion(nodeRef, policy); - return new HashMap(1); + return new HashMap<>(1); } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java index e093271314..60b760f800 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/forms/RMMetaDataGet.java @@ -105,7 +105,7 @@ public class RMMetaDataGet extends DeclarativeWebScript protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { // create model object with the lists model - Map model = new HashMap(1); + Map model = new HashMap<>(1); boolean extended = false; String result = "NONE"; @@ -172,7 +172,7 @@ public class RMMetaDataGet extends DeclarativeWebScript public List getAspects(NodeRef nodeRef) { Set qnames = nodeService.getAspects(nodeRef); - List aspects = new ArrayList(qnames.size()); + List aspects = new ArrayList<>(qnames.size()); for (QName qname : qnames) { aspects.add(new Aspect(qname)); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java index 906614808b..2406b5bd65 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchParameters.java @@ -193,7 +193,7 @@ public class RecordsManagementSearchParameters if (jsonObject.has(JSON_CONTAINERTYPES)) { JSONArray jsonArray = jsonObject.getJSONArray(JSON_CONTAINERTYPES); - List containerTypes = new ArrayList(jsonArray.length()); + List containerTypes = new ArrayList<>(jsonArray.length()); for (int i = 0; i < jsonArray.length(); i++) { String type = jsonArray.getString(i); @@ -206,7 +206,7 @@ public class RecordsManagementSearchParameters if (jsonObject.has(JSON_SORT)) { JSONArray jsonArray = jsonObject.getJSONArray(JSON_SORT); - List sortOrder = new ArrayList(jsonArray.length()); + List sortOrder = new ArrayList<>(jsonArray.length()); for (int i = 0; i < jsonArray.length(); i++) { JSONObject sortJSONObject = jsonArray.getJSONObject(i); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java index 90aa48eb3b..b7a159f753 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java @@ -91,7 +91,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear private NodeService nodeService; /** List of report details */ - private List reports = new ArrayList(13); + private List reports = new ArrayList<>(13); /** * @param fileFolderService file folder service @@ -232,10 +232,10 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear ResultSet resultSet = searchService.query(searchParameters); // process results - List> result = new ArrayList>(resultSet.length()); + List> result = new ArrayList<>(resultSet.length()); for (ChildAssociationRef childAssoc : resultSet.getChildAssocRefs()) { - result.add(new Pair(childAssoc.getParentRef(), childAssoc.getChildRef())); + result.add(new Pair<>(childAssoc.getParentRef(), childAssoc.getChildRef())); } // return results @@ -396,7 +396,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear @Override public List getSavedSearches(String siteId) { - List result = new ArrayList(17); + List result = new ArrayList<>(17); NodeRef container = siteService.getContainer(siteId, SEARCH_CONTAINER); if (container != null) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java index f80d0789a2..4a41b2d7b4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetailsCompatibility.java @@ -99,7 +99,7 @@ public class SavedSearchDetailsCompatibility implements RecordsManagementModel public static RecordsManagementSearchParameters createSearchParameters(String params, String[] paramsDelim, String sort, NamespaceService namespaceService) { RecordsManagementSearchParameters result = new RecordsManagementSearchParameters(); - List includedContainerTypes = new ArrayList(2); + List includedContainerTypes = new ArrayList<>(2); // Map the param values into the search parameter object String[] values = params.split(paramsDelim[0]); @@ -143,7 +143,7 @@ public class SavedSearchDetailsCompatibility implements RecordsManagementModel { // Map the sort string into the search details String[] sortPairs = sort.split(","); - List sortOrder = new ArrayList(sortPairs.length); + List sortOrder = new ArrayList<>(sortPairs.length); for (String sortPairString : sortPairs) { String[] sortPair = sortPairString.split("/"); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java index 7af2408b09..36eee6f676 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java @@ -229,7 +229,7 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl */ private Set getAuthorities(String group) { - Set result = new HashSet(); + Set result = new HashSet<>(); result.addAll(authorityService.getContainedAuthorities(null, group, true)); return result; } @@ -312,7 +312,7 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl // assuming the are both present then return if (iprReaderGroup != null && iprWriterGroup != null) { - result = new Pair(iprReaderGroup, iprWriterGroup); + result = new Pair<>(iprReaderGroup, iprWriterGroup); } return result; @@ -335,9 +335,9 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl */ private Pair createOrFindIPRGroups(Set readers, Set writers) { - return new Pair( - createOrFindIPRGroup(READER_GROUP_PREFIX, readers), - createOrFindIPRGroup(WRITER_GROUP_PREFIX, writers)); + return new Pair<>( + createOrFindIPRGroup(READER_GROUP_PREFIX, readers), + createOrFindIPRGroup(WRITER_GROUP_PREFIX, writers)); } /** @@ -417,7 +417,7 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl pageCount ++; } - return new Pair(iprGroup, nextGroupIndex); + return new Pair<>(iprGroup, nextGroupIndex); } /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java index fd28505b70..2d420cc8fc 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java @@ -422,7 +422,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl boolean inheritanceAllowed = isInheritanceAllowed(nodeRef, isParentNodeFilePlan); getPermissionService().setInheritParentPermissions(nodeRef, inheritanceAllowed); - Set keepPerms = new HashSet(5); + Set keepPerms = new HashSet<>(5); Set origionalPerms= getPermissionService().getAllSetPermissions(nodeRef); for (AccessPermission perm : origionalPerms) @@ -556,7 +556,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl { boolean inheritParentPermissions = permissionService.getInheritParentPermissions(record); - Set keepPerms = new HashSet(5); + Set keepPerms = new HashSet<>(5); Set origionalRecordPerms= permissionService.getAllSetPermissions(record); for (AccessPermission recordPermission : origionalRecordPerms) @@ -693,8 +693,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl */ private QName constructAuditEventName(String authority, String permission) { - QName auditProperty = QName.createQName(AUDIT_NAMESPACE, permission + " " + authority); - return auditProperty; + return QName.createQName(AUDIT_NAMESPACE, permission + " " + authority); } private boolean canPerformPermissionAction(NodeRef nodeRef) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java index 01438c38e0..d25e9d99ac 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityInterceptor.java @@ -65,7 +65,7 @@ public class RMMethodSecurityInterceptor extends MethodSecurityInterceptor { public String name; public AccessStatus status; - public Map conditions = new HashMap(); + public Map conditions = new HashMap<>(); } /** @@ -99,8 +99,8 @@ public class RMMethodSecurityInterceptor extends MethodSecurityInterceptor @Override protected Map initialValue() { - return new HashMap(); - }; + return new HashMap<>(); + } }; /** @@ -108,7 +108,7 @@ public class RMMethodSecurityInterceptor extends MethodSecurityInterceptor */ private static final ThreadLocal IS_RM_SECURITY_CHECK = new ThreadLocal() { - protected Boolean initialValue() {return false;}; + protected Boolean initialValue() {return false;} }; /** @@ -116,7 +116,7 @@ public class RMMethodSecurityInterceptor extends MethodSecurityInterceptor */ private static final ThreadLocal> MESSAGES = new ThreadLocal>() { - protected List initialValue() {return new ArrayList();}; + protected List initialValue() {return new ArrayList<>();} }; /** diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java index d6c68b5ae5..5d079016fe 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java @@ -121,7 +121,7 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor { if (securityBeanNameCache == null) { - securityBeanNameCache = new HashSet(21); + securityBeanNameCache = new HashSet<>(21); if (securityBeanNames != null) { securityBeanNameCache.addAll(securityBeanNames); @@ -183,7 +183,7 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor private Map convertToMap(String stringValue) { String[] values = stringValue.trim().split("\n"); - Map map = new HashMap(values.length); + Map map = new HashMap<>(values.length); for (String value : values) { String[] pair = value.trim().split("="); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java index c079306883..35191df6e9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java @@ -164,7 +164,7 @@ public class TransferServiceImpl extends ServiceBaseImpl String transferName = StringUtils.leftPad(dbId.toString(), 10, "0"); // Create the transfer object - Map transferProps = new HashMap(2); + Map transferProps = new HashMap<>(2); transferProps.put(ContentModel.PROP_NAME, transferName); transferProps.put(PROP_TRANSFER_ACCESSION_INDICATOR, isAccession); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java index d37c4c2ba5..2e8a938450 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/PoliciesUtil.java @@ -70,7 +70,7 @@ public final class PoliciesUtil QName typeQName = nodeService.getType(nodeRef); - qnames = new HashSet(aspectQNames.size() + 1); + qnames = new HashSet<>(aspectQNames.size() + 1); qnames.addAll(aspectQNames); qnames.add(typeQName); } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java index a156966506..d05cc8107c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java @@ -38,5 +38,5 @@ import org.alfresco.api.AlfrescoPublicApi; public enum UpdateActionType { ADD, - REMOVE; + REMOVE } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java index fd84b85f8a..f41e738656 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java @@ -174,7 +174,7 @@ public class ExtendedVersionableAspect implements NodeServicePolicies.OnSetNodeT if (autoVersion) { // Create the auto-version - Map versionProperties = new HashMap(1); + Map versionProperties = new HashMap<>(1); versionProperties.put(Version.PROP_DESCRIPTION, I18NUtil.getMessage(MSG_AUTO_VERSION)); createVersionImpl(nodeRef, versionProperties); @@ -215,7 +215,7 @@ public class ExtendedVersionableAspect implements NodeServicePolicies.OnSetNodeT Map versionedNodeRefs = (Map)alfrescoTransactionSupport.getResource(KEY_VERSIONED_NODEREFS); if (versionedNodeRefs == null) { - versionedNodeRefs = new HashMap(); + versionedNodeRefs = new HashMap<>(); alfrescoTransactionSupport.bindResource(KEY_VERSIONED_NODEREFS, versionedNodeRefs); } versionedNodeRefs.put(versionableNode, versionableNode); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java index 79695c3428..1446953b7a 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java @@ -105,7 +105,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl */ protected Map processProperties(NodeRef version, Map properties) { - Map cloneProperties = new HashMap(properties); + Map cloneProperties = new HashMap<>(properties); // revert modified record name properties.put(ContentModel.PROP_NAME, properties.get(RecordsManagementModel.PROP_ORIGIONAL_NAME)); @@ -233,7 +233,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl */ protected Set processAspects(Set aspects) { - Set result = new HashSet(aspects); + Set result = new HashSet<>(aspects); // remove version aspects result.remove(ASPECT_VERSION); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java index 1fceed588f..fd6f643b87 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java @@ -226,7 +226,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl // create version properties if null if (origVersionProperties == null) { - origVersionProperties = new HashMap(2); + origVersionProperties = new HashMap<>(2); } // only need to check the recordable version policy when the recordable version indicator is missing from the version properties @@ -888,7 +888,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl { NodeRef versionNodeRef = getVersionNodeRef(version); Map versionProps = dbNodeService.getProperties(versionNodeRef); - Map result = new HashMap(9); + Map result = new HashMap<>(9); for (String propertyName : VERSION_PROPERTY_NAMES) { QName propertyQName = QName.createQName(Version2Model.NAMESPACE_URI, propertyName); @@ -957,7 +957,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl // if the flag autoversion on record creation set, create new version on dirty nodes if (autoVersion && isCurrentVersionDirty(nodeRef)) { - Map autoVersionProperties = new HashMap(2); + Map autoVersionProperties = new HashMap<>(2); autoVersionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); autoVersionProperties.put(VersionModel.PROP_DESCRIPTION, I18NUtil.getMessage(AUTO_VERSION_ON_RECORD_CREATION)); createVersion(nodeRef, autoVersionProperties); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java index 98742f1547..b4adbe563f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java @@ -113,7 +113,7 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra if (parentVri) { VitalRecordDefinition vrDefn = getVitalRecordService().getVitalRecordDefinition(nextChild); - Map aspectProps = new HashMap(); + Map aspectProps = new HashMap<>(); aspectProps.put(PROP_REVIEW_AS_OF, vrDefn.getNextReviewDate()); getNodeService().addAspect(nextChild, RecordsManagementModel.ASPECT_VITAL_RECORD, aspectProps); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java index caf358b54f..cefca9903c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java @@ -85,7 +85,7 @@ public class VitalRecordServiceImpl extends ServiceBaseImpl Date reviewAsOf = viDef.getNextReviewDate(); if (reviewAsOf != null) { - Map reviewProps = new HashMap(1); + Map reviewProps = new HashMap<>(1); reviewProps.put(RecordsManagementModel.PROP_REVIEW_AS_OF, reviewAsOf); if (!nodeService.hasAspect(nodeRef, ASPECT_VITAL_RECORD)) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java index 512a257798..e8ac1ca3c0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java @@ -108,7 +108,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl { // get the file component kind of the node reference FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef); - result = new ArrayList(actionDefinitions.size()); + result = new ArrayList<>(actionDefinitions.size()); // check each action definition for (ActionDefinition actionDefinition : actionDefinitions) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java index 794b478328..49d7768fb6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java @@ -226,7 +226,7 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame @Override public List getSubstitutionSuggestions(String substitutionFragment) { - List suggestions = new ArrayList(); + List suggestions = new ArrayList<>(); String namePrefix = this.getName() + "."; if(StringUtils.isBlank(substitutionFragment) || this.getName().toLowerCase().contains(substitutionFragment.toLowerCase())) { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java index e86394e4e7..a68b2eee74 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java @@ -180,7 +180,7 @@ public class NodeParameterProcessor extends ParameterProcessor implements Parame { if(this.suggestionDefinitions == null) { - this.suggestionDefinitions = Collections.synchronizedList(new ArrayList()); + this.suggestionDefinitions = Collections.synchronizedList(new ArrayList<>()); } this.suggestionDefinitions.add(definition); } @@ -196,7 +196,7 @@ public class NodeParameterProcessor extends ParameterProcessor implements Parame @Override public List getSubstitutionSuggestions(String substitutionFragment) { - Set suggestionSet = Collections.synchronizedSet(new HashSet()); + Set suggestionSet = Collections.synchronizedSet(new HashSet<>()); if(this.suggestionDefinitions != null) { for(QName definition : this.suggestionDefinitions) @@ -207,7 +207,7 @@ public class NodeParameterProcessor extends ParameterProcessor implements Parame } } } - List suggestions = new ArrayList(); + List suggestions = new ArrayList<>(); suggestions.addAll(suggestionSet); Collections.sort(suggestions); return suggestions; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java index 6f8c6d6619..cc0d53fd30 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java @@ -53,8 +53,8 @@ public class ParameterProcessorComponent implements ParameterSubstitutionSuggest private static final String REG_EX = "\\{([^\\{]+)\\}"; /** registry of parameter processors */ - private Map processors = new HashMap(5); - private List subtitutionSuggesterProcessors = new ArrayList(5); + private Map processors = new HashMap<>(5); + private List subtitutionSuggesterProcessors = new ArrayList<>(5); /** * Register parameter processor @@ -142,7 +142,7 @@ public class ParameterProcessorComponent implements ParameterSubstitutionSuggest */ public List getSubstitutionSuggestions(final String substitutionFragment) { - List suggestions = new ArrayList(); + List suggestions = new ArrayList<>(); for (ParameterSubstitutionSuggester suggestor : this.subtitutionSuggesterProcessors) { suggestions.addAll(suggestor.getSubstitutionSuggestions(substitutionFragment.toLowerCase())); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java index f736baf353..78597ec2e3 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java @@ -52,7 +52,7 @@ public class ExtendedRuleServiceImpl extends RuleServiceImpl private boolean runAsAdmin = true; /** ignore types */ - private Set ignoredTypes = new HashSet(); + private Set ignoredTypes = new HashSet<>(); /** file plan service */ private FilePlanService filePlanService; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java index a1d00d5c49..2e4a966d35 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImpl.java @@ -308,8 +308,8 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl impleme Set aclReaders = readersCache.get((Serializable) acl.getProperties()); if (aclReaders != null) { return aclReaders; } - HashSet assigned = new HashSet(); - HashSet readers = new HashSet(); + HashSet assigned = new HashSet<>(); + HashSet readers = new HashSet<>(); for (AccessControlEntry ace : acl.getEntries()) { @@ -346,8 +346,8 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl impleme if (acl == null) { return Collections.emptySet(); } Set denied = readersDeniedCache.get(aclId); if (denied != null) { return denied; } - denied = new HashSet(); - Set assigned = new HashSet(); + denied = new HashSet<>(); + Set assigned = new HashSet<>(); for (AccessControlEntry ace : acl.getEntries()) { @@ -383,8 +383,8 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl impleme Set aclWriters = writersCache.get((Serializable) acl.getProperties()); if (aclWriters != null) { return aclWriters; } - HashSet assigned = new HashSet(); - HashSet readers = new HashSet(); + HashSet assigned = new HashSet<>(); + HashSet readers = new HashSet<>(); for (AccessControlEntry ace : acl.getEntries()) { @@ -456,7 +456,7 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl impleme Set writers = getWriters(aclId); // add the current owner to the list of extended writers - Set modifiedWrtiers = new HashSet(writers); + Set modifiedWrtiers = new HashSet<>(writers); String owner = ownableService.getOwner(nodeRef); if (StringUtils.isNotBlank(owner) && !owner.equals(OwnableService.NO_OWNER) && @@ -465,6 +465,6 @@ public class ExtendedPermissionServiceImpl extends PermissionServiceImpl impleme modifiedWrtiers.add(owner); } - return new Pair, Set> (readers, modifiedWrtiers); + return new Pair<>(readers, modifiedWrtiers); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/processor/PermissionProcessorRegistry.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/processor/PermissionProcessorRegistry.java index 96794d1daf..4783157ca4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/processor/PermissionProcessorRegistry.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/security/permissions/processor/PermissionProcessorRegistry.java @@ -39,10 +39,10 @@ import java.util.List; public class PermissionProcessorRegistry { /** permission pre-processors */ - private List permissionPreProcessors = new ArrayList(); + private List permissionPreProcessors = new ArrayList<>(); /** permission post-processors */ - private List permissionPostProcessors = new ArrayList(); + private List permissionPostProcessors = new ArrayList<>(); /** * Add a permission pre-processor. diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java index d5a6f02a6e..f1dd9ead11 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java @@ -101,12 +101,12 @@ public class RmClassesGet extends DictionaryWebServiceBase implements RecordsMan String name = getValidInput(req.getParameter(REQ_URL_TEMPL_VAR_NAME)); String className = null; - Map classdef = new HashMap(); - Map> propdef = new HashMap>(); - Map> assocdef = new HashMap>(); - Map model = new HashMap(); + Map classdef = new HashMap<>(); + Map> propdef = new HashMap<>(); + Map> assocdef = new HashMap<>(); + Map model = new HashMap<>(); - List qnames = new ArrayList(); + List qnames = new ArrayList<>(); QName classQname = null; QName myModel = null; @@ -202,7 +202,7 @@ public class RmClassesGet extends DictionaryWebServiceBase implements RecordsMan } } - List classDefinitions = new ArrayList(classdef.values()); + List classDefinitions = new ArrayList<>(classdef.values()); Collections.sort(classDefinitions, new DictionaryComparators.ClassDefinitionComparator(dictionaryservice)); model.put(MODEL_PROP_KEY_CLASS_DEFS, classDefinitions); model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, propdef.values()); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java index ccec29a168..a533766684 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/dictionary/RmPropertiesGet.java @@ -113,7 +113,7 @@ public class RmPropertiesGet extends DictionaryWebServiceBase implements Records { if (names != null) { - propMap = new HashMap(names.length); + propMap = new HashMap<>(names.length); for (String name : names) { QName propQName = QName.createQName(name, namespaceService); @@ -127,7 +127,7 @@ public class RmPropertiesGet extends DictionaryWebServiceBase implements Records else { Collection propQNames = getProperties(isRM); - propMap = new HashMap(propQNames.size()); + propMap = new HashMap<>(propQNames.size()); for (QName propQName : propQNames) { propMap.put(propQName, dictionaryservice.getProperty(propQName)); @@ -142,7 +142,7 @@ public class RmPropertiesGet extends DictionaryWebServiceBase implements Records } // Filter the properties by URI - List props = new ArrayList(propMap.size()); + List props = new ArrayList<>(propMap.size()); for (Map.Entry entry : propMap.entrySet()) { if ((namespaceURI != null && @@ -157,7 +157,7 @@ public class RmPropertiesGet extends DictionaryWebServiceBase implements Records Collections.sort(props, new DictionaryComparators.PropertyDefinitionComparator(dictionaryservice)); // Pass list of property definitions to template - Map model = new HashMap(); + Map model = new HashMap<>(); model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, props); model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, dictionaryservice); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java index b9abf212ac..f74cacae1e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGet.java @@ -183,7 +183,7 @@ public class DynamicAuthoritiesGet extends AbstractWebScript implements RecordsM protected Map buildModel(WebScriptRequest req, WebScriptResponse res) throws IOException { - Map model = new HashMap(); + Map model = new HashMap<>(); final Long batchSize = getBatchSizeParameter(req); // get the max node id and the extended security aspect Long maxNodeId = patchDAO.getMaxAdmNodeID(); @@ -203,7 +203,7 @@ public class DynamicAuthoritiesGet extends AbstractWebScript implements RecordsM File file = TempFileProvider.createTempFile("processedNodes_", ".csv"); FileWriter writer = new FileWriter(file); BufferedWriter out = new BufferedWriter(writer); - List processedNodes = new ArrayList(); + List processedNodes = new ArrayList<>(); try { NodeRef parentNodeRef = getParentNodeRefParameter(req); @@ -268,7 +268,7 @@ public class DynamicAuthoritiesGet extends AbstractWebScript implements RecordsM { boolean attach = false; String export = req.getParameter(PARAM_EXPORT); - if (export != null && Boolean.parseBoolean(export)) + if (Boolean.parseBoolean(export)) { attach = true; } @@ -476,7 +476,7 @@ public class DynamicAuthoritiesGet extends AbstractWebScript implements RecordsM Long totalNumberOfRecordsToProcess, final BufferedWriter out, final boolean attach) { final Long maxRecordsToProcess = totalNumberOfRecordsToProcess; - final List processedNodes = new ArrayList(); + final List processedNodes = new ArrayList<>(); logger.info(MESSAGE_PROCESSING_BEGIN); // by batch size for (Long i = 0L; i < maxNodeId; i+=batchSize) @@ -530,7 +530,7 @@ public class DynamicAuthoritiesGet extends AbstractWebScript implements RecordsM final Pair recordAspectPair, final int maxRecordsToProcess, final BufferedWriter out, final boolean attach) { - final List processedNodes = new ArrayList(); + final List processedNodes = new ArrayList<>(); final List children = fileFolderService.search(parentNodeRef, "*", /*filesSearch*/true, /*folderSearch*/true, /*includeSubfolders*/true); logger.info(MESSAGE_PROCESSING_BEGIN); // by batch size diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java index ee0bd46080..63bb7dcc08 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesDelete.java @@ -57,6 +57,6 @@ public class RmAuthoritiesDelete extends AbstractRmAuthorities filePlanRoleService.unassignRoleFromAuthority(filePlan, roleId, authorityName); - return new HashMap(); + return new HashMap<>(); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java index bab3d9607c..c7c9fc9672 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/roles/RmAuthoritiesPost.java @@ -57,6 +57,6 @@ public class RmAuthoritiesPost extends AbstractRmAuthorities filePlanRoleService.assignRoleToAuthority(filePlan, roleId, authorityName); - return new HashMap(); + return new HashMap<>(); } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java index f00882a1c0..ced7487ddc 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionConditionDefinitionsGet.java @@ -72,7 +72,7 @@ public class RmActionConditionDefinitionsGet extends DeclarativeWebScript List dmDefs = actionService.getActionConditionDefinitions(); List conditions = recordsManagementActionService.getRecordsManagementActionConditions(); - List defs = new ArrayList(dmDefs.size()+conditions.size()); + List defs = new ArrayList<>(dmDefs.size() + conditions.size()); defs.addAll(dmDefs); for (RecordsManagementActionCondition condition: conditions) { @@ -82,7 +82,7 @@ public class RmActionConditionDefinitionsGet extends DeclarativeWebScript } } - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("actionconditiondefinitions", defs); return model; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java index ab1e0a0307..81184dcbda 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/rule/RmActionDefinitionsGet.java @@ -63,7 +63,7 @@ public class RmActionDefinitionsGet extends DeclarativeWebScript protected Map executeImpl(WebScriptRequest req, Status status, Cache cache) { List actions = recordsManagementActionService.getRecordsManagementActions(); - Set defs = new HashSet(actions.size()); + Set defs = new HashSet<>(actions.size()); for (RecordsManagementAction action : actions) { if (action.isPublicAction()) @@ -72,7 +72,7 @@ public class RmActionDefinitionsGet extends DeclarativeWebScript } } - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("actiondefinitions", defs); return model; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java index c435076953..d25c901888 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java @@ -151,7 +151,7 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript String unfiledString = req.getParameter(UNFILED_PARAMETER); boolean unfiled = (unfiledString != null) && UNFILED.equals(unfiledString); - List substitutionSuggestions = new ArrayList(); + List substitutionSuggestions = new ArrayList<>(); if((fragment != null) && (fragment.length() >= this.substitutionMinimumFragmentSize)) { @@ -159,7 +159,7 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript substitutionSuggestions.addAll(this.parameterProcessorComponent.getSubstitutionSuggestions(fragment)); } - Map model = new HashMap(); + Map model = new HashMap<>(); model.put(SUBSTITUTIONS_MODEL_KEY, substitutionSuggestions); return model; @@ -174,7 +174,7 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript */ private List getSubPathSuggestions(WebScriptRequest req, final String path, final String fragment, boolean unfiled) { - List pathSuggestions = new ArrayList(); + List pathSuggestions = new ArrayList<>(); if((path != null) && path.startsWith("/") && (fragment != null)) { String[] pathFragments = path.split("/"); @@ -295,7 +295,7 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript Capability viewCapability = capabilityService.getCapability(VIEW_CAPABILITY); if ((createCapability != null) && (viewCapability != null)) { - List requiredCapabilities = new ArrayList(); + List requiredCapabilities = new ArrayList<>(); requiredCapabilities.add(CREATE_CAPABILITY); requiredCapabilities.add(VIEW_CAPABILITY); Map map = capabilityService.getCapabilitiesAccessState(nodeRef, requiredCapabilities); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java index 60bab513dd..45f64bbe2e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java @@ -533,7 +533,7 @@ public class ApiNodesModelFactory if (includeParam.contains(RMNode.PARAM_HAS_RETENTION_SCHEDULE)) { DispositionSchedule ds = dispositionService.getDispositionSchedule(info.getNodeRef()); - recordCategoryChild.setHasRetentionSchedule(ds !=null ? true : false); + recordCategoryChild.setHasRetentionSchedule(ds != null); } if((!isMinimalInfo && propertyFilter.isAllowed(RMNode.PARAM_IS_CLOSED)) || (isMinimalInfo && includeParam.contains(RMNode.PARAM_IS_CLOSED))) { @@ -673,7 +673,7 @@ public class ApiNodesModelFactory if (parameters.getInclude().contains(RMNode.PARAM_HAS_RETENTION_SCHEDULE)) { DispositionSchedule ds = dispositionService.getDispositionSchedule(info.getNodeRef()); - recordCategory.setHasRetentionSchedule(ds !=null ? true : false); + recordCategory.setHasRetentionSchedule(ds != null); } return recordCategory; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java index 1f4b8b8451..cfeff4dce1 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/SearchTypesFactory.java @@ -123,7 +123,7 @@ public class SearchTypesFactory filterNodeTypeQName = pair.getFirst(); includeSubTypes = pair.getSecond(); - if (nodeTypeQNameStr.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER)) + if (filterNodeTypeQName.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER)) { includeUnfiledRecordFolders = true; } @@ -219,7 +219,7 @@ public class SearchTypesFactory Pair pair = parseNodeTypeFilter(nodeTypeQNameStr); filterNodeTypeQName = pair.getFirst(); - if (nodeTypeQNameStr.equals(RecordsManagementModel.TYPE_RECORD_FOLDER)) + if (filterNodeTypeQName.equals(RecordsManagementModel.TYPE_RECORD_FOLDER)) { includeRecordFolders = true; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java index 8619a42c99..cd35c889ff 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/RecordCategoryChild.java @@ -48,6 +48,7 @@ public class RecordCategoryChild extends RMNode public RecordCategoryChild() { + //Default constructor } public Boolean getIsRecordCategory() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java index 124896d6a5..bc810cbb45 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TargetContainer.java @@ -39,6 +39,7 @@ public class TargetContainer public TargetContainer() { + //Default constructor } public String getTargetParentId() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java index 57a5eb34f7..2bd605ee06 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/Transfer.java @@ -67,6 +67,7 @@ public class Transfer public Transfer() { + //Default constructor } @JsonProperty ("id") diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java index 812107c990..8f2ef1d3e7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferChild.java @@ -45,6 +45,7 @@ public class TransferChild extends RMNode public TransferChild() { + //Default constructor } public Boolean getIsClosed() diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java index 77677120d4..e51e7948c7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/model/TransferContainer.java @@ -60,6 +60,7 @@ public class TransferContainer public TransferContainer() { + //Default constructor } @JsonProperty ("id") diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java index e7d95e6aac..30ca901b15 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/unfiledrecordfolders/UnfiledRecordFolderChildrenRelation.java @@ -233,7 +233,7 @@ public class UnfiledRecordFolderChildrenRelation implements RelationshipResource { final NodeRef parentNodeRef = apiUtils.lookupAndValidateNodeType(unfiledRecordFolderId, RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER, uploadInfo.getRelativePath()); NodeRef newNode = apiUtils.uploadRecord(parentNodeRef, uploadInfo, parameters); - return new Pair(newNode, parentNodeRef); + return new Pair<>(newNode, parentNodeRef); } }; Pair nodeAndParentInfo = transactionService.getRetryingTransactionHelper().doInTransaction(callback, false, true); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java b/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java index 6be0c21d74..72282d6279 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/util/SortDirection.java @@ -72,7 +72,7 @@ public enum SortDirection if (sortDirection == null) { - throw new AlfrescoRuntimeException("Sort direction '" + sortDirection +"' unknown."); + throw new AlfrescoRuntimeException("Sort direction unknown."); } return sortDirection; diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java b/rm-community/rm-community-repo/source/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java index 22b5d4dabc..5bb2190fb4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/workflow/requestInfo/RequestInfoAssignmentHandler.java @@ -74,8 +74,8 @@ public class RequestInfoAssignmentHandler implements TaskListener } // Define lists for candidate user(s)/group(s) - List candidateUsers = new ArrayList(); - List candidateGroups = new ArrayList(); + List candidateUsers = new ArrayList<>(); + List candidateGroups = new ArrayList<>(); // Iterate through the list add user(s)/group(s) to the lists for (ActivitiScriptNode activitiScriptNode : usersAndGroups) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java index bea15c57b2..da9bb4d49d 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java @@ -109,7 +109,7 @@ public class DestroyContentTest extends BaseRMTestCase true); destroyableFolder = recordFolderService.createRecordFolder(recordCategoryFolderLevel, GUID.generate()); - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(ContentModel.PROP_TITLE, GUID.generate()); InputStream is = DestroyContentTest.class.getResourceAsStream("/alfresco/test/content/Image.jpg"); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/CutOffTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/CutOffTest.java index 95bff36ecc..359ec465e5 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/CutOffTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/CutOffTest.java @@ -67,7 +67,7 @@ public class CutOffTest extends BaseRMTestCase // TODO add some records // make eligible for cutoff - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordFolder, CompleteEventAction.NAME, params); } @@ -110,7 +110,7 @@ public class CutOffTest extends BaseRMTestCase // TODO add some records // make eligible for cutoff - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordFolder, CompleteEventAction.NAME, params); @@ -154,7 +154,7 @@ public class CutOffTest extends BaseRMTestCase // TODO add some records // make eligible for cutoff - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordFolder, CompleteEventAction.NAME, params); } @@ -196,7 +196,7 @@ public class CutOffTest extends BaseRMTestCase // TODO add some records // make eligible for cutoff - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordFolder, CompleteEventAction.NAME, params); } @@ -205,7 +205,7 @@ public class CutOffTest extends BaseRMTestCase public void when() { // complete event - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(RMDispositionActionExecuterAbstractBase.PARAM_NO_ERROR_CHECK, Boolean.FALSE); try { diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java index 4b8a1e2589..910696d8dd 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -119,21 +119,21 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase DispositionSchedule ds = utils.createDispositionSchedule(category, DEFAULT_DISPOSITION_INSTRUCTIONS, DEFAULT_DISPOSITION_DESCRIPTION, true, false, false); // create the properties for CUTOFF action and add it to the disposition action definition - Map cutOff = new HashMap(3); + Map cutOff = new HashMap<>(3); cutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); cutOff.put(PROP_DISPOSITION_DESCRIPTION, generate()); cutOff.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); dispositionService.addDispositionActionDefinition(ds, cutOff); // create the properties for TRANSFER action and add it to the disposition action definition - Map transfer = new HashMap(3); + Map transfer = new HashMap<>(3); transfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); transfer.put(PROP_DISPOSITION_DESCRIPTION, generate()); transfer.put(PROP_DISPOSITION_EVENT, (Serializable)Collections.singletonList(DEFAULT_EVENT_NAME)); dispositionService.addDispositionActionDefinition(ds, transfer); // create the properties for DESTROY action and add it to the disposition action definition - Map destroy = new HashMap(3); + Map destroy = new HashMap<>(3); destroy.put(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); destroy.put(PROP_DISPOSITION_DESCRIPTION, generate()); destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_ONE_WEEK); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/event/CompleteEventsTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/event/CompleteEventsTest.java index 95f7c60dad..6e37cfe611 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/event/CompleteEventsTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/event/CompleteEventsTest.java @@ -87,7 +87,7 @@ public class CompleteEventsTest extends BaseRMTestCase public void when() { // build action properties - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); // complete event @@ -144,7 +144,7 @@ public class CompleteEventsTest extends BaseRMTestCase public void when() { // build action properties - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); // complete event @@ -188,11 +188,11 @@ public class CompleteEventsTest extends BaseRMTestCase // create disposition schedule DispositionSchedule mySchedule = utils.createBasicDispositionSchedule(recordCategory, "instructions", "authority", false, false); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION); - List events = new ArrayList(1); + List events = new ArrayList<>(1); events.add(CommonRMTestUtils.DEFAULT_EVENT_NAME); events.add(ANOTHER_EVENT); adParams.put(PROP_DISPOSITION_EVENT, (Serializable)events); @@ -209,7 +209,7 @@ public class CompleteEventsTest extends BaseRMTestCase public void when() { // build action properties - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); // complete event @@ -260,12 +260,12 @@ public class CompleteEventsTest extends BaseRMTestCase // create disposition schedule DispositionSchedule mySchedule = utils.createBasicDispositionSchedule(recordCategory, "instructions", "authority", false, false); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION); adParams.put(PROP_DISPOSITION_EVENT_COMBINATION, "and"); - List events = new ArrayList(1); + List events = new ArrayList<>(1); events.add(CommonRMTestUtils.DEFAULT_EVENT_NAME); events.add(ANOTHER_EVENT); adParams.put(PROP_DISPOSITION_EVENT, (Serializable)events); @@ -282,7 +282,7 @@ public class CompleteEventsTest extends BaseRMTestCase public void when() { // build action properties - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); // complete event @@ -331,12 +331,12 @@ public class CompleteEventsTest extends BaseRMTestCase // create disposition schedule DispositionSchedule mySchedule = utils.createBasicDispositionSchedule(recordCategory, "instructions", "authority", false, false); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION); adParams.put(PROP_DISPOSITION_EVENT_COMBINATION, "and"); - List events = new ArrayList(1); + List events = new ArrayList<>(1); events.add(CommonRMTestUtils.DEFAULT_EVENT_NAME); events.add(ANOTHER_EVENT); adParams.put(PROP_DISPOSITION_EVENT, (Serializable)events); @@ -353,14 +353,14 @@ public class CompleteEventsTest extends BaseRMTestCase public void when() { // build action properties - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); // complete event rmActionService.executeRecordsManagementAction(recordFolder, CompleteEventAction.NAME, params); // build action properties - params = new HashMap(1); + params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, ANOTHER_EVENT); // complete event @@ -427,7 +427,7 @@ public class CompleteEventsTest extends BaseRMTestCase public void when() { // build action properties - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); // complete event diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/AddRemoveFromHoldTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/AddRemoveFromHoldTest.java index 1db78863db..9d1d6d685b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/AddRemoveFromHoldTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/AddRemoveFromHoldTest.java @@ -112,7 +112,7 @@ public class AddRemoveFromHoldTest extends BaseRMTestCase private NodeRef hold; private NodeRef recordCategory; private NodeRef recordFolder; - private List records = new ArrayList(RECORD_COUNT); + private List records = new ArrayList<>(RECORD_COUNT); public void given() { @@ -183,7 +183,7 @@ public class AddRemoveFromHoldTest extends BaseRMTestCase private NodeRef hold; private NodeRef recordCategory; private NodeRef recordFolder; - private List records = new ArrayList(RECORD_COUNT); + private List records = new ArrayList<>(RECORD_COUNT); public void given() { @@ -250,7 +250,7 @@ public class AddRemoveFromHoldTest extends BaseRMTestCase private NodeRef hold; private NodeRef recordCategory; private NodeRef recordFolder; - private List records = new ArrayList(RECORD_COUNT); + private List records = new ArrayList<>(RECORD_COUNT); public void given() { @@ -315,7 +315,7 @@ public class AddRemoveFromHoldTest extends BaseRMTestCase private NodeRef hold; private NodeRef recordCategory; private NodeRef recordFolder; - private List records = new ArrayList(RECORD_COUNT); + private List records = new ArrayList<>(RECORD_COUNT); public void given() { @@ -372,7 +372,7 @@ public class AddRemoveFromHoldTest extends BaseRMTestCase private NodeRef hold; private NodeRef recordCategory; private NodeRef recordFolder; - private List records = new ArrayList(RECORD_COUNT); + private List records = new ArrayList<>(RECORD_COUNT); public void given() { diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java index 776b868c8f..61e49b676c 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java @@ -78,7 +78,7 @@ public class CreateHoldTest extends BaseRMTestCase siteService.setMembership(siteId, testUser, SITE_CONSUMER); // Create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability(VIEW_RECORDS)); capabilities.add(capabilityService.getCapability(CREATE_HOLD)); Role role = filePlanRoleService.createRole(filePlan, generate(), generate(), capabilities); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java index d58318b84f..8396032d5d 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java @@ -80,7 +80,7 @@ public class DeleteHoldTest extends BaseRMTestCase */ protected List createAndCheckHolds() { - List holds = new ArrayList(2); + List holds = new ArrayList<>(2); holds.add(createAndCheckHold()); NodeRef hold2 = holdService.createHold(filePlan, HOLD2_NAME, HOLD2_REASON, HOLD2_DESC); assertNotNull(hold2); @@ -215,7 +215,7 @@ public class DeleteHoldTest extends BaseRMTestCase createAndCheckHolds(); // Check that the record folder isn't held by anything - List holds = new ArrayList(); + List holds = new ArrayList<>(); holds.addAll(holdService.heldBy(rmFolder, true)); assertTrue(holds.isEmpty()); holds.clear(); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1008Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1008Test.java index 4900efb80e..f378024572 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1008Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1008Test.java @@ -234,20 +234,20 @@ public class RM1008Test extends BaseRMTestCase { NodeRef transferCat = filePlanService.createRecordCategory(filePlan, "transferCat"); - Map dsProps = new HashMap(3); + Map dsProps = new HashMap<>(3); dsProps.put(PROP_DISPOSITION_AUTHORITY, "test"); dsProps.put(PROP_DISPOSITION_INSTRUCTIONS, "test"); dsProps.put(PROP_RECORD_LEVEL_DISPOSITION, false); DispositionSchedule dispositionSchedule = dispositionService.createDispositionSchedule(transferCat, dsProps); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, "cutoff"); adParams.put(PROP_DISPOSITION_DESCRIPTION, "test"); adParams.put(PROP_DISPOSITION_PERIOD, "immediately|0"); dispositionService.addDispositionActionDefinition(dispositionSchedule, adParams); - adParams = new HashMap(3); + adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, "transfer"); adParams.put(PROP_DISPOSITION_DESCRIPTION, "test"); adParams.put(PROP_DISPOSITION_PERIOD, "immediately|0"); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java index b5f06ff42e..41062e90ba 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java @@ -47,7 +47,7 @@ public class RM1424Test extends DeleteHoldTest { public void testGettingHolds() { - final List listWithTwoHolds = new ArrayList(2); + final List listWithTwoHolds = new ArrayList<>(2); doTestInTransaction(new Test() { diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1914Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1914Test.java index 753a46c91a..c3b966bea5 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1914Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1914Test.java @@ -66,7 +66,7 @@ public class RM1914Test extends BaseRMTestCase NodeRef category1 = filePlanService.createRecordCategory(filePlan, GUID.generate()); NodeRef category2 = filePlanService.createRecordCategory(filePlan, GUID.generate()); - Map dsProps = new HashMap(3); + Map dsProps = new HashMap<>(3); dsProps.put(PROP_DISPOSITION_AUTHORITY, CommonRMTestUtils.DEFAULT_DISPOSITION_AUTHORITY); dsProps.put(PROP_DISPOSITION_INSTRUCTIONS, GUID.generate()); dsProps.put(PROP_RECORD_LEVEL_DISPOSITION, true); @@ -74,11 +74,11 @@ public class RM1914Test extends BaseRMTestCase NodeRef folder1 = recordFolderService.createRecordFolder(category1, GUID.generate()); // - add cutoff after "Related Record Transferred To Inactive Storage" completion event - Map dispositionAction1 = new HashMap(3); + Map dispositionAction1 = new HashMap<>(3); dispositionAction1.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); dispositionAction1.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); - List events = new ArrayList(1); + List events = new ArrayList<>(1); events.add("related_record_trasfered_inactive_storage"); dispositionAction1.put(PROP_DISPOSITION_EVENT, (Serializable) events); @@ -92,7 +92,7 @@ public class RM1914Test extends BaseRMTestCase DispositionSchedule dispositionSchedule2 = dispositionService.createDispositionSchedule(category2, dsProps); // - cutoff immediatelly - Map dispositionAction2_1 = new HashMap(3); + Map dispositionAction2_1 = new HashMap<>(3); dispositionAction2_1.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); dispositionAction2_1.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); dispositionAction2_1.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); @@ -100,7 +100,7 @@ public class RM1914Test extends BaseRMTestCase dispositionService.addDispositionActionDefinition(dispositionSchedule2, dispositionAction2_1); // - Transfer Immediatelly - Map dispositionAction2_2 = new HashMap(4); + Map dispositionAction2_2 = new HashMap<>(4); dispositionAction2_2.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); dispositionAction2_2.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); dispositionAction2_2.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2072Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2072Test.java index 9e2203748d..45e9e6f2fc 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2072Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2072Test.java @@ -128,7 +128,7 @@ public class RM2072Test extends BaseRMTestCase } }); - List records = new ArrayList(NUMBER_OF_BATCHES*NUMBER_IN_BATCH); + List records = new ArrayList<>(NUMBER_OF_BATCHES * NUMBER_IN_BATCH); for (int i = 0; i < NUMBER_OF_BATCHES; i++) { @@ -138,7 +138,7 @@ public class RM2072Test extends BaseRMTestCase @Override public List run() throws Exception { - List records = new ArrayList(NUMBER_IN_BATCH); + List records = new ArrayList<>(NUMBER_IN_BATCH); for (int j = 0; j < NUMBER_IN_BATCH; j++) { int count = (finali+1)*(j+1); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2190Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2190Test.java index 387439b521..13f47b5cde 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2190Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM2190Test.java @@ -172,7 +172,7 @@ public class RM2190Test extends BaseRMTestCase private List addFilesToFolder(final NodeRef folder) { - List records = new ArrayList(NUMBER_OF_BATCHES * NUMBER_IN_BATCH); + List records = new ArrayList<>(NUMBER_OF_BATCHES * NUMBER_IN_BATCH); for (int i = 0; i < NUMBER_OF_BATCHES; i++) { @@ -182,7 +182,7 @@ public class RM2190Test extends BaseRMTestCase @Override public List run() throws Exception { - List files = new ArrayList(NUMBER_IN_BATCH); + List files = new ArrayList<>(NUMBER_IN_BATCH); for (int j = 0; j < NUMBER_IN_BATCH; j++) { int count = (finali+1)*(j+1); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java index 39f1d80461..4bd003cde7 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3993Test.java @@ -135,7 +135,7 @@ public class RM3993Test extends BaseRMTestCase } }); - List records = new ArrayList(NUMBER_OF_BATCHES * NUMBER_IN_BATCH); + List records = new ArrayList<>(NUMBER_OF_BATCHES * NUMBER_IN_BATCH); for (int i = 0; i < NUMBER_OF_BATCHES; i++) { @@ -145,7 +145,7 @@ public class RM3993Test extends BaseRMTestCase @Override public List run() throws Exception { - List records = new ArrayList(NUMBER_IN_BATCH); + List records = new ArrayList<>(NUMBER_IN_BATCH); for (int j = 0; j < NUMBER_IN_BATCH; j++) { int count = (finali)* NUMBER_IN_BATCH + (j + 1); @@ -216,7 +216,7 @@ public class RM3993Test extends BaseRMTestCase private NodeRef createFile(NodeRef parentNodeRef, String name, String descrption, QName typeQName) { - Map properties = new HashMap(11); + Map properties = new HashMap<>(11); properties.put(ContentModel.PROP_NAME, (Serializable) name); properties.put(ContentModel.PROP_DESCRIPTION, (Serializable) descrption); QName assocQName = QName.createQName( diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4163Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4163Test.java index ca408dc4c4..67d290d1af 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4163Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4163Test.java @@ -130,13 +130,13 @@ public class RM4163Test extends BaseRMTestCase }); //create 4 documents in documentLibrary - List documents = new ArrayList(4); + List documents = new ArrayList<>(4); documents.addAll(doTestInTransaction(new Test>() { @Override public List run() throws Exception { - List documents = new ArrayList(4); + List documents = new ArrayList<>(4); NodeRef document = createFile(documentLibrary, "document1.txt", "desc1", ContentModel.TYPE_CONTENT); documents.add(document); document = createFile(documentLibrary, "document2.txt", "desc2", ContentModel.TYPE_CONTENT); @@ -189,7 +189,7 @@ public class RM4163Test extends BaseRMTestCase private NodeRef createFile(NodeRef parentNodeRef, String name, String descrption, QName typeQName) { - Map properties = new HashMap(11); + Map properties = new HashMap<>(11); properties.put(ContentModel.PROP_NAME, (Serializable) name); properties.put(ContentModel.PROP_DESCRIPTION, (Serializable) descrption); QName assocQName = QName.createQName( diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java index 5de7ee766c..8848116bcb 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java @@ -77,7 +77,7 @@ public class RM4804Test extends BaseRMTestCase NodeRef recordCategory = filePlanService.createRecordCategory(filePlan, GUID.generate()); // create a disposition schedule for category, applied on folder - Map dsProps = new HashMap(3); + Map dsProps = new HashMap<>(3); dsProps.put(PROP_DISPOSITION_AUTHORITY, CommonRMTestUtils.DEFAULT_DISPOSITION_AUTHORITY); dsProps.put(PROP_DISPOSITION_INSTRUCTIONS, GUID.generate()); dsProps.put(PROP_RECORD_LEVEL_DISPOSITION, false); @@ -86,7 +86,7 @@ public class RM4804Test extends BaseRMTestCase dsProps); // cutoff immediately - Map dispositionActionCutOff = new HashMap(3); + Map dispositionActionCutOff = new HashMap<>(3); dispositionActionCutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); dispositionActionCutOff.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); dispositionActionCutOff.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); @@ -94,7 +94,7 @@ public class RM4804Test extends BaseRMTestCase dispositionService.addDispositionActionDefinition(dispositionSchedule, dispositionActionCutOff); // transfer immediately - Map dispositionActionTransfer = new HashMap(4); + Map dispositionActionTransfer = new HashMap<>(4); dispositionActionTransfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); dispositionActionTransfer.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); dispositionActionTransfer.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); @@ -105,7 +105,7 @@ public class RM4804Test extends BaseRMTestCase // add folder under category NodeRef recordFolder = recordFolderService.createRecordFolder(recordCategory, GUID.generate()); // add record of type PDF under folder - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(ContentModel.PROP_TITLE, GUID.generate()); InputStream inputStream = IOUtils.toInputStream(GUID.generate()); record = utils.createRecord(recordFolder, GUID.generate(), props, MimetypeMap.MIMETYPE_PDF, inputStream); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM978Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM978Test.java index 96e36fb558..59280b31ab 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM978Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM978Test.java @@ -161,7 +161,7 @@ public class RM978Test extends BaseRMTestCase List childAssocs = nodeService.getChildAssocs(documentLibrary); assertNotNull(childAssocs); - List childNames = new ArrayList(); + List childNames = new ArrayList<>(); for (ChildAssociationRef childAssociationRef : childAssocs) { NodeRef childRef = childAssociationRef.getChildRef(); @@ -266,7 +266,7 @@ public class RM978Test extends BaseRMTestCase List childAssocs = nodeService.getChildAssocs(documentLibrary2); assertNotNull(childAssocs); - List childNames = new ArrayList(); + List childNames = new ArrayList<>(); for (ChildAssociationRef childAssociationRef : childAssocs) { NodeRef childRef = childAssociationRef.getChildRef(); @@ -558,7 +558,7 @@ public class RM978Test extends BaseRMTestCase List childAssocs = nodeService.getChildAssocs(documentLibrary); assertNotNull(childAssocs); - List childNames = new ArrayList(); + List childNames = new ArrayList<>(); for (ChildAssociationRef childAssociationRef : childAssocs) { NodeRef childRef = childAssociationRef.getChildRef(); @@ -663,7 +663,7 @@ public class RM978Test extends BaseRMTestCase List childAssocs = nodeService.getChildAssocs(documentLibrary2); assertNotNull(childAssocs); - List childNames = new ArrayList(); + List childNames = new ArrayList<>(); for (ChildAssociationRef childAssociationRef : childAssocs) { NodeRef childRef = childAssociationRef.getChildRef(); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM981SystemTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM981SystemTest.java index 944d7c5159..f563b47b6d 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM981SystemTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM981SystemTest.java @@ -55,7 +55,7 @@ public class RM981SystemTest extends TestCase { ExecutorService pool = Executors.newFixedThreadPool(2); SecureRandom rnd = new SecureRandom(); - List data = new ArrayList(); + List data = new ArrayList<>(); for (int i = 0; i < 100; i++) { String definitionname = "test_" + i + "_" + rnd.nextInt(Integer.MAX_VALUE); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java index edb5a7b5f5..052ee69d56 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/rm3314/RM3314Test.java @@ -48,7 +48,7 @@ public class RM3314Test extends BaseRMTestCase } /** registry to record callback from test beans "test.rm3114.1" and "test.rm3114.2" */ - public static Map callback = new HashMap(2); + public static Map callback = new HashMap<>(2); /** * Given that the custom model hasn't been initialised diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateRecordTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateRecordTest.java index 349ddeee97..f2ecdc5f2e 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateRecordTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/CreateRecordTest.java @@ -64,7 +64,7 @@ public class CreateRecordTest extends BaseRMTestCase public void given() { // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("CreateRecords")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); @@ -118,7 +118,7 @@ public class CreateRecordTest extends BaseRMTestCase public void given() { // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("CreateRecords")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); @@ -177,7 +177,7 @@ public class CreateRecordTest extends BaseRMTestCase public void given() { // create a role with view and create capabilities - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("CreateRecords")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); @@ -234,7 +234,7 @@ public class CreateRecordTest extends BaseRMTestCase public void given() { // create a role with view and create capabilities - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("CreateRecords")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java index 8563786312..6f7b33ba02 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java @@ -704,7 +704,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase AccessStatus.DENIED, // view record capability AccessStatus.DENIED, // edit non record metadata capability AccessStatus.DENIED)); // edit record metadata capability - ; } /** @@ -772,7 +771,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase AccessStatus.DENIED, // view record capability AccessStatus.DENIED, // edit non record metadata capability AccessStatus.DENIED)); // edit record metadata capability - ; } /** @@ -902,7 +900,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase AccessStatus.DENIED, // view record capability AccessStatus.DENIED, // edit non record metadata capability AccessStatus.DENIED)); // edit record metadata capability - ; } /** @@ -932,7 +929,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase .expect(3) .from(() -> authorityService.getContainedAuthorities(null, "GROUP_INPLACE_RECORD_MANAGEMENT", true).size()) .because("The read and write groups are reused."); - ; } /** diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java index 727af89284..5ac543fbeb 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java @@ -80,7 +80,7 @@ public class MoveRecordTest extends BaseRMTestCase sourceCategory = filePlanService.createRecordCategory(filePlan, GUID.generate()); utils.createBasicDispositionSchedule(sourceCategory, GUID.generate(), GUID.generate(), true, true); sourceRecordFolder = recordFolderService.createRecordFolder(sourceCategory, GUID.generate()); - destinationCategory = filePlanService.createRecordCategory(filePlan, GUID.generate());; + destinationCategory = filePlanService.createRecordCategory(filePlan, GUID.generate()); destinationRecordFolder = recordFolderService.createRecordFolder(destinationCategory, GUID.generate()); // create record @@ -230,7 +230,7 @@ public class MoveRecordTest extends BaseRMTestCase destinationCategory = filePlanService.createRecordCategory(filePlan, GUID.generate()); DispositionSchedule dis = utils.createBasicDispositionSchedule(destinationCategory, GUID.generate(), GUID.generate(), true, false); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); adParams.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); @@ -306,7 +306,7 @@ public class MoveRecordTest extends BaseRMTestCase // destination category destinationCategory = filePlanService.createRecordCategory(filePlan, GUID.generate()); DispositionSchedule dis = utils.createBasicDispositionSchedule(destinationCategory, GUID.generate(), GUID.generate(), true, false); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); adParams.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RejectRecordTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RejectRecordTest.java index b9cf258796..a1a85cd58f 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RejectRecordTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RejectRecordTest.java @@ -242,7 +242,7 @@ public class RejectRecordTest extends BaseRMTestCase // Upload New Version document = checkOutCheckInService.checkout(document); - Map props = new HashMap(2); + Map props = new HashMap<>(2); props.put(Version.PROP_DESCRIPTION, generate()); props.put(VersionModel.PROP_VERSION_TYPE, MINOR); document = checkOutCheckInService.checkin(document, props); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/UpdateRecordAspectsTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/UpdateRecordAspectsTest.java index ce9a10fe69..073a14ee24 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/UpdateRecordAspectsTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/UpdateRecordAspectsTest.java @@ -67,9 +67,8 @@ public class UpdateRecordAspectsTest extends BaseRMTestCase // create file plan structure and a record NodeRef rc = filePlanService.createRecordCategory(filePlan, GUID.generate()); NodeRef recordFolder = recordFolderService.createRecordFolder(rc, GUID.generate()); - NodeRef record = recordService.createRecordFromContent(recordFolder, GUID.generate(), TYPE_CONTENT, null, null); - return record; + return recordService.createRecordFromContent(recordFolder, GUID.generate(), TYPE_CONTENT, null, null); } }); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/ViewRecordTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/ViewRecordTest.java index b0d391046f..03b1270d89 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/ViewRecordTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/ViewRecordTest.java @@ -66,7 +66,7 @@ public class ViewRecordTest extends BaseRMTestCase public void given() { // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java index 223bba4fce..4062f5c0cb 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/DeleteRecordFolderTest.java @@ -60,7 +60,7 @@ public class DeleteRecordFolderTest extends BaseRMTestCase NodeRef testFolder = recordFolderService.createRecordFolder(rmContainer, "Peter Edward Francis"); // complete event - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(testFolder, CompleteEventAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java index e8b26622ea..91b8cbfe57 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java @@ -426,7 +426,7 @@ public class MoveRecordFolderTest extends BaseRMTestCase NodeRef testFolder = recordFolderService.createRecordFolder(rmContainer, "Peter Edward Francis"); // complete event - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(testFolder, CompleteEventAction.NAME, params); @@ -477,7 +477,7 @@ public class MoveRecordFolderTest extends BaseRMTestCase NodeRef testFolder = recordFolderService.createRecordFolder(rmContainer, "Peter Edward Francis"); // complete event - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(testFolder, CompleteEventAction.NAME, params); @@ -555,7 +555,7 @@ public class MoveRecordFolderTest extends BaseRMTestCase NodeRef rc = filePlanService.createRecordCategory(filePlan, GUID.generate()); DispositionSchedule dis = utils.createBasicDispositionSchedule(rc, GUID.generate(), GUID.generate(), recordLevel, false); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate()); adParams.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/CreateRelationshipTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/CreateRelationshipTest.java index 258fa51ec0..3424864f29 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/CreateRelationshipTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/CreateRelationshipTest.java @@ -71,7 +71,7 @@ public class CreateRelationshipTest extends BaseRMTestCase targetRecord = utils.createRecord(targetRecordFolder, GUID.generate()); // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("ChangeOrDeleteReferences")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); @@ -124,7 +124,7 @@ public class CreateRelationshipTest extends BaseRMTestCase targetRecord = utils.createRecord(targetRecordFolder, GUID.generate()); // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("ChangeOrDeleteReferences")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); @@ -178,7 +178,7 @@ public class CreateRelationshipTest extends BaseRMTestCase targetRecord = utils.createRecord(targetRecordFolder, GUID.generate()); // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("ChangeOrDeleteReferences")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/DeleteRelationshipTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/DeleteRelationshipTest.java index 74aebddae1..c65aff0f0b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/DeleteRelationshipTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/DeleteRelationshipTest.java @@ -112,7 +112,7 @@ public class DeleteRelationshipTest extends BaseRMTestCase targetRecord = utils.createRecord(targetRecordFolder, GUID.generate()); // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("ChangeOrDeleteReferences")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); @@ -168,7 +168,7 @@ public class DeleteRelationshipTest extends BaseRMTestCase targetRecord = utils.createRecord(targetRecordFolder, GUID.generate()); // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("ChangeOrDeleteReferences")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); @@ -224,7 +224,7 @@ public class DeleteRelationshipTest extends BaseRMTestCase targetRecord = utils.createRecord(targetRecordFolder, GUID.generate()); // create role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability("ViewRecords")); capabilities.add(capabilityService.getCapability("ChangeOrDeleteReferences")); filePlanRoleService.createRole(filePlan, roleName, roleName, capabilities); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java index 895d20f69d..3d04ddbf41 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java @@ -121,7 +121,7 @@ public class CreateTransferFolderAsNonAdminUserTest extends BaseRMTestCase recordsFolder = recordFolderService.createRecordFolder(category, generate()); // Make eligible for cut off - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(PARAM_EVENT_NAME, DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordsFolder, CompleteEventAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java index a3674b68a0..b7736213cf 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java @@ -128,7 +128,7 @@ public class FilingPermissionsOnTransferFolderTest extends BaseRMTestCase recordsFolder = recordFolderService.createRecordFolder(category, generate()); // Make eligible for cut off - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(PARAM_EVENT_NAME, DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordsFolder, CompleteEventAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java index 7e9c0345ba..7c31be6666 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java @@ -128,7 +128,7 @@ public class NoPermissionsOnTransferFolderTest extends BaseRMTestCase recordsFolder = recordFolderService.createRecordFolder(category, generate()); // Make eligible for cut off - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(PARAM_EVENT_NAME, DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordsFolder, CompleteEventAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java index 0b9debd6be..118109a88b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java @@ -132,7 +132,7 @@ public class ReadPermissionsOnTransferFolderTest extends BaseRMTestCase recordsFolder = recordFolderService.createRecordFolder(category, generate()); // Make eligible for cut off - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(PARAM_EVENT_NAME, DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordsFolder, CompleteEventAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AdHocRecordableVersionsTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AdHocRecordableVersionsTest.java index badff2fae1..667831711f 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AdHocRecordableVersionsTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AdHocRecordableVersionsTest.java @@ -61,7 +61,7 @@ public class AdHocRecordableVersionsTest extends RecordableVersionsBaseTest public void given() throws Exception { // setup version properties - versionProperties = new HashMap(4); + versionProperties = new HashMap<>(4); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, true); @@ -94,7 +94,7 @@ public class AdHocRecordableVersionsTest extends RecordableVersionsBaseTest public void given() throws Exception { // setup version properties - versionProperties = new HashMap(4); + versionProperties = new HashMap<>(4); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, false); @@ -127,7 +127,7 @@ public class AdHocRecordableVersionsTest extends RecordableVersionsBaseTest public void given() throws Exception { // setup version properties - versionProperties = new HashMap(4); + versionProperties = new HashMap<>(4); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, true); @@ -161,7 +161,7 @@ public class AdHocRecordableVersionsTest extends RecordableVersionsBaseTest public void given() throws Exception { // setup version properties - versionProperties = new HashMap(4); + versionProperties = new HashMap<>(4); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, true); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AutoVersionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AutoVersionTest.java index 08e04fc42e..1e2eb52020 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AutoVersionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/AutoVersionTest.java @@ -105,7 +105,7 @@ public class AutoVersionTest extends RecordableVersionsBaseTest myDocument = fileFolderService.create(dmFolder, GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef(); // make versionable - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(ContentModel.PROP_INITIAL_VERSION, false); nodeService.addAspect(myDocument, ContentModel.ASPECT_VERSIONABLE, props); } @@ -148,7 +148,7 @@ public class AutoVersionTest extends RecordableVersionsBaseTest myDocument = fileFolderService.create(dmFolder, GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef(); // make versionable - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(ContentModel.PROP_INITIAL_VERSION, false); nodeService.addAspect(myDocument, ContentModel.ASPECT_VERSIONABLE, props); } @@ -202,7 +202,7 @@ public class AutoVersionTest extends RecordableVersionsBaseTest myDocument = fileFolderService.create(dmFolder, GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef(); // make versionable - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(ContentModel.PROP_INITIAL_VERSION, true); nodeService.addAspect(myDocument, ContentModel.ASPECT_VERSIONABLE, props); } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeclareAsRecordVersionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeclareAsRecordVersionTest.java index 67eece88cd..ef4fa3658c 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeclareAsRecordVersionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeclareAsRecordVersionTest.java @@ -78,7 +78,7 @@ public class DeclareAsRecordVersionTest extends RecordableVersionsBaseTest public void given() throws Exception { // setup version properties - versionProperties = new HashMap(4); + versionProperties = new HashMap<>(4); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); @@ -126,7 +126,7 @@ public class DeclareAsRecordVersionTest extends RecordableVersionsBaseTest public void given() throws Exception { // setup version properties - versionProperties = new HashMap(4); + versionProperties = new HashMap<>(4); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); versionProperties.put(RecordableVersionServiceImpl.KEY_RECORDABLE_VERSION, true); @@ -181,7 +181,7 @@ public class DeclareAsRecordVersionTest extends RecordableVersionsBaseTest prepareContent(customDocument); // setup version properties - versionProperties = new HashMap(2); + versionProperties = new HashMap<>(2); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MINOR); @@ -246,7 +246,7 @@ public class DeclareAsRecordVersionTest extends RecordableVersionsBaseTest assertTrue("Modified date must be after or on creation date", createdDate.getTime() == modificationDate.getTime()); // Set initial set of properties - Map properties = new HashMap(3); + Map properties = new HashMap<>(3); // Ensure default behaviour autoversion on change properties is set to false properties.put(ContentModel.PROP_AUTO_VERSION_PROPS, false); // Set initial name @@ -260,7 +260,7 @@ public class DeclareAsRecordVersionTest extends RecordableVersionsBaseTest nodeService.setType(myDocument, TYPE_CUSTOM_TYPE); // setup version properties - versionProperties = new HashMap(2); + versionProperties = new HashMap<>(2); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR); @@ -336,7 +336,7 @@ public class DeclareAsRecordVersionTest extends RecordableVersionsBaseTest assertTrue("Modified date must be after or on creation date", createdDate.getTime() == modificationDate.getTime()); // Set initial set of properties - Map properties = new HashMap(3); + Map properties = new HashMap<>(3); // Ensure default behaviour autoversion on change properties is set to false properties.put(ContentModel.PROP_AUTO_VERSION_PROPS, false); // Set initial name @@ -350,7 +350,7 @@ public class DeclareAsRecordVersionTest extends RecordableVersionsBaseTest nodeService.setType(myDocument, TYPE_CUSTOM_TYPE); // setup version properties - versionProperties = new HashMap(2); + versionProperties = new HashMap<>(2); versionProperties.put(Version.PROP_DESCRIPTION, DESCRIPTION); versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java index 779df10d4b..a599cb8bc5 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java @@ -79,7 +79,7 @@ public class DeleteRecordVersionTest extends RecordableVersionsBaseTest myDocument = fileFolderService.create(dmFolder, GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef(); // make versionable - Map props = new HashMap(2); + Map props = new HashMap<>(2); props.put(RecordableVersionModel.PROP_RECORDABLE_VERSION_POLICY, RecordableVersionPolicy.ALL); props.put(RecordableVersionModel.PROP_FILE_PLAN, filePlan); nodeService.addAspect(myDocument, RecordableVersionModel.ASPECT_VERSIONABLE, props); @@ -162,7 +162,7 @@ public class DeleteRecordVersionTest extends RecordableVersionsBaseTest writer.putContent(GUID.generate()); // make versionable - Map props = new HashMap(2); + Map props = new HashMap<>(2); props.put(RecordableVersionModel.PROP_RECORDABLE_VERSION_POLICY, RecordableVersionPolicy.ALL); props.put(RecordableVersionModel.PROP_FILE_PLAN, filePlan); nodeService.addAspect(myDocument, RecordableVersionModel.ASPECT_VERSIONABLE, props); @@ -449,7 +449,7 @@ public class DeleteRecordVersionTest extends RecordableVersionsBaseTest Version version11 = versionHistory.getVersion("1.1"); recordVersion11 = recordableVersionService.getVersionRecord(version11); - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordVersion11, CompleteEventAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java index 2727c0b730..fd44493daf 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java @@ -231,7 +231,7 @@ public abstract class RecordableVersionsBaseTest extends BaseRMTestCase implemen protected void checkProperties(NodeRef frozen, Map beforeProperies) { Map frozenProperties = nodeService.getProperties(frozen); - Map cloneFrozenProperties = new HashMap(frozenProperties); + Map cloneFrozenProperties = new HashMap<>(frozenProperties); for (Map.Entry entry : beforeProperies.entrySet()) { QName beforePropertyName = entry.getKey(); @@ -284,7 +284,7 @@ public abstract class RecordableVersionsBaseTest extends BaseRMTestCase implemen */ protected void checkAspects(NodeRef frozen, Set beforeAspects) { - Set cloneBeforeAspects = new HashSet(beforeAspects); + Set cloneBeforeAspects = new HashSet<>(beforeAspects); // compare origional and frozen aspects Set frozenAspects = nodeService.getAspects(frozen); @@ -325,7 +325,7 @@ public abstract class RecordableVersionsBaseTest extends BaseRMTestCase implemen writer.putContent(GUID.generate()); // make versionable - Map props = new HashMap(2); + Map props = new HashMap<>(2); props.put(RecordableVersionModel.PROP_RECORDABLE_VERSION_POLICY, RecordableVersionPolicy.ALL); props.put(RecordableVersionModel.PROP_FILE_PLAN, filePlan); nodeService.addAspect(testDoc, RecordableVersionModel.ASPECT_VERSIONABLE, props); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java index 0afe5d76f5..85426f92f9 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java @@ -75,7 +75,7 @@ public class CreateRecordActionTest extends BaseRMTestCase assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(dmDocument, RMPermissionModel.READ_RECORDS)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(filePlan, RMPermissionModel.VIEW_RECORDS)); - }; + } }, dmCollaborator); } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/DeclareVersionAsRecordActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/DeclareVersionAsRecordActionTest.java index 78f2798ba0..708eea866b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/DeclareVersionAsRecordActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/DeclareVersionAsRecordActionTest.java @@ -81,7 +81,7 @@ public class DeclareVersionAsRecordActionTest extends BaseRMTestCase { doBehaviourDrivenTest(new BehaviourDrivenTest(dmContributor) { - Map versionProperties = new HashMap(4); + Map versionProperties = new HashMap<>(4); Version recordedVersion; @Override diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java index 7b50fe5fd6..11410d32ad 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java @@ -94,7 +94,7 @@ public class FileToActionTest extends BaseRMTestCase public void when() throws Exception { // set parameters - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(FileToAction.PARAM_DESTINATION_RECORD_FOLDER, rmFolder); // execute file-to action @@ -164,7 +164,7 @@ public class FileToActionTest extends BaseRMTestCase public void when() throws Exception { // set parameters - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(FileToAction.PARAM_PATH, PATH); // execute file-to action @@ -199,7 +199,7 @@ public class FileToActionTest extends BaseRMTestCase public void when() throws Exception { // set parameters - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(FileToAction.PARAM_PATH, PATH2); // execute file-to action @@ -248,7 +248,7 @@ public class FileToActionTest extends BaseRMTestCase final String[] pathValues = StringUtils.tokenizeToStringArray(resolvedPath, "/"); // set parameters - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(FileToAction.PARAM_PATH, path); params.put(FileToAction.PARAM_CREATE_RECORD_PATH, true); @@ -257,11 +257,11 @@ public class FileToActionTest extends BaseRMTestCase public Void run() throws Exception { // show the folder doesn't exist to begin with - FileInfo createdRecordFolder = fileFolderService.resolveNamePath(filePlan, new ArrayList(Arrays.asList(pathValues)), false); + FileInfo createdRecordFolder = fileFolderService.resolveNamePath(filePlan, new ArrayList<>(Arrays.asList(pathValues)), false); assertNull(createdRecordFolder); // set parameters - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(FileToAction.PARAM_PATH, path); params.put(FileToAction.PARAM_CREATE_RECORD_PATH, true); @@ -284,7 +284,7 @@ public class FileToActionTest extends BaseRMTestCase public Void run() throws Exception { // show the folder has now been created - FileInfo createdRecordFolder = fileFolderService.resolveNamePath(filePlan, new ArrayList(Arrays.asList(pathValues)), false); + FileInfo createdRecordFolder = fileFolderService.resolveNamePath(filePlan, new ArrayList<>(Arrays.asList(pathValues)), false); assertNotNull(createdRecordFolder); assertEquals(name, createdRecordFolder.getName()); NodeRef createdRecordFolderNodeRef = createdRecordFolder.getNodeRef(); @@ -332,7 +332,7 @@ public class FileToActionTest extends BaseRMTestCase public void run() throws Exception { // set parameters - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(FileToAction.PARAM_PATH, PATH_BAD); // execute file-to action @@ -350,7 +350,7 @@ public class FileToActionTest extends BaseRMTestCase public void run() throws Exception { // set parameters - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(FileToAction.PARAM_PATH, PATH_CREATE); // execute file-to action diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java index 17d58c17cd..20c7dbfa07 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java @@ -104,7 +104,7 @@ public class RecordableVersionConfigActionTest extends BaseRMTestCase public void test(Void result) throws Exception { assertNull(nodeService.getProperty(dmFolder, PROP_RECORDABLE_VERSION_POLICY)); - }; + } }, dmCollaborator); @@ -122,7 +122,7 @@ public class RecordableVersionConfigActionTest extends BaseRMTestCase public void test(Void result) throws Exception { assertNull(nodeService.getProperty(document2, PROP_RECORDABLE_VERSION_POLICY)); - }; + } }, dmCollaborator); @@ -145,7 +145,7 @@ public class RecordableVersionConfigActionTest extends BaseRMTestCase public void test(Void result) throws Exception { assertNull(nodeService.getProperty(document3, PROP_RECORDABLE_VERSION_POLICY)); - }; + } }, dmCollaborator); } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/DeclarativeCapabilityTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/DeclarativeCapabilityTest.java index 732fea8cbb..8d833c093b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/DeclarativeCapabilityTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/DeclarativeCapabilityTest.java @@ -213,7 +213,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase boolean conditionResult = getConditionResult(filePlanComponent, conditions); assertEquals("User is expected to only have one role.", 1, roles.size()); - Role role = new ArrayList(roles).get(0); + Role role = new ArrayList<>(roles).get(0); assertNotNull(role); Set roleCapabilities = role.getCapabilities(); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java index d3a38e502f..19f4892cc9 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java @@ -145,11 +145,11 @@ public class CustomEMailMappingServiceImplTest extends BaseRMTestCase private boolean checkCustomMappingsSize(int expected) { - return expected == eMailMappingService.getCustomMappings().size() ? true : false; + return expected == eMailMappingService.getCustomMappings().size(); } private boolean checkEmailMappingKeysSize(int expected) { - return expected == eMailMappingService.getEmailMappingKeys().size() ? true : false; + return expected == eMailMappingService.getEmailMappingKeys().size(); } } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java index 8b621aeb05..9768755ede 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java @@ -622,7 +622,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase checkDisposableItemUnchanged(mhRecordFolder42); checkDisposableItemUnchanged(record43); checkDisposableItemUnchanged(mhRecordFolder44); - checkDisposableItemUnchanged(record45);; + checkDisposableItemUnchanged(record45); } }); @@ -644,7 +644,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase checkDisposableItemChanged(mhRecordFolder42); checkDisposableItemUnchanged(record43); checkDisposableItemUnchanged(mhRecordFolder44); - checkDisposableItemUnchanged(record45);; + checkDisposableItemUnchanged(record45); } }); @@ -743,7 +743,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase private void updateDispositionScheduleOnContainer(NodeRef nodeRef) { - Map updateProps = new HashMap(3); + Map updateProps = new HashMap<>(3); updateProps.put(PROP_DISPOSITION_PERIOD, "week|1"); updateProps.put(PROP_DISPOSITION_EVENT, (Serializable)Arrays.asList(CommonRMTestUtils.DEFAULT_EVENT_NAME, "abolished")); @@ -769,14 +769,14 @@ public class DispositionServiceImplTest extends BaseRMTestCase assertNotNull(events); assertEquals(arrEventNames.length, events.size()); - List origEvents = new ArrayList(events.size()); + List origEvents = new ArrayList<>(events.size()); for (EventCompletionDetails event : events) { origEvents.add(event.getEventName()); } List expectedEvents = Arrays.asList(arrEventNames); - Collection copy = new ArrayList(origEvents); + Collection copy = new ArrayList<>(origEvents); for (Iterator i = origEvents.iterator(); i.hasNext(); ) { @@ -857,7 +857,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase true, false); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, "cutoff"); adParams.put(PROP_DISPOSITION_DESCRIPTION, "test"); adParams.put(PROP_DISPOSITION_PERIOD, "week|1"); @@ -971,9 +971,9 @@ public class DispositionServiceImplTest extends BaseRMTestCase DispositionActionDefinition actionDefinition = testRM386DispositionSchedule.getDispositionActionDefinitionByName("cutoff"); assertNotNull(actionDefinition); - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); - List events = new ArrayList(1); + List events = new ArrayList<>(1); events.add(CommonRMTestUtils.DEFAULT_EVENT_NAME); events.add("obsolete"); adParams.put(PROP_DISPOSITION_EVENT, (Serializable)events); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java index 982014beff..403ef9c56f 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java @@ -102,14 +102,14 @@ public class ExtendedSecurityServiceImplTest extends BaseRMTestCase assertTrue(extendedSecurityService.getReaders(record).isEmpty()); assertTrue(extendedSecurityService.getWriters(record).isEmpty()); - Set extendedReaders = new HashSet(2); + Set extendedReaders = new HashSet<>(2); extendedReaders.add(monkey); extendedReaders.add(elephant); extendedSecurityService.set(record, extendedReaders, null); checkExtendedReaders(record, extendedReaders); - Set extendedReadersToo = new HashSet(2); + Set extendedReadersToo = new HashSet<>(2); extendedReadersToo.add(monkey); extendedReadersToo.add(snake); @@ -135,7 +135,7 @@ public class ExtendedSecurityServiceImplTest extends BaseRMTestCase doTestInTransaction(new Test() { - Set extendedReaders = new HashSet(2);; + Set extendedReaders = new HashSet<>(2); public Void run() throws Exception { diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanPermissionServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanPermissionServiceImplTest.java index 2ccba8fbcf..c98b770d84 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanPermissionServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanPermissionServiceImplTest.java @@ -1229,7 +1229,7 @@ public class FilePlanPermissionServiceImplTest extends BaseRMTestCase private void assertExistenceOfSpecialRolesAndPermissions(NodeRef node) { - Map accessPermissions = new HashMap(); + Map accessPermissions = new HashMap<>(); Set permissions = permissionService.getAllSetPermissions(node); // FIXME!!! //assertEquals(3, permissions.size()); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanRoleServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanRoleServiceImplTest.java index f8919906e5..fb2f424a46 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanRoleServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanRoleServiceImplTest.java @@ -150,7 +150,7 @@ public class FilePlanRoleServiceImplTest extends BaseRMTestCase { assertFalse(filePlanRoleService.existsRole(filePlan, "Michelle Holt")); - Set caps = new HashSet(2); + Set caps = new HashSet<>(2); caps.add(capabilityService.getCapability(RMPermissionModel.ACCESS_AUDIT)); caps.add(capabilityService.getCapability(RMPermissionModel.ADD_MODIFY_EVENT_DATES)); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java index 4a1e7794b3..4bf0552b1b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java @@ -112,7 +112,7 @@ public class FreezeServiceImplTest extends BaseRMTestCase assertEquals("NewFreezeReason", holdService.getHoldReason(holdNodeRef)); // Freeze a number of records - List records = new ArrayList(); + List records = new ArrayList<>(); records.add(recordOne); records.add(recordTwo); records.add(recordThree); @@ -237,7 +237,7 @@ public class FreezeServiceImplTest extends BaseRMTestCase NodeRef hold = holdService.createHold(filePlan, "hold 1", "AnotherFreezeReason", "description"); holdService.addToHold(hold, recordFour); holdService.addToHold(hold, recordOne); - List nodes = new ArrayList(); + List nodes = new ArrayList<>(); nodes.add(recordTwo); nodes.add(recordThree); holdService.addToHold(hold, nodes); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordServiceImplTest.java index 247aeee809..00f8aab487 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordServiceImplTest.java @@ -222,7 +222,7 @@ public class RecordServiceImplTest extends BaseRMTestCase implements BeforeRecor @Override public Void run() { - Set writers = new HashSet(1); + Set writers = new HashSet<>(1); writers.add(dmCollaborator); extendedSecurityService.set(recordOne, null, writers); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementActionServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementActionServiceImplTest.java index 1a0a4061ec..6c9803da36 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementActionServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementActionServiceImplTest.java @@ -92,7 +92,7 @@ public class RecordsManagementActionServiceImplTest extends BaseRMTestCase ContentModel.TYPE_CONTENT).getChildRef(); // Create nodeRef list - nodeRefs = new ArrayList(5); + nodeRefs = new ArrayList<>(5); for (int i = 0; i < 5; i++) { nodeRefs.add( @@ -135,7 +135,7 @@ public class RecordsManagementActionServiceImplTest extends BaseRMTestCase { List result = this.rmActionService.getRecordsManagementActions(); assertNotNull(result); - Map resultMap = new HashMap(8); + Map resultMap = new HashMap<>(8); for (RecordsManagementAction action : result) { resultMap.put(action.getName(), action); @@ -145,7 +145,7 @@ public class RecordsManagementActionServiceImplTest extends BaseRMTestCase assertTrue(resultMap.containsKey(TestAction2.NAME)); result = this.rmActionService.getDispositionActions(); - resultMap = new HashMap(8); + resultMap = new HashMap<>(8); for (RecordsManagementAction action : result) { resultMap.put(action.getName(), action); @@ -225,7 +225,7 @@ public class RecordsManagementActionServiceImplTest extends BaseRMTestCase assertFalse(onMarker); assertFalse(this.nodeService.hasAspect(this.nodeRef, ASPECT_RECORD)); - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(TestAction.PARAM, TestAction.PARAM_VALUE); this.rmActionService.executeRecordsManagementAction(this.nodeRef, TestAction.NAME, params); @@ -259,7 +259,7 @@ public class RecordsManagementActionServiceImplTest extends BaseRMTestCase assertFalse(this.nodeService.hasAspect(nodeRef, ASPECT_RECORD)); } - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(TestAction.PARAM, TestAction.PARAM_VALUE); this.rmActionService.executeRecordsManagementAction(this.nodeRefs, TestAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java index e07520e154..698b5aa871 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java @@ -88,8 +88,8 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase @Override protected void setUp() throws Exception { - createdCustomProperties = new ArrayList(); - madeCustomisable = new ArrayList(); + createdCustomProperties = new ArrayList<>(); + madeCustomisable = new ArrayList<>(); super.setUp(); } @@ -576,7 +576,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase utils.completeRecord(testRecord1); utils.completeRecord(testRecord2); - Map params = new HashMap(); + Map params = new HashMap<>(); params.put("referenceType", refType.toString()); if (label != null) params.put("label", label); if (source != null) params.put("source", source); @@ -599,7 +599,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase RelationshipDefinition relationshipDefinition = relationshipService.createRelationshipDefinition(displayName); // Get the qualified name - QName qNameResult = QName.createQName(RM_CUSTOM_PREFIX, relationshipDefinition.getUniqueName(), namespaceService);; + QName qNameResult = QName.createQName(RM_CUSTOM_PREFIX, relationshipDefinition.getUniqueName(), namespaceService); System.out.println("Creating new " + refType + " reference definition: " + qNameResult); System.out.println(" params- label: '" + label + "' source: '" + source + "' target: '" + target + "'"); @@ -760,7 +760,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase { NodeRef rec1 = utils.createRecord(rmFolder, "testRecordA" + System.currentTimeMillis()); NodeRef rec2 = utils.createRecord(rmFolder, "testRecordB" + System.currentTimeMillis()); - Pair result = new Pair(rec1, rec2); + Pair result = new Pair<>(rec1, rec2); return result; } }); @@ -824,7 +824,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase }); final String conTitle = "test title - "+testRunID; - final List allowedValues = new ArrayList(3); + final List allowedValues = new ArrayList<>(3); allowedValues.add("RED"); allowedValues.add("AMBER"); allowedValues.add("GREEN"); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java index b8e5ec7120..fd2222fae5 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java @@ -428,7 +428,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase // Not serious } authenticationService.createAuthentication("cdickons", getName().toCharArray()); - Map personProperties = new HashMap(); + Map personProperties = new HashMap<>(); personProperties.put(ContentModel.PROP_USERNAME, "cdickons"); personProperties.put(ContentModel.PROP_FIRSTNAME, "Charles"); personProperties.put(ContentModel.PROP_LASTNAME, "Dickons"); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementServiceImplTest.java index 3945fc3d49..756afca94d 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementServiceImplTest.java @@ -177,7 +177,7 @@ public class RecordsManagementServiceImplTest extends BaseRMTestCase @Override public NodeRef run() { - List roots = new ArrayList(filePlanService.getFilePlans()); + List roots = new ArrayList<>(filePlanService.getFilePlans()); assertNotNull(roots); assertTrue(roots.size() != 0); assertTrue(roots.contains(filePlan)); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ReportServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ReportServiceImplTest.java index 1aaa8640a8..f11cee7467 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ReportServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ReportServiceImplTest.java @@ -164,14 +164,14 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel @Override public Void run() throws Exception { - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(rmFolder, CompleteEventAction.NAME, params); rmActionService.executeRecordsManagementAction(rmFolder, CutOffAction.NAME); rmActionService.executeRecordsManagementAction(rmFolder, DestroyAction.NAME); - Map fileReportParams = new HashMap(2); + Map fileReportParams = new HashMap<>(2); fileReportParams.put(FileReportAction.REPORT_TYPE, "rmr:destructionReport"); fileReportParams.put(FileReportAction.DESTINATION, filePlan.toString()); rmActionService.executeRecordsManagementAction(rmFolder, FileReportAction.NAME, fileReportParams); @@ -188,7 +188,7 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel public Void run() throws Exception { // Create transfer report for the transfer object - Map params = new HashMap(2); + Map params = new HashMap<>(2); params.put(FileReportAction.REPORT_TYPE, "rmr:transferReport"); params.put(FileReportAction.DESTINATION, filePlan.toString()); RecordsManagementActionResult transferReportAction = rmActionService.executeRecordsManagementAction(getTransferObject(), FileReportAction.NAME, params); @@ -223,7 +223,7 @@ public class ReportServiceImplTest extends BaseRMTestCase implements ReportModel nodeService.setProperty(recordFolder, PROP_IDENTIFIER, identifier); // Complete event - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, CommonRMTestUtils.DEFAULT_EVENT_NAME); rmActionService.executeRecordsManagementAction(recordFolder, CompleteEventAction.NAME, params); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ActionDefinitionsRestApiTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ActionDefinitionsRestApiTest.java index 0d5abb069e..f615e2bc70 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ActionDefinitionsRestApiTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ActionDefinitionsRestApiTest.java @@ -75,7 +75,7 @@ public class ActionDefinitionsRestApiTest extends BaseRMWebScriptTestCase List dmActionDefinitions = getDmActionDefinitions(); // Get the list of rm action definitions from the response and check it - List rmActionDefinitions = new ArrayList(); + List rmActionDefinitions = new ArrayList<>(); for (int i = 0; i < data.length(); i++) { String name = data.getJSONObject(i).getString("name"); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java index c7ff4ceda1..a76291c591 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java @@ -118,7 +118,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase createUser("jdoe"); - List values = new ArrayList(); + List values = new ArrayList<>(); values.add("NOFORN"); values.add("FGI"); caveatConfigService.updateRMConstraintListAuthority(RM_LIST, "fbloggs", values); @@ -542,7 +542,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase } caveatConfigService.addRMConstraint(RM_LIST, "my title", new String[0]); - List values = new ArrayList(); + List values = new ArrayList<>(); values.add("NOFORN"); values.add("FGI"); caveatConfigService.updateRMConstraintListAuthority(RM_LIST, "fbloggs", values); @@ -845,7 +845,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase private boolean compare(JSONArray from, JSONArray to) throws Exception { - List ret = new ArrayList(); + List ret = new ArrayList<>(); if(from.length() != to.length()) { diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java index b470fdbfac..d69cb55c59 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java @@ -73,7 +73,7 @@ public class RMConstraintScriptTest extends BaseRMWebScriptTestCase createUser("jdoe"); - List values = new ArrayList(); + List values = new ArrayList<>(); values.add("NOFORN"); values.add("FGI"); caveatConfigService.updateRMConstraintListAuthority(RM_LIST, "fbloggs", values); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmAuthoritiesRestApiTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmAuthoritiesRestApiTest.java index 8e5e945452..43599aa809 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmAuthoritiesRestApiTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmAuthoritiesRestApiTest.java @@ -88,7 +88,7 @@ public class RmAuthoritiesRestApiTest extends BaseRMWebScriptTestCase // Create test user WITH required capability createUser(USER_WITH_CAPABILITY); // Create test role - Set capabilities = new HashSet(2); + Set capabilities = new HashSet<>(2); capabilities.add(capabilityService.getCapability(RMPermissionModel.VIEW_RECORDS)); capabilities.add(capabilityService.getCapability(RMPermissionModel.MANAGE_ACCESS_CONTROLS)); filePlanRoleService.createRole(filePlan, ROLE_INCLUDING_CAPABILITY, ROLE_INCLUDING_CAPABILITY, capabilities); @@ -98,7 +98,7 @@ public class RmAuthoritiesRestApiTest extends BaseRMWebScriptTestCase // Create test user WITHOUT required capability createUser(USER_WITHOUT_CAPABILITY); // Create test role - filePlanRoleService.createRole(filePlan, ROLE_NOT_INCLUDING_CAPABILITY, ROLE_NOT_INCLUDING_CAPABILITY, new HashSet(1)); + filePlanRoleService.createRole(filePlan, ROLE_NOT_INCLUDING_CAPABILITY, ROLE_NOT_INCLUDING_CAPABILITY, new HashSet<>(1)); // Add user to the role filePlanRoleService.assignRoleToAuthority(filePlan, ROLE_NOT_INCLUDING_CAPABILITY, USER_WITHOUT_CAPABILITY); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmClassesRestApiTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmClassesRestApiTest.java index c350e33c3e..cb75aab328 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmClassesRestApiTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmClassesRestApiTest.java @@ -84,7 +84,7 @@ public class RmClassesRestApiTest extends BaseRMWebScriptTestCase List rmAspects = getRmAspects(); // Get the list of rm aspects from the response and check it - List rmAspectList = new ArrayList(); + List rmAspectList = new ArrayList<>(); for (int i = 0; i < contentAsJson.length(); i++) { String name = contentAsJson.getJSONObject(i).getString("name"); @@ -109,7 +109,7 @@ public class RmClassesRestApiTest extends BaseRMWebScriptTestCase assertNotNull(contentAsJson); // Get the list of dm aspects from the response and check it - List dmAspectList = new ArrayList(); + List dmAspectList = new ArrayList<>(); for (int i = 0; i < contentAsJson.length(); i++) { String name = contentAsJson.getJSONObject(i).getString("name"); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmPropertiesRestApiTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmPropertiesRestApiTest.java index f23408ec46..b27af500a4 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmPropertiesRestApiTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmPropertiesRestApiTest.java @@ -84,7 +84,7 @@ public class RmPropertiesRestApiTest extends BaseRMWebScriptTestCase List rmTypes = getRmTypes(); // Get the list of rm types from the response and check it - List rmTypeList = new ArrayList(); + List rmTypeList = new ArrayList<>(); for (int i = 0; i < contentAsJson.length(); i++) { String name = contentAsJson.getJSONObject(i).getString("name"); @@ -109,7 +109,7 @@ public class RmPropertiesRestApiTest extends BaseRMWebScriptTestCase assertNotNull(contentAsJson); // Get the list of dm types from the response and check it - List dmTypeList = new ArrayList(); + List dmTypeList = new ArrayList<>(); for (int i = 0; i < contentAsJson.length(); i++) { String name = contentAsJson.getJSONObject(i).getString("name"); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RoleRestApiTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RoleRestApiTest.java index a60a38516a..e075209b53 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RoleRestApiTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RoleRestApiTest.java @@ -352,7 +352,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase private Set getListOfCapabilities(int size, int offset) { - Set result = new HashSet(size); + Set result = new HashSet<>(size); Set caps = capabilityService.getCapabilities(false); int count = 0; for (Capability cap : caps) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java index 29fd7fe479..0958a0af24 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java @@ -73,7 +73,7 @@ public class SubstitutionSuggestionsRestApiTest extends BaseRMWebScriptTestCase // Get the list of rm action definitions from the response and check it List substitutionDefinitions = getSubstitutionDefinitions(); - List rmSubstitutionDefinitions = new ArrayList(); + List rmSubstitutionDefinitions = new ArrayList<>(); for (int i = 0; i < data.length(); i++) { String value = data.getString(i); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DataLoadSystemTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DataLoadSystemTest.java index 9b29f2a217..6cc48018da 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DataLoadSystemTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DataLoadSystemTest.java @@ -204,7 +204,7 @@ public class DataLoadSystemTest Assert.fail("The default RM site is not present."); } - groups = new ArrayList(); + groups = new ArrayList<>(); repeatInTransactionBatches(new RunAsWork() { @@ -251,7 +251,7 @@ public class DataLoadSystemTest } // create root categories - recordCategories = new ArrayList(ROOT_CATEGORY_COUNT); + recordCategories = new ArrayList<>(ROOT_CATEGORY_COUNT); repeatInTransactionBatches(new RunAsWork() { public Void doWork() throws Exception @@ -262,7 +262,7 @@ public class DataLoadSystemTest }, ROOT_CATEGORY_COUNT); // create record folders - recordFolders = new ArrayList(RECORD_FOLDER_COUNT); + recordFolders = new ArrayList<>(RECORD_FOLDER_COUNT); for (final NodeRef recordCategory : recordCategories) { repeatInTransactionBatches(new RunAsWork() @@ -300,7 +300,7 @@ public class DataLoadSystemTest { authenticationService.createAuthentication(userName, "password".toCharArray()); } - Map properties = new HashMap(); + Map properties = new HashMap<>(); properties.put(ContentModel.PROP_USERNAME, userName); return personService.createPerson(properties); } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java index b0ca761b62..9937c11ec6 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java @@ -113,7 +113,7 @@ public class NotificationServiceHelperSystemTest extends BaseRMTestCase NodeRef record2 = utils.createRecord(rmFolder, "recordTwo"); NodeRef record3 = utils.createRecord(rmFolder, "recordThree"); - records = new ArrayList(3); + records = new ArrayList<>(3); records.add(record); records.add(record2); records.add(record3); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java index 4eeb564b49..75fdfd9ca2 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java @@ -559,7 +559,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase // Create folder String containerName = "RM2_" + System.currentTimeMillis(); - Map containerProps = new HashMap(1); + Map containerProps = new HashMap<>(1); containerProps.put(ContentModel.PROP_NAME, containerName); folder = nodeService.createNode( rootNodeRef, @@ -687,7 +687,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase { authenticationService.createAuthentication(userName, "password".toCharArray()); } - Map properties = new HashMap(); + Map properties = new HashMap<>(); properties.put(ContentModel.PROP_USERNAME, userName); properties.put(ContentModel.PROP_FIRSTNAME, userName); return personService.createPerson(properties); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java index 8bd5734405..ae53e2c46b 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java @@ -277,7 +277,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest // Create folder String containerName = "RM2_" + System.currentTimeMillis(); - Map containerProps = new HashMap(1); + Map containerProps = new HashMap<>(1); containerProps.put(ContentModel.PROP_NAME, containerName); folder = nodeService.createNode( rootNodeRef, diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java index ddb1362df5..9991c9bafd 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java @@ -166,7 +166,7 @@ public class CommonRMTestUtils implements RecordsManagementModel boolean extendedDispositionSchedule, String defaultEvent) { - Map dsProps = new HashMap(3); + Map dsProps = new HashMap<>(3); dsProps.put(PROP_DISPOSITION_AUTHORITY, dispositionAuthority); dsProps.put(PROP_DISPOSITION_INSTRUCTIONS, dispositionInstructions); dsProps.put(PROP_RECORD_LEVEL_DISPOSITION, isRecordLevel); @@ -174,11 +174,11 @@ public class CommonRMTestUtils implements RecordsManagementModel if (defaultDispositionActions) { - Map adParams = new HashMap(3); + Map adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, DEFAULT_DISPOSITION_DESCRIPTION); - List events = new ArrayList(1); + List events = new ArrayList<>(1); events.add(defaultEvent); adParams.put(PROP_DISPOSITION_EVENT, (Serializable)events); @@ -186,7 +186,7 @@ public class CommonRMTestUtils implements RecordsManagementModel if (extendedDispositionSchedule) { - adParams = new HashMap(4); + adParams = new HashMap<>(4); adParams.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, DEFAULT_DISPOSITION_DESCRIPTION); adParams.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); @@ -195,7 +195,7 @@ public class CommonRMTestUtils implements RecordsManagementModel dispositionService.addDispositionActionDefinition(dispositionSchedule, adParams); } - adParams = new HashMap(3); + adParams = new HashMap<>(3); adParams.put(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); adParams.put(PROP_DISPOSITION_DESCRIPTION, DEFAULT_DISPOSITION_DESCRIPTION); adParams.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); @@ -228,7 +228,7 @@ public class CommonRMTestUtils implements RecordsManagementModel */ public NodeRef createRecord(NodeRef recordFolder, String name, String title) { - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(ContentModel.PROP_TITLE, title); return createRecord(recordFolder, name, props, "Some test content"); } @@ -287,18 +287,17 @@ public class CommonRMTestUtils implements RecordsManagementModel // Create the document if (properties == null) { - properties = new HashMap(1); + properties = new HashMap<>(1); } if (!properties.containsKey(ContentModel.PROP_NAME)) { properties.put(ContentModel.PROP_NAME, name); } - NodeRef record = nodeService.createNode(recordFolder, - ContentModel.ASSOC_CONTAINS, - QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name), - ContentModel.TYPE_CONTENT, - properties).getChildRef(); - return record; + return nodeService.createNode(recordFolder, + ContentModel.ASSOC_CONTAINS, + QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name), + ContentModel.TYPE_CONTENT, + properties).getChildRef(); } /** @@ -311,7 +310,7 @@ public class CommonRMTestUtils implements RecordsManagementModel */ public NodeRef createNonElectronicRecord(NodeRef recordFolder, String name, String title) { - Map props = new HashMap(1); + Map props = new HashMap<>(1); props.put(ContentModel.PROP_TITLE, title); props.put(ContentModel.PROP_NAME, name); @@ -376,7 +375,7 @@ public class CommonRMTestUtils implements RecordsManagementModel public Role createRole(NodeRef filePlan, String roleName, String ... capabilityNames) { - Set capabilities = new HashSet(capabilityNames.length); + Set capabilities = new HashSet<>(capabilityNames.length); for (String name : capabilityNames) { Capability capability = capabilityService.getCapability(name); @@ -399,7 +398,7 @@ public class CommonRMTestUtils implements RecordsManagementModel public void completeEvent(NodeRef disposableItem, String eventName) { // build action properties - Map params = new HashMap(1); + Map params = new HashMap<>(1); params.put(CompleteEventAction.PARAM_EVENT_NAME, eventName); // complete event diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/BehaviourTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/BehaviourTest.java index 81fd11a654..61343e98c8 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/BehaviourTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/BehaviourTest.java @@ -190,7 +190,7 @@ public class BehaviourTest */ public ExpectedValue expect(boolean value) { - return new ExpectedValue(this, value); + return new ExpectedValue<>(this, value); } /** @@ -201,7 +201,7 @@ public class BehaviourTest */ public ExpectedValue expect(String value) { - return new ExpectedValue(this, value); + return new ExpectedValue<>(this, value); } /** @@ -212,7 +212,7 @@ public class BehaviourTest */ public ExpectedValue expect(Object value) { - return new ExpectedValue(this, value); + return new ExpectedValue<>(this, value); } diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityConditionUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityConditionUnitTest.java index f56a727c02..9437002ab9 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityConditionUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HoldCapabilityConditionUnitTest.java @@ -83,7 +83,7 @@ public class HoldCapabilityConditionUnitTest extends BaseUnitTest // setup test data hold1 = generateNodeRef(TYPE_HOLD); hold2 = generateNodeRef(TYPE_HOLD); - holds = new ArrayList(2); + holds = new ArrayList<>(2); holds.add(hold1); holds.add(hold2); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java index ad9051b57d..40a91b8170 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java @@ -57,7 +57,7 @@ public class EagerContentStoreCleanerUnitTest extends BaseUnitTest @InjectMocks private EagerContentStoreCleaner eagerContentStoreCleaner = new EagerContentStoreCleaner() { /** dummy implementation */ - public boolean registerOrphanedContentUrl(String contentUrl, boolean force) {return true;}; + public boolean registerOrphanedContentUrl(String contentUrl, boolean force) {return true;} }; @Mock private ContentCleanser mockedContentCleanser; @@ -89,7 +89,7 @@ public class EagerContentStoreCleanerUnitTest extends BaseUnitTest public void contentRequiresCleaning() { String contentURL = AlfMock.generateText(); - Set mockedSet = new HashSet(Arrays.asList(contentURL)); + Set mockedSet = new HashSet<>(Arrays.asList(contentURL)); when(mockedTransactionalResourceHelper.getSet(EagerContentStoreCleaner.KEY_POST_COMMIT_CLEANSING_URLS)) .thenReturn(mockedSet); @@ -119,7 +119,7 @@ public class EagerContentStoreCleanerUnitTest extends BaseUnitTest public void contentDoesntRequireCleaning() { String contentURL = AlfMock.generateText(); - Set mockedSet = new HashSet(Arrays.asList(contentURL)); + Set mockedSet = new HashSet<>(Arrays.asList(contentURL)); when(mockedTransactionalResourceHelper.getSet(EagerContentStoreCleaner.KEY_POST_COMMIT_CLEANSING_URLS)) .thenReturn(mockedSet); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java index 5489d77fc2..db98760b2a 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java @@ -51,7 +51,7 @@ public class ContentCleanser522022MUnitTest extends BaseUnitTest @InjectMocks @Spy private ContentCleanser522022M contentCleanser522022M = new ContentCleanser522022M() { /** dummy implementations */ - protected void overwrite(File file, OverwriteOperation overwriteOperation) {}; + protected void overwrite(File file, OverwriteOperation overwriteOperation) {} }; @Mock private File mockedFile; diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilterUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilterUnitTest.java index 77d84d29f1..e0e7f7c11d 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilterUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilterUnitTest.java @@ -118,7 +118,7 @@ public class RecordsManagementTypeFormFilterUnitTest extends BaseUnitTest @Test public void testDefaultFormValues() { - List defs = new ArrayList(3); + List defs = new ArrayList<>(3); FieldDefinition idDef = mockFieldDefinition("rma:identifier"); defs.add(idDef); FieldDefinition vrDef = mockFieldDefinition("rma:vitalRecordIndicator"); @@ -170,7 +170,7 @@ public class RecordsManagementTypeFormFilterUnitTest extends BaseUnitTest */ private Map mockPropertyDefintionMap(int size) { - Map properties = new HashMap(size); + Map properties = new HashMap<>(size); for (int i = 0; i < size; i++) { QName name = generateQName(RM_URI); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java index 3071859f51..78c34fde09 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java @@ -110,7 +110,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest public void heldByMultipleResults() { // setup record folder in multiple holds - List holds = new ArrayList(2); + List holds = new ArrayList<>(2); holds.add(new ChildAssociationRef(ASSOC_FROZEN_RECORDS, hold, ASSOC_FROZEN_RECORDS, recordFolder, true, 1)); holds.add(new ChildAssociationRef(ASSOC_FROZEN_RECORDS, hold2, ASSOC_FROZEN_RECORDS, recordFolder, true, 2)); doReturn(holds).when(mockedNodeService).getParentAssocs(recordFolder, ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_RECORDS); @@ -165,7 +165,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest public void getHeldWithResults() { // setup record folder in hold - List holds = new ArrayList(1); + List holds = new ArrayList<>(1); holds.add(new ChildAssociationRef(ASSOC_FROZEN_RECORDS, hold, ASSOC_FROZEN_RECORDS, recordFolder, true, 1)); doReturn(holds).when(mockedNodeService).getChildAssocs(hold, ASSOC_FROZEN_RECORDS, RegexQNamePattern.MATCH_ALL); @@ -352,7 +352,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest }).when(mockedNodeService).addAspect(any(NodeRef.class), eq(ASPECT_FROZEN), any(Map.class)); // build a list of holds - List holds = new ArrayList(2); + List holds = new ArrayList<>(2); holds.add(hold); holds.add(hold2); @@ -408,7 +408,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest doReturn(true).when(mockedNodeService).hasAspect(record, ASPECT_FROZEN); // build a list of holds - List holds = new ArrayList(2); + List holds = new ArrayList<>(2); holds.add(hold); holds.add(hold2); @@ -425,7 +425,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest public void removeFromAllHolds() { // build a list of holds - List holds = new ArrayList(2); + List holds = new ArrayList<>(2); holds.add(hold); holds.add(hold2); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluatorUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluatorUnitTest.java index a136b641a3..636dbbbe72 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluatorUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/TransferEvaluatorUnitTest.java @@ -71,7 +71,7 @@ public class TransferEvaluatorUnitTest extends BaseUnitTest private List getParentAssocs(NodeRef provided) { - List result = new ArrayList(1); + List result = new ArrayList<>(1); result.add(new ChildAssociationRef(ASSOC_TRANSFERRED, transfer, generateQName(), provided, false, 1)); return result; } diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java index 222c6e94ac..181bed2154 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteTypeUnitTest.java @@ -104,7 +104,7 @@ public class RmSiteTypeUnitTest extends BaseUnitTest implements DOD5015Model public void testAddOneFolderTypeToRmSite() { NodeRef rmSiteNodeRef = generateNodeRef(TYPE_RM_SITE, true); - ArrayList assocs = new ArrayList(); + ArrayList assocs = new ArrayList<>(); SiteInfo mockedSiteInfo = mock(SiteInfo.class); when(mockedSiteService.getSite(rmSiteNodeRef)).thenReturn(mockedSiteInfo); @@ -126,7 +126,7 @@ public class RmSiteTypeUnitTest extends BaseUnitTest implements DOD5015Model public void testAddTwoFolderTypeToRmSite() { NodeRef rmSiteNodeRef = generateNodeRef(TYPE_RM_SITE, true); - ArrayList assocs = new ArrayList(); + ArrayList assocs = new ArrayList<>(); SiteInfo mockedSiteInfo = mock(SiteInfo.class); when(mockedSiteService.getSite(rmSiteNodeRef)).thenReturn(mockedSiteInfo); @@ -155,12 +155,12 @@ public class RmSiteTypeUnitTest extends BaseUnitTest implements DOD5015Model public void testAddMoreThanTwhoFolderTypeToRmSite() { NodeRef rmSiteNodeRef = generateNodeRef(TYPE_RM_SITE, true); - ArrayList assocs = new ArrayList(); + ArrayList assocs = new ArrayList<>(); SiteInfo mockedSiteInfo = mock(SiteInfo.class); when(mockedSiteService.getSite(rmSiteNodeRef)).thenReturn(mockedSiteInfo); when(mockedApplicationContext.getBean("dbNodeService")).thenReturn(mockedNodeService); - when(mockedNodeService.getChildAssocs(rmSiteNodeRef, Sets.newHashSet(TYPE_FOLDER))).thenReturn(new ArrayList()); + when(mockedNodeService.getChildAssocs(rmSiteNodeRef, Sets.newHashSet(TYPE_FOLDER))).thenReturn(new ArrayList<>()); //create first folder NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_FOLDER); @@ -192,7 +192,7 @@ public class RmSiteTypeUnitTest extends BaseUnitTest implements DOD5015Model public void testAddOneFilePlanTypeToRmSite() { NodeRef rmSiteNodeRef = generateNodeRef(TYPE_RM_SITE, true); - ArrayList assocs = new ArrayList(); + ArrayList assocs = new ArrayList<>(); SiteInfo mockedSiteInfo = mock(SiteInfo.class); when(mockedSiteService.getSite(rmSiteNodeRef)).thenReturn(mockedSiteInfo); @@ -231,7 +231,7 @@ public class RmSiteTypeUnitTest extends BaseUnitTest implements DOD5015Model public void testAddMoreThanOneFilePlanTypeToRmSite() { NodeRef rmSiteNodeRef = generateNodeRef(TYPE_RM_SITE, true); - ArrayList assocs = new ArrayList(); + ArrayList assocs = new ArrayList<>(); SiteInfo mockedSiteInfo = mock(SiteInfo.class); when(mockedSiteService.getSite(rmSiteNodeRef)).thenReturn(mockedSiteInfo); @@ -260,7 +260,7 @@ public class RmSiteTypeUnitTest extends BaseUnitTest implements DOD5015Model public void testAddOneDODFilePlanTypeToRmSite() { NodeRef rmSiteNodeRef = generateNodeRef(TYPE_DOD_5015_SITE, true); - ArrayList assocs = new ArrayList(); + ArrayList assocs = new ArrayList<>(); SiteInfo mockedSiteInfo = mock(SiteInfo.class); when(mockedSiteInfo.getNodeRef()).thenReturn(rmSiteNodeRef); @@ -287,7 +287,7 @@ public class RmSiteTypeUnitTest extends BaseUnitTest implements DOD5015Model public void testAddMoreThanOneDODFilePlanTypeToRmSite() { NodeRef rmSiteNodeRef = generateNodeRef(TYPE_DOD_5015_SITE, true); - ArrayList assocs = new ArrayList(); + ArrayList assocs = new ArrayList<>(); SiteInfo mockedSiteInfo = mock(SiteInfo.class); when(mockedSiteInfo.getNodeRef()).thenReturn(rmSiteNodeRef); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22RemoveInPlaceRolesFromAllPatchUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22RemoveInPlaceRolesFromAllPatchUnitTest.java index 6137f07f83..ab08815855 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22RemoveInPlaceRolesFromAllPatchUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22RemoveInPlaceRolesFromAllPatchUnitTest.java @@ -109,7 +109,7 @@ public class RMv22RemoveInPlaceRolesFromAllPatchUnitTest extends BaseUnitTest doReturn(getMockedRole(FilePlanRoleService.ROLE_EXTENDED_READERS)).when(mockedFilePlanRoleService).getRole(filePlan, FilePlanRoleService.ROLE_EXTENDED_READERS); doReturn(getMockedRole(FilePlanRoleService.ROLE_EXTENDED_WRITERS)).when(mockedFilePlanRoleService).getRole(filePlan, FilePlanRoleService.ROLE_EXTENDED_WRITERS); doReturn(ALL_ROLES).when(mockedFilePlanRoleService).getAllRolesContainerGroup(filePlan); - Set contains = new HashSet(2); + Set contains = new HashSet<>(2); contains.add(FilePlanRoleService.ROLE_EXTENDED_READERS); contains.add(FilePlanRoleService.ROLE_EXTENDED_WRITERS); doReturn(contains).when(mockedAuthorityService).getContainedAuthorities(null, ALL_ROLES, true); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordMetadataBootstrapUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordMetadataBootstrapUnitTest.java index 47aa824c0e..beefcbd97f 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordMetadataBootstrapUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordMetadataBootstrapUnitTest.java @@ -54,7 +54,7 @@ public class RecordMetadataBootstrapUnitTest extends BaseUnitTest public void testInit() { // create and set map - Map map = new HashMap(2); + Map map = new HashMap<>(2); map.put("rma:test1", "rma:filePlan"); map.put("rma:test2", "rma:filePlan"); bootstrap.setRecordMetadataAspects(map); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetUnitTest.java index eb1735c230..63657322f4 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetUnitTest.java @@ -111,7 +111,7 @@ public class RecordedVersionConfigGetUnitTest extends BaseRecordedVersionConfigT assertNotNull(recordableVersions); assertEquals(recordableVersions.length(), 3); - List policies = new ArrayList(); + List policies = new ArrayList<>(); boolean isSelected = false; int selectedOnce = 0; for (int i = 0; i < recordableVersions.length(); i++) diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptUnitTest.java index 77316228e6..6af4611888 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptUnitTest.java @@ -63,7 +63,7 @@ public abstract class BaseHoldWebScriptUnitTest extends BaseWebScriptUnitTest hold2NodeRef = generateHoldNodeRef("hold2"); // list of holds - holds = new ArrayList(2); + holds = new ArrayList<>(2); Collections.addAll(holds, hold1NodeRef, hold2NodeRef); // list of records diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImplUnitTest.java index ff0d5064e5..2cb93a9088 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImplUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImplUnitTest.java @@ -619,7 +619,7 @@ public class ExtendedSecurityServiceImplUnitTest String writeGroup = writeGroupPrefix + "0"; // create fity results - List fiftyResults = new ArrayList(50); + List fiftyResults = new ArrayList<>(50); for (int i = 0; i < 50; i++) { fiftyResults.add(AlfMock.generateText()); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImplUnitTest.java index c452b809e3..5984ec452d 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImplUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImplUnitTest.java @@ -255,7 +255,7 @@ public class FilePlanPermissionServiceImplUnitTest extends BaseUnitTest */ private void setupPermissions(NodeRef nodeRef) { - Set perms = new HashSet(4); + Set perms = new HashSet<>(4); // setup basic file and read for authorities perms.add(new AccessPermissionImpl(RMPermissionModel.READ_RECORDS, AccessStatus.ALLOWED, AUTHORITY, 0)); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java index be68a337d2..d77aa98676 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseUnitTest.java @@ -197,7 +197,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel record = generateRecord(); // set record as child of record folder - List result = new ArrayList(1); + List result = new ArrayList<>(1); result.add(new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, recordFolder, generateQName(RM_URI), record, true, 1)); doReturn(result).when(mockedNodeService).getChildAssocs(eq(recordFolder), eq(ContentModel.ASSOC_CONTAINS), any(QNamePattern.class)); doReturn(result).when(mockedNodeService).getParentAssocs(record); @@ -372,7 +372,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel */ protected void makeChildrenOf(NodeRef parent, NodeRef ... children) { - List assocs = new ArrayList(children.length); + List assocs = new ArrayList<>(children.length); for (NodeRef child : children) { assocs.add(new ChildAssociationRef(ContentModel.ASSOC_CONTAINS, parent, generateQName(), child)); @@ -384,7 +384,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel @SuppressWarnings("unchecked") protected List buildList(T ... values) { - List result = new ArrayList(values.length); + List result = new ArrayList<>(values.length); for (T value : values) { result.add(value); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java index 919e080cfe..402e0cec4d 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseWebScriptUnitTest.java @@ -99,7 +99,7 @@ public abstract class BaseWebScriptUnitTest extends BaseUnitTest */ protected Map buildParameters(String ... values) { - Map result = new HashMap(values.length/2); + Map result = new HashMap<>(values.length / 2); for (int i = 0; i < values.length; i=i+2) { String key = values[i]; diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java index afc745b20a..6c89aea77c 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java @@ -385,7 +385,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel // node is not being processed for versioning when(mockedAlfrescoTransactionSupport.getResource(KEY_VERSIONED_NODEREFS)) - .thenReturn(new HashMap(Collections.singletonMap(anotherNodeRef, anotherNodeRef))); + .thenReturn(new HashMap<>(Collections.singletonMap(anotherNodeRef, anotherNodeRef))); // auto version false when(mockedNodeService.getProperty(nodeRef, ContentModel.PROP_AUTO_VERSION)) diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImplUnitTest.java index f675a7d9a9..5bbe4e72e6 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImplUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImplUnitTest.java @@ -103,7 +103,7 @@ public class RecordableVersionServiceImplUnitTest extends BaseUnitTest nodeRef = generateCmContent(CONTENT_NAME); doReturn(123l).when(mockedNodeService).getProperty(nodeRef, ContentModel.PROP_NODE_DBID); - versionProperties = new HashMap(5); + versionProperties = new HashMap<>(5); recordableVersionService.initialise(); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java index e8f88ffa1c..a10a6637cc 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java @@ -73,15 +73,17 @@ public class ExtendedPermissionServiceImplUnitTest extends BaseUnitTest /** permission service impl, default */ private @InjectMocks @Spy ExtendedPermissionServiceImpl extendedPermissionServiceImpl = new ExtendedPermissionServiceImpl() { - protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; }; - }; + protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; } + }; /** permission service impl instance extended for reader/writer tests */ private @InjectMocks ExtendedPermissionServiceImpl extendedPermissionServiceImplWithReaderWritersSet = new ExtendedPermissionServiceImpl() { - protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; }; - public java.util.Set getReaders(Long aclId) { return READERS; }; - public java.util.Set getWriters(Long aclId) { return WRITERS; }; + protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; } + + public java.util.Set getReaders(Long aclId) { return READERS; } + + public java.util.Set getWriters(Long aclId) { return WRITERS; } }; /** mocks */ @@ -270,7 +272,7 @@ public class ExtendedPermissionServiceImplUnitTest extends BaseUnitTest // then assertEquals(READERS, result.getFirst()); - Set writersWithOwner = new HashSet(WRITERS); + Set writersWithOwner = new HashSet<>(WRITERS); writersWithOwner.add(OWNER); assertEquals(writersWithOwner, result.getSecond()); } diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java index 840d0e054d..3e39ebd5ac 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/web/scripts/roles/DynamicAuthoritiesGetUnitTest.java @@ -176,7 +176,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme when(mockedPatchDAO.getMaxAdmNodeID()).thenReturn(500000L); // aspect - when(mockedQnameDAO.getQName(ASPECT_EXTENDED_SECURITY)).thenReturn(new Pair(ASPECT_ID, ASPECT)); + when(mockedQnameDAO.getQName(ASPECT_EXTENDED_SECURITY)).thenReturn(new Pair<>(ASPECT_ID, ASPECT)); } /** @@ -233,7 +233,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(true); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)) .thenReturn((Serializable) Collections.emptyMap()); @@ -279,7 +279,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(false); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)) .thenReturn((Serializable) Collections.emptyMap()); @@ -380,7 +380,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(false); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)) .thenReturn((Serializable) Collections.emptyMap()); @@ -408,7 +408,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(false); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)) .thenReturn((Serializable) Collections.emptyMap()); @@ -437,7 +437,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(true); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)).thenReturn(null); when(mockedNodeService.getProperty(nodeRef, PROP_WRITERS)).thenReturn(null); @@ -487,7 +487,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(true); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)) .thenReturn((Serializable) Collections.emptyMap()); @@ -545,7 +545,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(true); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)) .thenReturn((Serializable) Collections.emptyMap()); @@ -586,7 +586,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); - when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair(i, nodeRef)); + when(mockedNodeDAO.getNodePair(i)).thenReturn(new Pair<>(i, nodeRef)); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(true); when(mockedNodeService.getProperty(nodeRef, PROP_READERS)) .thenReturn((Serializable) Collections.emptyMap()); @@ -650,7 +650,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme { List ids = Stream.of(1l, 2l, 3l).collect(Collectors.toList()); NodeRef parentNodeRef = AlfMock.generateNodeRef(mockedNodeService); - List children = new ArrayList(); + List children = new ArrayList<>(); ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(true); @@ -687,7 +687,7 @@ public class DynamicAuthoritiesGetUnitTest extends BaseWebScriptUnitTest impleme { List ids = Stream.of(1l, 2l, 3l, 4l, 5l, 6l, 7l, 8l).collect(Collectors.toList()); NodeRef parentNodeRef = AlfMock.generateNodeRef(mockedNodeService); - List children = new ArrayList(); + List children = new ArrayList<>(); ids.stream().forEach((i) -> { NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService); when(mockedNodeService.hasAspect(nodeRef, ASPECT_RECORD)).thenReturn(true); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java index ba558030e8..0ce248b9e9 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/rm/rest/api/sites/RMSiteEntityResourceUnitTest.java @@ -95,7 +95,7 @@ public class RMSiteEntityResourceUnitTest extends BaseUnitTest rmSite.setDescription(RM_SITE_DESCRIPTION); rmSite.setCompliance(RMSiteCompliance.STANDARD); - List entity = new ArrayList(); + List entity = new ArrayList<>(); Params parameters = mock(Params.class); entity.add(rmSite); when(mockedRMSites.createRMSite(rmSite, parameters)).thenReturn(rmSite);