diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java index 7017bcae68..25dd968865 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCapability.java @@ -301,10 +301,10 @@ public class DeclarativeCapability extends AbstractCapability else { // Check we are dealing with a file plan component - if (getFilePlanService().isFilePlanComponent(nodeRef) == true) + if (getFilePlanService().isFilePlanComponent(nodeRef)) { // Check the kind of the object, the permissions and the conditions - if (checkKinds(nodeRef) == true && checkPermissions(nodeRef) == true && checkConditions(nodeRef) == true) + if (checkKinds(nodeRef) && checkPermissions(nodeRef) && checkConditions(nodeRef)) { // Opportunity for child implementations to extend result = evaluateImpl(nodeRef); @@ -319,7 +319,7 @@ public class DeclarativeCapability extends AbstractCapability result = onEvaluate(nodeRef, result); // log access denied to help with debug - if (LOGGER.isDebugEnabled() == true && AccessDecisionVoter.ACCESS_DENIED == result) + if (LOGGER.isDebugEnabled() && AccessDecisionVoter.ACCESS_DENIED == result) { LOGGER.debug("Capability " + getName() + " returned an Access Denied result during evaluation of node " + nodeRef.toString()); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java index 64a5da70e1..e42b3131b4 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java @@ -348,7 +348,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl containerType, properties).getChildRef(); - // if (inheritPermissions == false) + // if (!inheritPermissions) // { // set inheritance to false getPermissionService().setInheritParentPermissions(container, false); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java index af1c39e600..8f3cb2f44d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java @@ -152,7 +152,7 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut } else { - if (getNodeService().hasAspect(nodeRef, ASPECT_EXTENDED_SECURITY) == true) + if (getNodeService().hasAspect(nodeRef, ASPECT_EXTENDED_SECURITY)) { Set authorities = getAuthorites(nodeRef); if (authorities != null) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java index 374a06db1f..a635e8db6a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java @@ -70,7 +70,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl /** key used to indicate a recordable version */ public static final String KEY_RECORDABLE_VERSION = "recordable-version"; public static final String KEY_FILE_PLAN = "file-plan"; - + /** version record property */ public static final String PROP_VERSION_RECORD = "RecordVersion"; @@ -91,7 +91,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl /** authentication util helper */ protected AuthenticationUtil authenticationUtil; - + /** relationship service */ protected RelationshipService relationshipService; @@ -142,7 +142,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl { this.authenticationUtil = authenticationUtil; } - + /** * @param relationshipService relationship service */ @@ -321,21 +321,21 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl // create record final NodeRef record = createRecord(nodeRef, filePlan); - + // apply version record aspect to record PropertyMap versionRecordProps = new PropertyMap(3); versionRecordProps.put(PROP_VERSIONED_NODEREF, nodeRef); - versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL, + versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL, standardVersionProperties.get( QName.createQName(Version2Model.NAMESPACE_URI, Version2Model.PROP_VERSION_LABEL))); - versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION, + versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION, standardVersionProperties.get( QName.createQName(Version2Model.NAMESPACE_URI, Version2Model.PROP_VERSION_DESCRIPTION))); nodeService.addAspect(record, ASPECT_VERSION_RECORD, versionRecordProps); - - // wire record up to previous record + + // wire record up to previous record VersionHistory versionHistory = getVersionHistory(nodeRef); if (versionHistory != null) { @@ -355,7 +355,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl relationshipService.addRelationship("versions", record, previousRecord); return null; } - }); + }); break; } } @@ -388,7 +388,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl } // If the auditable aspect is not there then add it to the 'version' node (after original aspects have been frozen) - if (dbNodeService.hasAspect(versionNodeRef, ContentModel.ASPECT_AUDITABLE) == false) + if (!dbNodeService.hasAspect(versionNodeRef, ContentModel.ASPECT_AUDITABLE)) { dbNodeService.addAspect(versionNodeRef, ContentModel.ASPECT_AUDITABLE, null); } @@ -449,7 +449,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl // create a copy of the original state and add it to the unfiled record container FileInfo recordInfo = fileFolderService.copy(nodeRef, unfiledRecordFolder, null); - record = recordInfo.getNodeRef(); + record = recordInfo.getNodeRef(); // remove added copy assocs List recordAssocs = dbNodeService.getTargetAssocs(record, ContentModel.ASSOC_ORIGINAL); diff --git a/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java index e016383182..2e8e48f221 100644 --- a/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java @@ -118,15 +118,15 @@ public class RMPermissionServiceImpl extends PermissionServiceImpl public AccessStatus hasPermission(NodeRef nodeRef, String perm) { AccessStatus acs = super.hasPermission(nodeRef, perm); - if (AccessStatus.DENIED.equals(acs) == true && - PermissionService.READ.equals(perm) == true && - nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT) == true) + if (AccessStatus.DENIED.equals(acs) && + PermissionService.READ.equals(perm) && + nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT)) { return super.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS); } - else if (AccessStatus.DENIED.equals(acs) == true && - PermissionService.WRITE.equals(perm) == true && - nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT) == true) + else if (AccessStatus.DENIED.equals(acs) && + PermissionService.WRITE.equals(perm) && + nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT)) { return super.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS); } diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptWithContentUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptWithContentUnitTest.java index 1746647af3..e951c2069f 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptWithContentUnitTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHoldWebScriptWithContentUnitTest.java @@ -34,7 +34,7 @@ public abstract class BaseHoldWebScriptWithContentUnitTest extends BaseHoldWebSc boolean bFirst = true; for (NodeRef nodeRef : nodeRefs) { - if (bFirst == false) + if (!bFirst) { builder.append(","); } @@ -61,7 +61,7 @@ public abstract class BaseHoldWebScriptWithContentUnitTest extends BaseHoldWebSc boolean bFirst = true; for (NodeRef hold : holds) { - if (bFirst == false) + if (!bFirst) { builder.append(","); }