inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed critical issue reported by sonar (Dodgy - Redundant nullcheck of value known to be non-null)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@63494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-03-02 16:32:30 +00:00
parent 4aeb679b28
commit 22a0417b55
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java
View File

@@ -44,7 +44,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
/** /**
* rma:recordComponentIdentifier behaviour bean * rma:recordComponentIdentifier behaviour bean
* *
* @author Roy Wetherall * @author Roy Wetherall
* @since 2.2 * @since 2.2
*/ */
@@ -59,19 +59,19 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
{ {
/** I18N */ /** I18N */
private final static String MSG_SET_ID = "rm.service.set-id"; private final static String MSG_SET_ID = "rm.service.set-id";
/** attribute context value */ /** attribute context value */
private static final String CONTEXT_VALUE = "rma:identifier"; private static final String CONTEXT_VALUE = "rma:identifier";
/** file plan service */ /** file plan service */
private FilePlanService filePlanService; private FilePlanService filePlanService;
/** attribute service */ /** attribute service */
private AttributeService attributeService; private AttributeService attributeService;
/** identifier service */ /** identifier service */
private IdentifierService identifierService; private IdentifierService identifierService;
/** /**
* @param filePlanService file plan service * @param filePlanService file plan service
*/ */
@@ -79,7 +79,7 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
{ {
this.filePlanService = filePlanService; this.filePlanService = filePlanService;
} }
/** /**
* @param attributeService attribute service * @param attributeService attribute service
*/ */
@@ -87,7 +87,7 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
{ {
this.attributeService = attributeService; this.attributeService = attributeService;
} }
/** /**
* @param identifierService identifier service * @param identifierService identifier service
*/ */
@@ -95,11 +95,11 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
{ {
this.identifierService = identifierService; this.identifierService = identifierService;
} }
/** /**
* Ensures that the {@link RecordsManagementModel#PROP_IDENTIFIER rma:identifier} property remains * Ensures that the {@link RecordsManagementModel#PROP_IDENTIFIER rma:identifier} property remains
* unique within the context of the parent node. * unique within the context of the parent node.
* *
* @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, java.util.Map) * @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, java.util.Map)
*/ */
@Override @Override
@@ -122,18 +122,18 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
{ {
throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_SET_ID, nodeRef.toString())); throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_SET_ID, nodeRef.toString()));
} }
// update uniqueness // update uniqueness
updateUniqueness(nodeRef, oldIdValue, newIdValue); updateUniqueness(nodeRef, oldIdValue, newIdValue);
} }
return null; return null;
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
} }
/** /**
* Cleans up the {@link RecordsManagementModel#PROP_IDENTIFIER rma:identifier} property unique triplet. * Cleans up the {@link RecordsManagementModel#PROP_IDENTIFIER rma:identifier} property unique triplet.
* *
* @see org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy#beforeDeleteNode(org.alfresco.service.cmr.repository.NodeRef) * @see org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy#beforeDeleteNode(org.alfresco.service.cmr.repository.NodeRef)
*/ */
@Override @Override
@@ -152,9 +152,9 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
updateUniqueness(nodeRef, beforeId, null); updateUniqueness(nodeRef, beforeId, null);
return null; return null;
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getSystemUserName());
} }
/** /**
* Record component identifier aspect copy callback * Record component identifier aspect copy callback
*/ */
@@ -167,7 +167,7 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
{ {
return new DoNothingCopyBehaviourCallback(); return new DoNothingCopyBehaviourCallback();
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Override @Override
@Behaviour @Behaviour
@@ -193,11 +193,11 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
behaviourFilter.enableBehaviour(); behaviourFilter.enableBehaviour();
} }
} }
/** /**
* Updates the uniqueness check using the values provided. If the after value is <tt>null</tt> * Updates the uniqueness check using the values provided. If the after value is <tt>null</tt>
* then this is considered to be a removal. * then this is considered to be a removal.
* *
* @param nodeRef node reference * @param nodeRef node reference
* @param beforeId id before * @param beforeId id before
* @param afterId id after * @param afterId id after
@@ -205,7 +205,7 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
private void updateUniqueness(NodeRef nodeRef, String beforeId, String afterId) private void updateUniqueness(NodeRef nodeRef, String beforeId, String afterId)
{ {
NodeRef contextNodeRef = filePlanService.getFilePlan(nodeRef); NodeRef contextNodeRef = filePlanService.getFilePlan(nodeRef);
if (beforeId == null) if (beforeId == null)
{ {
if (afterId != null) if (afterId != null)
@@ -216,11 +216,8 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean
} }
else if (afterId == null) else if (afterId == null)
{ {
if (beforeId != null) // The before value was not null, so remove it
{ attributeService.removeAttribute(CONTEXT_VALUE, contextNodeRef, beforeId);
// The before value was not null, so remove it
attributeService.removeAttribute(CONTEXT_VALUE, contextNodeRef, beforeId);
}
// Do a blanket removal in case this is a contextual nodes // Do a blanket removal in case this is a contextual nodes
attributeService.removeAttributes(CONTEXT_VALUE, nodeRef); attributeService.removeAttributes(CONTEXT_VALUE, nodeRef);
} }