diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java index f610719e25..4ea5af5087 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/ApplyCustomTypeAction.java @@ -107,10 +107,10 @@ public class ApplyCustomTypeAction extends RMActionExecuterAbstractBase Map paramValues = action.getParameterValues(); Map result = new HashMap(paramValues.size()); - for (String paramName : paramValues.keySet()) + for (Map.Entry entry : paramValues.entrySet()) { - QName propQName = QName.createQName(paramName, this.namespaceService); - result.put(propQName, paramValues.get(paramName)); + QName propQName = QName.createQName(entry.getKey(), this.namespaceService); + result.put(propQName, entry.getValue()); } return result; @@ -132,11 +132,12 @@ public class ApplyCustomTypeAction extends RMActionExecuterAbstractBase this.parameterDefinitions = new ArrayList(props.size()); - for (QName qn : props.keySet()) + for (Map.Entry entry : props.entrySet()) { - String paramName = qn.toPrefixString(namespaceService); - QName paramType = props.get(qn).getDataType().getName(); - boolean paramIsMandatory = props.get(qn).isMandatory(); + String paramName = entry.getKey().toPrefixString(namespaceService); + PropertyDefinition value = entry.getValue(); + QName paramType = value.getDataType().getName(); + boolean paramIsMandatory = value.isMandatory(); parameterDefinitions.add(new ParameterDefinitionImpl(paramName, paramType, paramIsMandatory, null)); } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index 1a74352bc9..253444403f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -575,9 +575,9 @@ public class RMAfterInvocationProvider extends RMSecurityCommon Map, ResultSet> map = returnedObject.getResults(); Map, ResultSet> answer = new HashMap, ResultSet>(map.size(), 1.0f); - for (Set group : map.keySet()) + for (Map.Entry, ResultSet> entry : map.entrySet()) { - ResultSet raw = map.get(group); + ResultSet raw = entry.getValue(); ResultSet permed; if (PagingLuceneResultSet.class.isAssignableFrom(raw.getClass())) { @@ -587,8 +587,9 @@ public class RMAfterInvocationProvider extends RMSecurityCommon { permed = decide(authentication, object, config, raw); } - answer.put(group, permed); + answer.put(entry.getKey(), permed); } + return new QueryEngineResults(answer); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java index 14415d2c3e..514d70e909 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/caveat/PivotUtil.java @@ -35,16 +35,17 @@ import java.util.Map; Map> pivot = new HashMap>(); - for(String authority : source.keySet()) + for (Map.Entry> entry : source.entrySet()) { - Listvalues = source.get(authority); - for(String value : values) + Listvalues = entry.getValue(); + for (String value : values) { - if(pivot.containsKey(value)) + String authority = entry.getKey(); + if (pivot.containsKey(value)) { // already exists List list = pivot.get(value); - list.add(authority); + list.add(authority ); } else { @@ -55,6 +56,7 @@ import java.util.Map; } } } + return pivot; } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java index 9649d937f1..d81f191bb4 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java @@ -161,14 +161,14 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme // load the contents of the extractors property file Map> currentMapping = extracter.getCurrentMapping(); - for(String key : currentMapping.keySet()) + for (Map.Entry> entry : currentMapping.entrySet()) { - Set set = currentMapping.get(key); + Set set = entry.getValue(); - for(QName qname : set) + for (QName qname : set) { CustomMapping value = new CustomMapping(); - value.setFrom(key); + value.setFrom(entry.getKey()); QName resolvedQname = qname.getPrefixedQName(nspr); value.setTo(resolvedQname.toPrefixString()); customMappings.add(value); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java index 502f979995..ad559bc6a2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java @@ -839,10 +839,10 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel private Set determineChangedProps(Map oldProps, Map newProps) { Set result = new HashSet(); - for (QName qn : oldProps.keySet()) + for (Map.Entry entry : oldProps.entrySet()) { - if (newProps.get(qn) == null || - !newProps.get(qn).equals(oldProps.get(qn))) + QName qn = entry.getKey(); + if (newProps.get(qn) == null || !newProps.get(qn).equals(entry.getValue())) { result.add(qn); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java index 0f66d693f6..66a36e655f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/security/ModelSecurityServiceImpl.java @@ -336,8 +336,9 @@ public class ModelSecurityServiceImpl extends BaseBehaviourBean !AuthenticationUtil.isRunAsUserTheSystemUser() && nodeService.exists(nodeRef)) { - for (QName property : after.keySet()) + for (Map.Entry entry : after.entrySet()) { + QName property = entry.getKey(); if (isProtectedProperty(property)) { // always allow if this is the first time we are setting the protected property @@ -346,7 +347,7 @@ public class ModelSecurityServiceImpl extends BaseBehaviourBean return; } - if (!EqualsHelper.nullSafeEquals(before.get(property), after.get(property)) && + if (!EqualsHelper.nullSafeEquals(before.get(property), entry.getValue()) && !canEditProtectedProperty(nodeRef, property)) { // the user can't edit the protected property diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java index 5319bc3550..46bb53f4ca 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java @@ -539,20 +539,16 @@ public class RecordServiceImpl extends BaseBehaviourBean nodeService.exists(nodeRef) && isRecord(nodeRef)) { - for (QName property : after.keySet()) + for (Map.Entry entry : after.entrySet()) { Serializable beforeValue = null; + QName property = entry.getKey(); if (before != null) { beforeValue = before.get(property); } - Serializable afterValue = null; - if (after != null) - { - afterValue = after.get(property); - } - + Serializable afterValue = entry.getValue(); boolean propertyUnchanged = false; if (beforeValue instanceof Date && afterValue instanceof Date) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java index cd598d10d6..f0617c9cfb 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/RmActionPost.java @@ -201,13 +201,13 @@ public class RmActionPost extends DeclarativeWebScript { Map resultMap = this.rmActionService.executeRecordsManagementAction(targetNodeRefs, actionName, actionParams); Map results = new HashMap(resultMap.size()); - for (NodeRef nodeRef : resultMap.keySet()) + for (Map.Entry entry : resultMap.entrySet()) { - Object value = resultMap.get(nodeRef).getValue(); - if (value != null) - { - results.put(nodeRef.toString(), resultMap.get(nodeRef).getValue().toString()); - } + Object value = entry.getValue().getValue(); + if (value != null) + { + results.put(entry.getKey().toString(), value.toString()); + } } model.put("results", results); } diff --git a/rm-server/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java index 0b4ebe55bd..85e50f82f5 100644 --- a/rm-server/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java +++ b/rm-server/source/java/org/alfresco/repo/action/parameter/NodeParameterProcessor.java @@ -265,15 +265,15 @@ public class NodeParameterProcessor extends ParameterProcessor implements Parame private boolean processPropertyDefinitions(Map properties, String substitutionFragment, Set suggestions) { boolean gotMaximumSuggestions = false; - if(properties != null) + if (properties != null) { - for(QName key : properties.keySet()) + for (Map.Entry entry : properties.entrySet()) { - PropertyDefinition propertyDefinition = properties.get(key); + PropertyDefinition propertyDefinition = entry.getValue(); QName type = propertyDefinition.getDataType().getName(); if(ArrayUtils.contains(supportedDataTypes, type)) { - String suggestion = getName() + "." + key.getPrefixString(); + String suggestion = getName() + "." + entry.getKey().getPrefixString(); if(suggestion.toLowerCase().contains(substitutionFragment)) { if(suggestions.size() < this.maximumNumberSuggestions)