From 4ccd8861cfdc3117990c5df62d70f6abbdd184f6 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Thu, 13 Mar 2014 22:52:16 +0000 Subject: [PATCH] Fixed major issues reported by sonar (Simplify Boolean Expression) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@64169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AuditableActionExecuterAbstractBase.java | 2 +- .../action/RMActionExecuterAbstractBase.java | 4 +-- ...DispositionActionExecuterAbstractBase.java | 6 ++-- .../RecordsManagementActionServiceImpl.java | 4 +-- .../action/dm/CreateRecordAction.java | 6 ++-- .../action/dm/HideRecordAction.java | 2 +- .../action/impl/AddRecordTypeAction.java | 4 +-- ...spositionActionDefinitionUpdateAction.java | 4 +-- .../action/impl/CloseRecordFolderAction.java | 2 +- .../action/impl/CompleteEventAction.java | 2 +- .../action/impl/DeclareRecordAction.java | 4 +-- .../action/impl/DelegateAction.java | 2 +- .../action/impl/FileToAction.java | 10 +++--- .../action/impl/FreezeAction.java | 4 +-- .../action/impl/OpenRecordFolderAction.java | 2 +- .../action/impl/RejectAction.java | 2 +- .../action/impl/RequestInfoAction.java | 4 +-- .../action/impl/SplitEmailAction.java | 2 +- .../action/impl/TransferCompleteAction.java | 2 +- .../action/impl/UnCutoffAction.java | 2 +- .../action/impl/UndeclareRecordAction.java | 2 +- .../action/impl/UndoEventAction.java | 4 +-- .../RecordsManagementAdminServiceImpl.java | 16 ++++----- .../RecordsManagementAuditServiceImpl.java | 6 ++-- .../audit/event/LinkAuditEvent.java | 4 +-- .../BootstrapImporterModuleComponent.java | 24 ++++++------- .../capability/CapabilityServiceImpl.java | 2 +- .../capability/RMAfterInvocationProvider.java | 4 +-- .../declarative/DeclarativeCapability.java | 4 +-- .../DeclarativeCompositeCapability.java | 2 +- .../condition/FrozenCapabilityCondition.java | 2 +- .../HasEventsCapabilityCondition.java | 2 +- .../MayBeScheduledCapabilityCondition.java | 2 +- .../capability/impl/CreateCapability.java | 6 ++-- .../dataset/DataSetServiceImpl.java | 4 +-- .../disposition/DispositionServiceImpl.java | 28 +++++++-------- .../property/DispositionProperty.java | 6 ++-- .../model/dod/aspect/DOD5015RecordAspect.java | 2 +- .../email/CustomEmailMappingServiceImpl.java | 2 +- .../email/RFC822MetadataExtracter.java | 2 +- .../event/OnReferenceCreateEventType.java | 2 +- .../event/OnReferencedRecordActionedUpon.java | 2 +- .../RecordsManagementEventServiceImpl.java | 14 ++++---- .../fileplan/FilePlanServiceImpl.java | 24 ++++++------- .../RecordsManagementNodeFormFilter.java | 4 +-- .../RecordsManagementTypeFormFilter.java | 2 +- .../job/DispositionLifecycleJobExecuter.java | 2 +- .../job/RecordsManagementJobExecuter.java | 20 +++++------ .../jscript/ScriptRecordsManagmentNode.java | 2 +- .../jscript/app/BaseEvaluator.java | 2 +- .../jscript/app/JSONConversionComponent.java | 4 +-- .../evaluator/SplitEmailActionEvaluator.java | 2 +- .../RecordsManagementSearchBehaviour.java | 6 ++-- .../model/rma/aspect/RecordAspect.java | 2 +- .../RecordComponentIdentifierAspect.java | 2 +- .../type/DispositionActionDefinitionType.java | 2 +- .../type/RecordsManagementContainerType.java | 6 ++-- .../model/rma/type/RmSiteType.java | 6 ++-- .../security/ModelSecurityServiceImpl.java | 14 ++++---- .../RecordsManagementNotificationHelper.java | 2 +- .../patch/ModulePatchExecuterImpl.java | 2 +- .../patch/v20/NotificationTemplatePatch.java | 6 ++-- .../v21/NotificationTemplatePatch_v21.java | 2 +- .../patch/v21/RMv21BehaviorScriptsPatch.java | 4 +-- .../patch/v21/RMv21CapabilityPatch.java | 2 +- .../patch/v21/RMv21RMAdminUserPatch.java | 4 +-- .../patch/v21/RMv21ReportServicePatch.java | 2 +- .../patch/v21/RMv21RolesPatch.java | 4 +-- .../patch/v22/RMv22CapabilityPatch.java | 2 +- .../patch/v22/RMv22ReportTemplatePatch.java | 2 +- .../record/RecordServiceImpl.java | 34 +++++++++---------- .../recordfolder/RecordFolderServiceImpl.java | 20 +++++------ .../generator/DeclarativeReportGenerator.java | 2 +- .../role/FilePlanRoleServiceImpl.java | 14 ++++---- .../script/AbstractRmWebScript.java | 2 +- .../script/ApplyDodCertModelFixesGet.java | 2 +- .../script/ApplyFixMob1573Get.java | 2 +- .../script/BootstrapTestDataGet.java | 4 +-- .../CustomPropertyDefinitionDelete.java | 22 ++++++------ .../script/CustomPropertyDefinitionPut.java | 4 +-- .../DispositionActionDefinitionPost.java | 34 +++++++++---------- .../script/RmActionPost.java | 2 +- .../script/admin/RmEventDelete.java | 2 +- .../script/admin/RmEventGet.java | 2 +- .../script/admin/RmEventPut.java | 2 +- .../script/admin/RmEventsPost.java | 2 +- .../script/admin/RmRoleDelete.java | 2 +- .../script/admin/RmRoleGet.java | 2 +- .../script/admin/RmRolePut.java | 2 +- .../admin/RoleDeclarativeWebScript.java | 6 ++-- .../script/capability/CapabilitiesGet.java | 2 +- .../script/slingshot/RMSavedSearchesPost.java | 4 +-- .../script/slingshot/RMSearchGet.java | 2 +- .../RecordsManagementSearchServiceImpl.java | 8 ++--- .../search/SavedSearchDetails.java | 4 +-- .../ExtendedSecurityBaseDynamicAuthority.java | 2 +- .../security/ExtendedSecurityServiceImpl.java | 10 +++--- .../FilePlanPermissionServiceImpl.java | 26 +++++++------- .../RMMethodSecurityPostProcessor.java | 2 +- .../util/ServiceBaseImpl.java | 2 +- .../BroadcastVitalRecordDefinitionAction.java | 4 +-- .../vital/VitalRecordServiceImpl.java | 2 +- .../parameter/DateParameterProcessor.java | 2 +- .../parameter/MessageParameterProcessor.java | 10 +++--- .../parameter/NodeParameterProcessor.java | 2 +- .../ParameterProcessorComponent.java | 2 +- .../AnnotatedBehaviourPostProcessor.java | 12 +++---- .../repo/rule/ExtendedRuleServiceImpl.java | 2 +- .../web/scripts/dictionary/RmClassesGet.java | 4 +-- .../RmSubstitutionSuggestionsGet.java | 6 ++-- .../DeclarativeCapabilityTest.java | 10 +++--- .../service/DispositionServiceImplTest.java | 2 +- .../RMCaveatConfigServiceImplTest.java | 2 +- .../test/service/RecordServiceImplTest.java | 6 ++-- .../test/util/BaseRMTestCase.java | 2 +- .../test/util/BaseRMWebScriptTestCase.java | 4 +-- .../test/util/CommonRMTestUtils.java | 2 +- .../test/util/TestAction.java | 10 +++--- .../test/util/TestActionParams.java | 6 ++-- .../test/util/TestActionPropertySubs.java | 2 +- 120 files changed, 330 insertions(+), 330 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java index 64508772f7..43eb5f726b 100755 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/AuditableActionExecuterAbstractBase.java @@ -89,7 +89,7 @@ public abstract class AuditableActionExecuterAbstractBase extends ActionExecuter @Override public void init() { - if (this instanceof RecordsManagementAction == false) + if (!(this instanceof RecordsManagementAction)) { super.init(); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java index a5c4999925..45bffc5d56 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java @@ -506,12 +506,12 @@ public abstract class RMActionExecuterAbstractBase extends PropertySubActionExe List events = nextAction.getEventCompletionDetails(); boolean eligible = false; - if (nextAction.getDispositionActionDefinition().eligibleOnFirstCompleteEvent() == false) + if (!nextAction.getDispositionActionDefinition().eligibleOnFirstCompleteEvent()) { eligible = true; for (EventCompletionDetails event : events) { - if (event.isEventComplete() == false) + if (!event.isEventComplete()) { eligible = false; break; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java index c99fa4d18a..e015972455 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMDispositionActionExecuterAbstractBase.java @@ -116,7 +116,7 @@ public abstract class RMDispositionActionExecuterAbstractBase extends RMActionEx if (di != null) { // Check the eligibility of the action - if (checkEligibility(actionedUponNodeRef) == false || + if (!checkEligibility(actionedUponNodeRef) || dispositionService.isNextDispositionActionEligible(actionedUponNodeRef)) { if (di.isRecordLevelDisposition()) @@ -239,7 +239,7 @@ public abstract class RMDispositionActionExecuterAbstractBase extends RMActionEx } // Check the node has the disposition schedule aspect applied - if (nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE)) { if (throwError) { @@ -267,7 +267,7 @@ public abstract class RMDispositionActionExecuterAbstractBase extends RMActionEx } } String actionName = (String) nodeService.getProperty(nextDispositionAction, PROP_DISPOSITION_ACTION); - if (actionName == null || actionName.equals(getName()) == false) + if (actionName == null || !actionName.equals(getName())) { if (throwError) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java index 49611a16b9..21a1e8414d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java @@ -104,7 +104,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi */ public void register(RecordsManagementAction rmAction) { - if (rmActions.containsKey(rmAction.getName()) == false) + if (!rmActions.containsKey(rmAction.getName())) { rmActions.put(rmAction.getName(), rmAction); @@ -117,7 +117,7 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi public void register(RecordsManagementActionCondition rmCondition) { - if (rmConditions.containsKey(rmCondition.getName()) == false) + if (!rmConditions.containsKey(rmCondition.getName())) { rmConditions.put(rmCondition.getName(), rmCondition); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java index 2692a7a097..92fb970842 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java @@ -126,7 +126,7 @@ public class CreateRecordAction extends AuditableActionExecuterAbstractBase protected void executeImpl(final Action action, final NodeRef actionedUponNodeRef) { - if (nodeService.exists(actionedUponNodeRef) == false) + if (!nodeService.exists(actionedUponNodeRef)) { // do not create record if the actioned upon node does not exist! if (logger.isDebugEnabled()) @@ -134,7 +134,7 @@ public class CreateRecordAction extends AuditableActionExecuterAbstractBase logger.debug("Can not create record, because " + actionedUponNodeRef.toString() + " does not exist."); } } - else if (dictionaryService.isSubClass(nodeService.getType(actionedUponNodeRef), ContentModel.TYPE_CONTENT) == false) + else if (!dictionaryService.isSubClass(nodeService.getType(actionedUponNodeRef), ContentModel.TYPE_CONTENT)) { // TODO eventually we should support other types .. either as record folders or as composite records if (logger.isDebugEnabled()) @@ -203,7 +203,7 @@ public class CreateRecordAction extends AuditableActionExecuterAbstractBase else { // verify that the provided file plan is actually a file plan - if (filePlanService.isFilePlan(filePlan) == false) + if (!filePlanService.isFilePlan(filePlan)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java index 4a7ff6abfb..d282f08980 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/HideRecordAction.java @@ -76,7 +76,7 @@ public class HideRecordAction extends AuditableActionExecuterAbstractBase @Override protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { - if (nodeService.hasAspect(actionedUponNodeRef, ASPECT_RECORD) == false) + if (!nodeService.hasAspect(actionedUponNodeRef, ASPECT_RECORD)) { // we cannot hide a document which is not a record if (logger.isDebugEnabled()) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java index c379ec4b73..0449228683 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/AddRecordTypeAction.java @@ -89,9 +89,9 @@ public class AddRecordTypeAction extends RMActionExecuterAbstractBase { boolean result = false; if (nodeService.exists(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false && + !freezeService.isFrozen(actionedUponNodeRef) && recordService.isRecord(actionedUponNodeRef) && - recordService.isDeclared(actionedUponNodeRef) == false) + !recordService.isDeclared(actionedUponNodeRef)) { result = true; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java index e5ac936c32..f75fc3a497 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/BroadcastDispositionActionDefinitionUpdateAction.java @@ -69,7 +69,7 @@ public class BroadcastDispositionActionDefinitionUpdateAction extends RMActionEx @Override protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { - if (RecordsManagementModel.TYPE_DISPOSITION_ACTION_DEFINITION.equals(nodeService.getType(actionedUponNodeRef)) == false) + if (!RecordsManagementModel.TYPE_DISPOSITION_ACTION_DEFINITION.equals(nodeService.getType(actionedUponNodeRef))) { return; } @@ -279,7 +279,7 @@ public class BroadcastDispositionActionDefinitionUpdateAction extends RMActionEx nextActionEvents.add(eventName); // if the event has been removed delete from next action - if (stepEvents != null && stepEvents.contains(event.getEventName()) == false) + if (stepEvents != null && !stepEvents.contains(event.getEventName())) { // remove the child association representing the event nodeService.removeChild(nextAction.getNodeRef(), event.getNodeRef()); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java index 3002f466d9..c166468e4f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CloseRecordFolderAction.java @@ -58,7 +58,7 @@ public class CloseRecordFolderAction extends RMActionExecuterAbstractBase { boolean result = false; if (nodeService.exists(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false) + !freezeService.isFrozen(actionedUponNodeRef)) { result = true; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java index 9d4417b2db..5b8b86d043 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CompleteEventAction.java @@ -64,7 +64,7 @@ public class CompleteEventAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { if (nodeService.exists(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false) + !freezeService.isFrozen(actionedUponNodeRef)) { String eventName = (String)action.getParameterValue(PARAM_EVENT_NAME); String eventCompletedBy = (String)action.getParameterValue(PARAM_EVENT_COMPLETED_BY); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java index bb74a1b0cb..9bee4dccbc 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java @@ -63,9 +63,9 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase { if (nodeService.exists(actionedUponNodeRef) && recordService.isRecord(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false) + !freezeService.isFrozen(actionedUponNodeRef)) { - if (recordService.isDeclared(actionedUponNodeRef) == false) + if (!recordService.isDeclared(actionedUponNodeRef)) { List missingProperties = new ArrayList(5); // Aspect not already defined - check mandatory properties then add diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java index aac7b1cf7a..15bd2ac296 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DelegateAction.java @@ -65,7 +65,7 @@ public class DelegateAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { if (nodeService.exists(actionedUponNodeRef) && - (checkFrozen == false || freezeService.isFrozen(actionedUponNodeRef) == false)) + (!checkFrozen || !freezeService.isFrozen(actionedUponNodeRef))) { // do the property subs (if any exist) if (allowParameterSubstitutions) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java index 54c3605193..9d7212b628 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java @@ -75,8 +75,8 @@ public class FileToAction extends RMActionExecuterAbstractBase protected void executeImpl(final Action action, final NodeRef actionedUponNodeRef) { if (nodeService.exists(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false && - recordService.isFiled(actionedUponNodeRef) == false) + !freezeService.isFrozen(actionedUponNodeRef) && + !recordService.isFiled(actionedUponNodeRef)) { // first look to see if the destination record folder has been specified NodeRef recordFolder = (NodeRef)action.getParameterValue(PARAM_DESTINATION_RECORD_FOLDER); @@ -135,7 +135,7 @@ public class FileToAction extends RMActionExecuterAbstractBase { throw new AlfrescoRuntimeException("Unable to execute fileTo action, because the path resolution context could not be found."); } - else if (nodeService.exists(context) == false) + else if (!nodeService.exists(context)) { throw new AlfrescoRuntimeException("Unable to execute fileTo action, because the context for the relative path does not exist."); } @@ -144,7 +144,7 @@ public class FileToAction extends RMActionExecuterAbstractBase String path = (String)action.getParameterValue(PARAM_PATH); String[] pathValues = ArrayUtils.EMPTY_STRING_ARRAY; - if (path != null && path.isEmpty() == false) + if (path != null && !path.isEmpty()) { pathValues = StringUtils.tokenizeToStringArray(path, "/", false, true); } @@ -172,7 +172,7 @@ public class FileToAction extends RMActionExecuterAbstractBase } // ensure we are trying to create a record folder in a record category - if (filePlanService.isRecordCategory(parent) == false) + if (!filePlanService.isRecordCategory(parent)) { throw new AlfrescoRuntimeException("Unable to create nre record folder, beacuse the parent is not a record category."); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java index 3c73252e12..429c5749e2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java @@ -55,10 +55,10 @@ public class FreezeAction extends RMActionExecuterAbstractBase { // NOTE: we can only freeze records and record folders so ignore everything else if (nodeService.exists(actionedUponNodeRef) && - nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_PENDING_DELETE) == false && + !nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_PENDING_DELETE) && (recordService.isRecord(actionedUponNodeRef) || recordFolderService.isRecordFolder(actionedUponNodeRef)) && - freezeService.isFrozen(actionedUponNodeRef) == false) + !freezeService.isFrozen(actionedUponNodeRef)) { freezeService.freeze((String) action.getParameterValue(PARAM_REASON), actionedUponNodeRef); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java index 8d141be0fd..2c1e2cb561 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/OpenRecordFolderAction.java @@ -50,7 +50,7 @@ public class OpenRecordFolderAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { if (nodeService.exists(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false) + !freezeService.isFrozen(actionedUponNodeRef)) { // TODO move re-open logic into a service method // TODO check that the user in question has the correct permission to re-open a records folder diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java index 9a5be259dc..f35edd3de0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java @@ -48,7 +48,7 @@ public class RejectAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { if (nodeService.exists(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false && + !freezeService.isFrozen(actionedUponNodeRef) && nodeService.getProperty(actionedUponNodeRef, PROP_RECORD_ORIGINATING_LOCATION) != null) { recordService.rejectRecord(actionedUponNodeRef, (String) action.getParameterValue(PARAM_REASON)); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java index a923b4678f..5f7d7bc5ed 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java @@ -80,9 +80,9 @@ public class RequestInfoAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { if (nodeService.exists(actionedUponNodeRef) && - nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_PENDING_DELETE) == false && + !nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_PENDING_DELETE) && recordService.isRecord(actionedUponNodeRef) && - recordService.isDeclared(actionedUponNodeRef) == false) + !recordService.isDeclared(actionedUponNodeRef)) { String workflowDefinitionId = workflowService.getDefinitionByName(REQUEST_INFO_WORKFLOW_DEFINITION_NAME).getId(); Map parameters = new HashMap(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java index d2ae7498ce..d9333a2804 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/SplitEmailAction.java @@ -114,7 +114,7 @@ public class SplitEmailAction extends RMActionExecuterAbstractBase if (recordService.isRecord(actionedUponNodeRef)) { - if (recordService.isDeclared(actionedUponNodeRef) == false) + if (!recordService.isDeclared(actionedUponNodeRef)) { ChildAssociationRef parent = nodeService.getPrimaryParent(actionedUponNodeRef); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java index 3b1c0b6f54..7707e2928e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java @@ -66,7 +66,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase private void checkTransferSubClass(NodeRef actionedUponNodeRef) { QName type = nodeService.getType(actionedUponNodeRef); - if (dictionaryService.isSubClass(type, TYPE_TRANSFER) == false) + if (!dictionaryService.isSubClass(type, TYPE_TRANSFER)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_NODE_NOT_TRANSFER)); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java index 1ee8cfe115..1a9dbeb196 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UnCutoffAction.java @@ -50,7 +50,7 @@ public class UnCutoffAction extends RMActionExecuterAbstractBase DispositionAction da = dispositionService.getLastCompletedDispostionAction(actionedUponNodeRef); // Check that the last disposition action was a cutoff - if (da == null || da.getName().equals("cutoff") == false) + if (da == null || !da.getName().equals("cutoff")) { // Can not undo cut off since cut off was not the last thing done throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_UNDO_NOT_LAST)); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java index 2e44b4cbb7..c2b52a5850 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndeclareRecordAction.java @@ -50,7 +50,7 @@ public class UndeclareRecordAction extends RMActionExecuterAbstractBase { // repoen if already complete and not frozen if (recordService.isDeclared(actionedUponNodeRef) && - freezeService.isFrozen(actionedUponNodeRef) == false) + !freezeService.isFrozen(actionedUponNodeRef)) { // Remove the declared aspect this.nodeService.removeAspect(actionedUponNodeRef, ASPECT_DECLARED_RECORD); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java index 091bac7ff1..3466e623b7 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/UndoEventAction.java @@ -115,12 +115,12 @@ public class UndoEventAction extends RMActionExecuterAbstractBase List events = da.getEventCompletionDetails(); boolean eligible = false; - if (da.getDispositionActionDefinition().eligibleOnFirstCompleteEvent() == false) + if (!da.getDispositionActionDefinition().eligibleOnFirstCompleteEvent()) { eligible = true; for (EventCompletionDetails event : events) { - if (event.isEventComplete() == false) + if (!event.isEventComplete()) { eligible = false; break; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java index 9ff0c6e046..b6b7b8abc0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java @@ -371,7 +371,7 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin { NodeRef nodeRef = childAssocRef.getChildRef(); QName type = nodeService.getType(nodeRef); - while (type != null && ContentModel.TYPE_CMOBJECT.equals(type) == false) + while (type != null && !ContentModel.TYPE_CMOBJECT.equals(type)) { if (isCustomisable(type)) { @@ -435,7 +435,7 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin // Check the nodes hierarchy for customisable types QName type = nodeService.getType(nodeRef); - while (type != null && ContentModel.TYPE_CMOBJECT.equals(type) == false) + while (type != null && !ContentModel.TYPE_CMOBJECT.equals(type)) { // Add to the list if the type is customisable if (isCustomisable(type)) @@ -755,7 +755,7 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin boolean isProtected, QName lovConstraint) throws CustomMetadataException { - if (isCustomisable(aspectName) == false) + if (!isCustomisable(aspectName)) { throw new NotCustomisableMetadataException(aspectName.toPrefixString(namespaceService)); } @@ -851,7 +851,7 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin if (newPropQName != null) { PropertyDefinition newPropDefn = dictionaryService.getProperty(newPropQName); - if (newPropDefn != null && propDefn.equals(newPropDefn) == false) + if (newPropDefn != null && !propDefn.equals(newPropDefn)) { // The requested QName is already in use String propIdAsString = newPropQName.toPrefixString(namespaceService); @@ -1064,7 +1064,7 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin } } - if (found == false) + if (!found) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_PROP_EXIST, propQNameAsString)); } @@ -1474,8 +1474,8 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin String type = customConstraint.getType(); if (type == null || - (type.equals(CUSTOM_CONSTRAINT_TYPE) == false && - type.equals(CAPATIBILITY_CUSTOM_CONTRAINT_TYPE) == false)) + (!type.equals(CUSTOM_CONSTRAINT_TYPE) && + !type.equals(CAPATIBILITY_CUSTOM_CONTRAINT_TYPE))) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_UNEXPECTED_TYPE_CONSTRAINT, type, constraintNameAsPrefixString, CUSTOM_CONSTRAINT_TYPE)); } @@ -1607,7 +1607,7 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin ContentReader reader = this.contentService.getReader(modelNodeRef, ContentModel.TYPE_CONTENT); - if (reader.exists() == false) {throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CUSTOM_MODEL_NO_CONTENT, modelNodeRef.toString()));} + if (!reader.exists()) {throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CUSTOM_MODEL_NO_CONTENT, modelNodeRef.toString()));} InputStream contentIn = null; M2Model deserializedModel = null; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index 7f250a59cb..d22575b4eb 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -501,7 +501,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean } } - if (auditNodeAlreadyExists == false) + if (!auditNodeAlreadyExists) { // Create a new auditNode if it doesn't already exist RMAuditNode auditedNode = new RMAuditNode(); @@ -543,7 +543,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean } // Filter out any properties to be audited if specified in the Spring configuration. - if (ignoredAuditProperties.isEmpty() == false) + if (!ignoredAuditProperties.isEmpty()) { removeAuditProperties(ignoredAuditProperties, propertiesBefore, propertiesAfter); } @@ -644,7 +644,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean NodeRef nodeRef = auditedNode.getNodeRef(); // If the node is gone, then do nothing - if (nodeRef != null && nodeService.exists(nodeRef) == false) + if (nodeRef != null && !nodeService.exists(nodeRef)) { continue; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java index b9e6537cfe..3f2fcf00c8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/event/LinkAuditEvent.java @@ -26,7 +26,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef; /** * Link audit event. - * + * * @author Roy Wetherall * @since 2.1 */ @@ -45,7 +45,7 @@ public class LinkAuditEvent extends AuditEvent implements OnCreateChildAssociati public void onCreateChildAssociation(ChildAssociationRef childAssocRef, boolean isNewNode) { // only care about linking child associations - if (childAssocRef.isPrimary() == false) + if (!childAssocRef.isPrimary()) { // TODO // add some dummy properties to indicate the details of the link? diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java index b716f974be..3ce951406c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/BootstrapImporterModuleComponent.java @@ -26,31 +26,31 @@ import org.alfresco.service.cmr.repository.StoreRef; /** * Custom implementation of module component importer - * + * * @author Roy Wetherall * @since 2.0 */ public class BootstrapImporterModuleComponent extends ImporterModuleComponent { private static final String CONFIG_NODEID = "rm_config_folder"; - + private NodeService nodeService; - + private ModulePatchExecuter modulePatchExecuter; - + public void setNodeService(NodeService nodeService) { this.nodeService = nodeService; } - - public void setModulePatchExecuter(ModulePatchExecuter modulePatchExecuter) + + public void setModulePatchExecuter(ModulePatchExecuter modulePatchExecuter) { this.modulePatchExecuter = modulePatchExecuter; } - + /** * Need to check whether this module has already been executed. - * + * * @see org.alfresco.repo.module.ImporterModuleComponent#executeInternal() */ @Override @@ -58,11 +58,11 @@ public class BootstrapImporterModuleComponent extends ImporterModuleComponent { try { - NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CONFIG_NODEID); - if (nodeService.exists(nodeRef) == false) + NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CONFIG_NODEID); + if (!nodeService.exists(nodeRef)) { super.executeInternal(); - + // init module schema number modulePatchExecuter.initSchemaVersion(); } @@ -72,5 +72,5 @@ public class BootstrapImporterModuleComponent extends ImporterModuleComponent exception.printStackTrace(); throw exception; } - } + } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java index b8c21934f0..98d04fd504 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/CapabilityServiceImpl.java @@ -90,7 +90,7 @@ public class CapabilityServiceImpl implements CapabilityService result = new HashSet(capabilities.size()); for (Capability capability : capabilities.values()) { - if (capability.isPrivate() == false) + if (!capability.isPrivate()) { result.add(capability); } 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 0781bbbb21..2bcf6201fa 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 @@ -289,7 +289,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon { throw new AccessDeniedException("Access Denied"); } - else if (cad.parent == false && childResult == AccessDecisionVoter.ACCESS_DENIED) + else if (!cad.parent && childResult == AccessDecisionVoter.ACCESS_DENIED) { throw new AccessDeniedException("Access Denied"); } @@ -525,7 +525,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon // All permission checks must pass inclusionMask.set(i, true); - if (nodeService.exists(returnedObject.getNodeRef(i)) == false) + if (!nodeService.exists(returnedObject.getNodeRef(i))) { inclusionMask.set(i, false); } 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 1504132e42..a9487f6419 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 @@ -180,7 +180,7 @@ public class DeclarativeCapability extends AbstractCapability protected boolean checkPermissions(NodeRef nodeRef) { boolean result = true; - if (permissions != null && permissions.isEmpty() == false) + if (permissions != null && !permissions.isEmpty()) { result = checkPermissionsImpl(nodeRef, (String[])permissions.toArray(new String[permissions.size()])); } @@ -252,7 +252,7 @@ public class DeclarativeCapability extends AbstractCapability if (actualKind != null) { - if (kinds != null && kinds.isEmpty() == false) + if (kinds != null && !kinds.isEmpty()) { // need to check the actual file plan kind is in the list specified for (String kindString : kinds) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCompositeCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCompositeCapability.java index b41c70cb6d..ff121b3198 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCompositeCapability.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/DeclarativeCompositeCapability.java @@ -74,7 +74,7 @@ public class DeclarativeCompositeCapability extends DeclarativeCapability if (capabilityResult != AccessDecisionVoter.ACCESS_DENIED) { result = AccessDecisionVoter.ACCESS_ABSTAIN; - if (isUndetermined() == false && capabilityResult == AccessDecisionVoter.ACCESS_GRANTED) + if (!isUndetermined() && capabilityResult == AccessDecisionVoter.ACCESS_GRANTED) { result = AccessDecisionVoter.ACCESS_GRANTED; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java index a0d519ae64..5df1482f62 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java @@ -37,7 +37,7 @@ private boolean checkChildren = false; public boolean evaluate(NodeRef nodeRef) { boolean result = freezeService.isFrozen(nodeRef); - if (result == false && checkChildren) + if (!result && checkChildren) { result = freezeService.hasFrozenChildren(nodeRef); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java index 448917e07f..610189c47b 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java @@ -54,7 +54,7 @@ public class HasEventsCapabilityCondition extends AbstractCapabilityCondition DispositionAction da = dispositionService.getNextDispositionAction(nodeRef); if (da != null) { - result = (da.getEventCompletionDetails().isEmpty() == false); + result = (!da.getEventCompletionDetails().isEmpty()); } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java index 92df5a7b1d..e519bc07d6 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java @@ -91,7 +91,7 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi { result = true; } - else if (recordFolderService.isRecordFolder(nodeRef) && isRecordLevelDisposition == false) + else if (recordFolderService.isRecordFolder(nodeRef) && !isRecordLevelDisposition) { result = true; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java index ddab048a21..9bbe2150e5 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/impl/CreateCapability.java @@ -91,11 +91,11 @@ public class CreateCapability extends DeclarativeCapability } if (getFilePlanService().isFilePlanComponent(destination)) { - if ((assocType == null) || assocType.equals(ContentModel.ASSOC_CONTAINS) == false) + if ((assocType == null) || !assocType.equals(ContentModel.ASSOC_CONTAINS)) { if (linkee == null) { - if (recordService.isRecord(destination) && recordService.isDeclared(destination) == false && + if (recordService.isRecord(destination) && !recordService.isDeclared(destination) && permissionService.hasPermission(destination, RMPermissionModel.FILE_RECORDS) == AccessStatus.ALLOWED) { return AccessDecisionVoter.ACCESS_GRANTED; @@ -105,7 +105,7 @@ public class CreateCapability extends DeclarativeCapability { if (recordService.isRecord(linkee) && recordService.isRecord(destination) && - recordService.isDeclared(destination) == false && + !recordService.isDeclared(destination) && permissionService.hasPermission(destination, RMPermissionModel.FILE_RECORDS) == AccessStatus.ALLOWED) { return AccessDecisionVoter.ACCESS_GRANTED; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java index 80bbd15bde..0687bf6b1a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java @@ -364,7 +364,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode String allRoleShortName = RMAuthority.ALL_ROLES_PREFIX + rmRoot.getId(); String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName); - if (authorityService.authorityExists(allRoleGroupName) == false) + if (!authorityService.authorityExists(allRoleGroupName)) { logger.info("Creating all roles group for root node: " + rmRoot.toString()); @@ -428,7 +428,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode permissionService.setInheritParentPermissions(recordFolder, false); } - if (nodeService.hasAspect(recordFolder, ASPECT_DISPOSITION_LIFECYCLE) == false) + if (!nodeService.hasAspect(recordFolder, ASPECT_DISPOSITION_LIFECYCLE)) { // See if the folder has a disposition schedule that // needs diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index a179474c0c..dfe9115115 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -175,7 +175,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl public void onFileRecord(NodeRef nodeRef) { // initialise disposition details - if (nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE)) { DispositionSchedule di = getDispositionSchedule(nodeRef); if (di != null && di.isRecordLevelDisposition()) @@ -198,7 +198,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl if (di != null) { List dispositionActionDefinitions = di.getDispositionActionDefinitions(); - if (dispositionActionDefinitions.isEmpty() == false) + if (!dispositionActionDefinitions.isEmpty()) { // get the first disposition action definition DispositionActionDefinition nextDispositionActionDefinition = dispositionActionDefinitions.get(0); @@ -335,7 +335,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("nodeRef", nodeRef); // Make sure we are dealing with an RM node - if (filePlanService.isFilePlanComponent(nodeRef) == false) + if (!filePlanService.isFilePlanComponent(nodeRef)) { throw new AlfrescoRuntimeException("Can not find the associated disposition schedule for a non records management component. (nodeRef=" + nodeRef.toString() + ")"); } @@ -468,15 +468,15 @@ public class DispositionServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("nodeRef", nodeRef); // Check exists - if (nodeService.exists(nodeRef) == false) + if (!nodeService.exists(nodeRef)) { throw new AlfrescoRuntimeException("Unable to create disposition schedule, because node does not exist. (nodeRef=" + nodeRef.toString() + ")"); } // Check is sub-type of rm:recordCategory QName nodeRefType = nodeService.getType(nodeRef); - if (TYPE_RECORD_CATEGORY.equals(nodeRefType) == false && - dictionaryService.isSubClass(nodeRefType, TYPE_RECORD_CATEGORY) == false) + if (!TYPE_RECORD_CATEGORY.equals(nodeRefType) && + !dictionaryService.isSubClass(nodeRefType, TYPE_RECORD_CATEGORY)) { throw new AlfrescoRuntimeException("Unable to create disposition schedule on a node that is not a records management container."); } @@ -485,7 +485,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl try { // Add the schedules aspect if required - if (nodeService.hasAspect(nodeRef, ASPECT_SCHEDULED) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_SCHEDULED)) { nodeService.addAspect(nodeRef, ASPECT_SCHEDULED, null); } @@ -714,7 +714,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl result = true; } - if (result == false) + if (!result) { DispositionAction da = new DispositionActionImpl(serviceRegistry, nextDa); DispositionActionDefinition dad = da.getDispositionActionDefinition(); @@ -744,7 +744,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl else { result = false; - if (firstComplete == false) + if (!firstComplete) { break; } @@ -815,7 +815,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl { DispositionAction result = null; List list = getCompletedDispositionActions(nodeRef); - if (list.isEmpty() == false) + if (!list.isEmpty()) { // Get the last disposition action in the list result = list.get(list.size()-1); @@ -876,7 +876,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl if (currentDispositionAction == null) { - if (dispositionActionDefinitions.isEmpty() == false) + if (!dispositionActionDefinitions.isEmpty()) { // The next disposition action is the first action nextDispositionActionDefinition = dispositionActionDefinitions.get(0); @@ -899,7 +899,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl if (nextDispositionActionDefinition != null) { - if (nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE)) { // Add the disposition life cycle aspect nodeService.addAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE, null); @@ -918,7 +918,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl // Get the period properties value QName periodProperty = nextDispositionActionDefinition.getPeriodProperty(); if (periodProperty != null && - RecordsManagementModel.PROP_DISPOSITION_AS_OF.equals(periodProperty) == false) + !RecordsManagementModel.PROP_DISPOSITION_AS_OF.equals(periodProperty)) { // doesn't matter if the period property isn't set ... the asOfDate will get updated later // when the value of the period property is set @@ -983,7 +983,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl if (FilePlanComponentKind.RECORD_FOLDER.equals(filePlanService.getFilePlanComponentKind(nodeRef)) || FilePlanComponentKind.RECORD.equals(filePlanService.getFilePlanComponentKind(nodeRef))) { - if (isDisposableItemCutoff(nodeRef) == false) + if (!isDisposableItemCutoff(nodeRef)) { if (recordFolderService.isRecordFolder(nodeRef)) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java index 23d9101bb3..451a1f42df 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java @@ -153,11 +153,11 @@ public class DispositionProperty extends BaseBehaviourBean boolean result = false; if ((isRecordLevel && appliesToRecordLevel) || - (isRecordLevel == false && appliesToFolderLevel)) + (!isRecordLevel && appliesToFolderLevel)) { if (excludedDispositionActions != null && excludedDispositionActions.size() != 0) { - if (excludedDispositionActions.contains(dispositionAction) == false) + if (!excludedDispositionActions.contains(dispositionAction)) { result = true; } @@ -260,7 +260,7 @@ public class DispositionProperty extends BaseBehaviourBean result = true; } else if (beforeValue != null && afterValue != null && - beforeValue.equals(afterValue) == false) + !beforeValue.equals(afterValue)) { result = true; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java index 2fe42f9690..be61a1ca47 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/model/dod/aspect/DOD5015RecordAspect.java @@ -66,7 +66,7 @@ public class DOD5015RecordAspect extends BaseBehaviourBean public void onAddAspect(NodeRef nodeRef, QName aspect) { if (nodeService.exists(nodeRef) && - nodeService.hasAspect(nodeRef, ASPECT_DOD_5015_RECORD) == false && + !nodeService.hasAspect(nodeRef, ASPECT_DOD_5015_RECORD) && isDODFilePlan(nodeRef)) { nodeService.addAspect(nodeRef, ASPECT_DOD_5015_RECORD, null); 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 4aebda8101..9649d937f1 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 @@ -341,7 +341,7 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme */ private void saveConfig(Set customMappingsToSave) { - if (nodeService.exists(CONFIG_NODE_REF) == false) + if (!nodeService.exists(CONFIG_NODE_REF)) { // create the config node Map properties = new HashMap(2); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java index b22383508e..452e41ae6c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/RFC822MetadataExtracter.java @@ -60,7 +60,7 @@ public class RFC822MetadataExtracter extends org.alfresco.repo.content.metadata. protected void filterSystemProperties(Map systemProperties, Map targetProperties) { NodeRef nodeRef = getNodeRef(targetProperties); - if (nodeRef == null || nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD) == false) + if (nodeRef == null || !nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD)) { // Remove all rm namespace properties from the system map Map clone = new HashMap(systemProperties); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java index ad3b05f41c..e0c982ce6f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferenceCreateEventType.java @@ -118,7 +118,7 @@ public class OnReferenceCreateEventType extends SimpleRecordsManagementEventType for (EventCompletionDetails event : events) { RecordsManagementEvent rmEvent = recordsManagementEventService.getEvent(event.getEventName()); - if (event.isEventComplete() == false && + if (!event.isEventComplete() && rmEvent.getType().equals(getName())) { // Complete the event diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java index e48dc0fe68..1ac003851e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/OnReferencedRecordActionedUpon.java @@ -242,7 +242,7 @@ public class OnReferencedRecordActionedUpon extends SimpleRecordsManagementEvent for (EventCompletionDetails event : events) { RecordsManagementEvent rmEvent = recordsManagementEventService.getEvent(event.getEventName()); - if (event.isEventComplete() == false && + if (!event.isEventComplete() && rmEvent.getType().equals(getName())) { // Complete the event diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java index 100c0a2823..fc8ead986e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/event/RecordsManagementEventServiceImpl.java @@ -111,7 +111,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent */ public RecordsManagementEvent getEvent(String eventName) { - if (getEventMap().containsKey(eventName) == false) { throw new AlfrescoRuntimeException("The event " + if (!getEventMap().containsKey(eventName)) { throw new AlfrescoRuntimeException("The event " + eventName + " does not exist."); } return getEventMap().get(eventName); } @@ -180,7 +180,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent boolean canEditEvent = true; - if (existsEvent(eventName) == false) + if (!existsEvent(eventName)) { throw new AlfrescoRuntimeException("The event '" + eventName + "' does not exist."); } @@ -192,7 +192,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent { if (recordsManagementEvent.getName().equalsIgnoreCase(eventName)) { - if (recordsManagementEvent.getType().equalsIgnoreCase(eventType) == false) + if (!recordsManagementEvent.getType().equalsIgnoreCase(eventType)) { canEditEvent = true; } @@ -219,7 +219,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent public RecordsManagementEvent addEvent(String eventType, String eventName, String eventDisplayLabel) { // Check that the eventType is valid - if (eventTypes.containsKey(eventType) == false) + if (!eventTypes.containsKey(eventType)) { throw new AlfrescoRuntimeException( "Can not add event because event " + @@ -276,7 +276,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent public Object doWork() throws Exception { // Get the event config node - if (nodeService.exists(CONFIG_NODE_REF) == false) + if (!nodeService.exists(CONFIG_NODE_REF)) { throw new AlfrescoRuntimeException("Unable to find records management event configuration node."); } @@ -308,7 +308,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent // Check that the eventType is valid - if (eventTypes.containsKey(eventType) == false) + if (!eventTypes.containsKey(eventType)) { throw new AlfrescoRuntimeException( "Can not load rm event configuration because event " + @@ -337,7 +337,7 @@ public class RecordsManagementEventServiceImpl implements RecordsManagementEvent public Object doWork() throws Exception { // Get the event config node - if (nodeService.exists(CONFIG_NODE_REF) == false) + if (!nodeService.exists(CONFIG_NODE_REF)) { throw new AlfrescoRuntimeException("Unable to find records management event configuration node."); } 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 756a186f66..f8179d242c 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 @@ -402,7 +402,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl private NodeRef getFilePlanRootContainer(NodeRef filePlan, String containerName) { ParameterCheck.mandatory("filePlan", filePlan); - if (isFilePlan(filePlan) == false) + if (!isFilePlan(filePlan)) { throw new AlfrescoRuntimeException("Unable to get the container " + containerName + ", because passed node is not a file plan."); } @@ -460,7 +460,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl private NodeRef createFilePlanRootContainer(NodeRef filePlan, QName containerType, String containerName) { ParameterCheck.mandatory("filePlan", filePlan); - if (isFilePlan(filePlan) == false) + if (!isFilePlan(filePlan)) { throw new AlfrescoRuntimeException("Unable to create file plan root container, because passed node is not a file plan."); } @@ -480,7 +480,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl properties).getChildRef(); - // if (inheritPermissions == false) + // if (!inheritPermissions) // { // set inheritance to false getPermissionService().setInheritParentPermissions(container, false); @@ -519,8 +519,8 @@ public class FilePlanServiceImpl extends ServiceBaseImpl } // Check that the passed type is a sub-type of rma:filePlan - if (TYPE_FILE_PLAN.equals(type) == false && - dictionaryService.isSubClass(type, TYPE_FILE_PLAN) == false) + if (!TYPE_FILE_PLAN.equals(type) && + !dictionaryService.isSubClass(type, TYPE_FILE_PLAN)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_ROOT_TYPE, type.toString())); } @@ -593,14 +593,14 @@ public class FilePlanServiceImpl extends ServiceBaseImpl */ private void getNodeRefPathRecursive(NodeRef nodeRef, LinkedList nodeRefPath) { - if (isFilePlanComponent(nodeRef) == false) + if (!isFilePlanComponent(nodeRef)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_INVALID_RM_NODE, ASPECT_FILE_PLAN_COMPONENT.toString())); } // Prepend it to the path nodeRefPath.addFirst(nodeRef); // Are we not at the root - if (isFilePlan(nodeRef) == false) + if (!isFilePlan(nodeRef)) { ChildAssociationRef assocRef = nodeService.getPrimaryParent(nodeRef); if (assocRef == null) @@ -642,15 +642,15 @@ public class FilePlanServiceImpl extends ServiceBaseImpl // Check that the parent is a container QName parentType = nodeService.getType(parent); - if (TYPE_RECORDS_MANAGEMENT_CONTAINER.equals(parentType) == false && - dictionaryService.isSubClass(parentType, TYPE_RECORDS_MANAGEMENT_CONTAINER) == false) + if (!TYPE_RECORDS_MANAGEMENT_CONTAINER.equals(parentType) && + !dictionaryService.isSubClass(parentType, TYPE_RECORDS_MANAGEMENT_CONTAINER)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CONTAINER_PARENT_TYPE, parentType.toString())); } // Check that the the provided type is a sub-type of rm:recordCategory - if (TYPE_RECORD_CATEGORY.equals(type) == false && - dictionaryService.isSubClass(type, TYPE_RECORD_CATEGORY) == false) + if (!TYPE_RECORD_CATEGORY.equals(type) && + !dictionaryService.isSubClass(type, TYPE_RECORD_CATEGORY)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CONTAINER_TYPE, type.toString())); } @@ -726,7 +726,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("container", container); // Check we have a container in our hands - if (isRecordCategory(container) == false) + if (!isRecordCategory(container)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CONTAINER_EXPECTED)); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java index d762590c1a..b64bc30795 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java @@ -295,7 +295,7 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter List fieldDefs = form.getFieldDefinitions(); for (FieldDefinition fieldDef : fieldDefs) { - if (fieldDef.isProtectedField() == false) + if (!fieldDef.isProtectedField()) { String name = fieldDef.getName(); String prefixName = null; @@ -314,7 +314,7 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter } QName qname = QName.createQName(prefixName, namespaceService); - if (recordService.isPropertyEditable(nodeRef, qname) == false) + if (!recordService.isPropertyEditable(nodeRef, qname)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java index f239fabc49..2e2b47c6c9 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java @@ -145,7 +145,7 @@ public class RecordsManagementTypeFormFilter extends RecordsManagementFormFilter Map customProps = rmAdminService.getCustomPropertyDefinitions(customisableType); - if (customProps != null && customProps.isEmpty() == false) + if (customProps != null && !customProps.isEmpty()) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index d4302cefa8..650b54a783 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -136,7 +136,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute * Now do the work, one action in each transaction */ - if (nodeService.exists(currentNode) == false) + if (!nodeService.exists(currentNode)) { retryingTransactionHelper.doInTransaction(processTranCB); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java index 5e18f39025..3e06755137 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/RecordsManagementJobExecuter.java @@ -25,17 +25,17 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti /** * Records management job executer base class. - * + * * @author Roy Wetherall */ -public abstract class RecordsManagementJobExecuter implements RecordsManagementModel +public abstract class RecordsManagementJobExecuter implements RecordsManagementModel { /** Retrying transaction helper */ protected RetryingTransactionHelper retryingTransactionHelper; - + /** Repository state helper */ protected RepositoryState repositoryState; - + /** * @param retryingTransactionHelper retrying transaction helper */ @@ -43,22 +43,22 @@ public abstract class RecordsManagementJobExecuter implements RecordsManagementM { this.retryingTransactionHelper = retryingTransactionHelper; } - + /** * @param repositoryState repository state helper component */ - public void setRepositoryState(RepositoryState repositoryState) + public void setRepositoryState(RepositoryState repositoryState) { this.repositoryState = repositoryState; } - + /** * Executes the jobs work. */ public void execute() { // jobs not allowed to execute unless bootstrap is complete - if (repositoryState.isBootstrapping() == false) + if (!repositoryState.isBootstrapping()) { retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback() { @@ -66,13 +66,13 @@ public abstract class RecordsManagementJobExecuter implements RecordsManagementM public Void execute() throws Throwable { executeImpl(); - + return null; } }, false, true); } } - + /** * Jobs work implementation. */ diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java index 3e8aca198b..bbeda66d75 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/ScriptRecordsManagmentNode.java @@ -66,7 +66,7 @@ public class ScriptRecordsManagmentNode extends ScriptNode if (map.containsKey(capability)) { AccessStatus accessStatus = map.get(capability); - if (accessStatus.equals(AccessStatus.DENIED) == false) + if (!accessStatus.equals(AccessStatus.DENIED)) { result = true; } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java index 13a4b2547a..415f55a22f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/BaseEvaluator.java @@ -254,7 +254,7 @@ public abstract class BaseEvaluator implements RecordsManagementModel private boolean checkCapabilities(NodeRef nodeRef) { boolean result = true; - if (capabilities != null && capabilities.isEmpty() == false) + if (capabilities != null && !capabilities.isEmpty()) { Map accessStatus = capabilityService.getCapabilitiesAccessState(nodeRef, capabilities); for (AccessStatus value : accessStatus.values()) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java index 91c80df9ec..9db8179cab 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java @@ -167,7 +167,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC @SuppressWarnings("unchecked") private void setIndicators(JSONObject rmNodeValues, NodeRef nodeRef) { - if (indicators != null && indicators.isEmpty() == false) + if (indicators != null && !indicators.isEmpty()) { JSONArray jsonIndicators = new JSONArray(); @@ -186,7 +186,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC @SuppressWarnings("unchecked") private void setActions(JSONObject rmNodeValues, NodeRef nodeRef) { - if (actions != null && actions.isEmpty() == false) + if (actions != null && !actions.isEmpty()) { JSONArray jsonActions = new JSONArray(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java index 75f1476137..9079fa68a0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/evaluator/SplitEmailActionEvaluator.java @@ -35,7 +35,7 @@ public class SplitEmailActionEvaluator extends BaseEvaluator protected boolean evaluateImpl(NodeRef nodeRef) { boolean result = false; - if (recordService.isDeclared(nodeRef) == false) + if (!recordService.isDeclared(nodeRef)) { ContentData contentData = (ContentData)nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT); if (contentData != null) 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 0f56712f2b..502f979995 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 @@ -327,7 +327,7 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel onAddSearchAspect.disable(); try { - if (nodeService.hasAspect(nodeRef, ASPECT_RM_SEARCH) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_RM_SEARCH)) { nodeService.addAspect(nodeRef, ASPECT_RM_SEARCH , null); @@ -652,7 +652,7 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel props.add(PROP_REVIEW_PERIOD); Set changed = determineChangedProps(before, after); changed.retainAll(props); - if (changed.isEmpty() == false) + if (!changed.isEmpty()) { updateVitalRecordDefinitionValues(nodeRef); } @@ -842,7 +842,7 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel for (QName qn : oldProps.keySet()) { if (newProps.get(qn) == null || - newProps.get(qn).equals(oldProps.get(qn)) == false) + !newProps.get(qn).equals(oldProps.get(qn))) { result.add(qn); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index b37bce7ae0..3a7943a51e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -217,7 +217,7 @@ public class RecordAspect extends BaseBehaviourBean public void onMoveNode(ChildAssociationRef oldChildAssocRef, ChildAssociationRef newChildAssocRef) { // check the records parent has actually changed - if (oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef()) == false) + if (!oldChildAssocRef.getParentRef().equals(newChildAssocRef.getParentRef())) { final NodeRef newNodeRef = newChildAssocRef.getChildRef(); AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork() diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java index 4354d4b2a3..7fc55d18cb 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordComponentIdentifierAspect.java @@ -118,7 +118,7 @@ public class RecordComponentIdentifierAspect extends BaseBehaviourBean if (newIdValue != null) { String oldIdValue = (String)before.get(PROP_IDENTIFIER); - if (oldIdValue != null && oldIdValue.equals(newIdValue) == false) + if (oldIdValue != null && !oldIdValue.equals(newIdValue)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_SET_ID, nodeRef.toString())); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java index 54954d55a2..5a8510b6e2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/DispositionActionDefinitionType.java @@ -69,7 +69,7 @@ public class DispositionActionDefinitionType extends BaseBehaviourBean Set changedProps = new HashSet(PropertyMap.getChangedProperties(before, after).keySet()); changedProps.addAll(PropertyMap.getAddedProperties(before, after).keySet()); - if (nodeService.hasAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_UNPUBLISHED_UPDATE)) { // Apply the unpublished aspect Map props = new HashMap(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java index b55ed050e0..1cd4e629d7 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java @@ -114,7 +114,7 @@ public class RecordsManagementContainerType extends BaseBehaviourBean { // We need to automatically cast the created folder to RM type if it is a plain folder // This occurs if the RM folder has been created via IMap, WebDav, etc - if (nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT) == false) + if (!nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT)) { // check the type of the parent to determine what 'kind' of artifact to create NodeRef parent = childAssocRef.getParentRef(); @@ -146,11 +146,11 @@ public class RecordsManagementContainerType extends BaseBehaviourBean boolean isUnfiledRecordContainerChild = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER_CHILD); if (isContentSubType && (isUnfiledRecordContainer|| isUnfiledRecordContainerChild)) { - if (nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT) == false) + if (!nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT)) { nodeService.addAspect(child, ASPECT_FILE_PLAN_COMPONENT, null); } - if (nodeService.hasAspect(child, ASPECT_RECORD) == false) + if (!nodeService.hasAspect(child, ASPECT_RECORD)) { recordService.makeRecord(child); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java index 18c31d6dd8..3b700d4da2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RmSiteType.java @@ -115,14 +115,14 @@ public class RmSiteType extends BaseBehaviourBean ParameterCheck.mandatory("filePlanType", filePlanType); // check that the registered site type is a subtype of rma:rmsite - if (dictionaryService.isSubClass(siteType, TYPE_RM_SITE) == false) + if (!dictionaryService.isSubClass(siteType, TYPE_RM_SITE)) { throw new AlfrescoRuntimeException( "Can't register site type, because site type is not a sub type of rma:rmsite (siteType=" + siteType.toString() + ")"); } // check that the registered file plan type is a sub type of rma:filePlan - if (dictionaryService.isSubClass(filePlanType, TYPE_FILE_PLAN) == false) + if (!dictionaryService.isSubClass(filePlanType, TYPE_FILE_PLAN)) { throw new AlfrescoRuntimeException( "Can't register file plan type, because site type is not a sub type of rma:filePlan (filePlanType=" + filePlanType.toString() + ")"); @@ -216,7 +216,7 @@ public class RmSiteType extends BaseBehaviourBean Map changed = PropertyMap.getChangedProperties(before, after); if (changed.containsKey(SiteModel.PROP_SITE_VISIBILITY) && changed.get(SiteModel.PROP_SITE_VISIBILITY) != null && - SiteVisibility.PUBLIC.equals(changed.get(SiteModel.PROP_SITE_VISIBILITY)) == false) + !SiteVisibility.PUBLIC.equals(changed.get(SiteModel.PROP_SITE_VISIBILITY))) { // we do not current support non-public RM sites throw new AlfrescoRuntimeException("The records management site must have public visibility. It can't be changed to " + changed.get(SiteModel.PROP_SITE_VISIBILITY)); 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 e1299b3679..0f66d693f6 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 @@ -279,10 +279,10 @@ public class ModelSecurityServiceImpl extends BaseBehaviourBean { if (enabled && AuthenticationUtil.getFullyAuthenticatedUser() != null && - AuthenticationUtil.isRunAsUserTheSystemUser() == false && + !AuthenticationUtil.isRunAsUserTheSystemUser() && isProtectedAspect(aspect) && nodeService.exists(nodeRef) && - canEditProtectedAspect(nodeRef, aspect) == false) + !canEditProtectedAspect(nodeRef, aspect)) { // the user can't edit the protected aspect throw new ModelAccessDeniedException( @@ -306,10 +306,10 @@ public class ModelSecurityServiceImpl extends BaseBehaviourBean { if (enabled && AuthenticationUtil.getFullyAuthenticatedUser() != null && - AuthenticationUtil.isRunAsUserTheSystemUser() == false && + !AuthenticationUtil.isRunAsUserTheSystemUser() && isProtectedAspect(aspect) && nodeService.exists(nodeRef) && - canEditProtectedAspect(nodeRef, aspect) == false) + !canEditProtectedAspect(nodeRef, aspect)) { // the user can't edit the protected aspect throw new ModelAccessDeniedException( @@ -333,7 +333,7 @@ public class ModelSecurityServiceImpl extends BaseBehaviourBean { if (enabled && AuthenticationUtil.getFullyAuthenticatedUser() != null && - AuthenticationUtil.isRunAsUserTheSystemUser() == false && + !AuthenticationUtil.isRunAsUserTheSystemUser() && nodeService.exists(nodeRef)) { for (QName property : after.keySet()) @@ -346,8 +346,8 @@ public class ModelSecurityServiceImpl extends BaseBehaviourBean return; } - if (EqualsHelper.nullSafeEquals(before.get(property), after.get(property)) == false && - canEditProtectedProperty(nodeRef, property) == false) + if (!EqualsHelper.nullSafeEquals(before.get(property), after.get(property)) && + !canEditProtectedProperty(nodeRef, property)) { // the user can't edit the protected property throw new ModelAccessDeniedException( diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java index fcb80a08ec..0bb6563746 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/notification/RecordsManagementNotificationHelper.java @@ -233,7 +233,7 @@ public class RecordsManagementNotificationHelper implements RecordsManagementMod public void recordsDueForReviewEmailNotification(final List records) { ParameterCheck.mandatory("records", records); - if (records.isEmpty() == false) + if (!records.isEmpty()) { NodeRef root = getRMRoot(records.get(0)); String groupName = getGroupName(root); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java index d6e66d2ab3..4b3a57f85c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java @@ -80,7 +80,7 @@ public class ModulePatchExecuterImpl extends AbstractModuleComponent public void register(ModulePatch modulePatch) { // ensure that the module patch being registered relates to the module id - if (getModuleId().equals(modulePatch.getModuleId()) == false) + if (!getModuleId().equals(modulePatch.getModuleId())) { throw new AlfrescoRuntimeException("Unable to register module patch, becuase module id is invalid."); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java index 81b6accab9..1203910dcf 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v20/NotificationTemplatePatch.java @@ -143,7 +143,7 @@ public class NotificationTemplatePatch extends ModulePatchComponent */ private void updateTemplate(NodeRef template, String templateUpdate) { - if (template == null || nodeService.exists(template) == false) + if (template == null || !nodeService.exists(template)) { if (logger.isDebugEnabled()) { @@ -154,7 +154,7 @@ public class NotificationTemplatePatch extends ModulePatchComponent { // Check to see if this template has already been updated String lastPatchUpdate = (String)nodeService.getProperty(template, PROP_LAST_PATCH_UPDATE); - if (lastPatchUpdate == null || name.equals(lastPatchUpdate) == false) + if (lastPatchUpdate == null || !name.equals(lastPatchUpdate)) { if (logger.isDebugEnabled()) { @@ -162,7 +162,7 @@ public class NotificationTemplatePatch extends ModulePatchComponent } // Make sure the template is versionable - if (nodeService.hasAspect(template, ContentModel.ASPECT_VERSIONABLE) == false) + if (!nodeService.hasAspect(template, ContentModel.ASPECT_VERSIONABLE)) { nodeService.addAspect(template, ContentModel.ASPECT_VERSIONABLE, null); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java index 2ce6e3823d..83d859d19b 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/NotificationTemplatePatch_v21.java @@ -87,7 +87,7 @@ public class NotificationTemplatePatch_v21 extends RMv21PatchComponent NodeRef nodeRef = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, CONFIG_NODEID); // get the parent node NodeRef supersededTemplate = notificationHelper.getSupersededTemplate(); - if (nodeService.exists(nodeRef) == false && nodeService.exists(supersededTemplate)) + if (!nodeService.exists(nodeRef) && nodeService.exists(supersededTemplate)) { NodeRef parent = nodeService.getPrimaryParent(supersededTemplate).getParentRef(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java index e4f2a70cb5..baf6f6298a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21BehaviorScriptsPatch.java @@ -88,14 +88,14 @@ public class RMv21BehaviorScriptsPatch extends RMv21PatchComponent implements Be protected void executePatch() throws Throwable { // check that the rm config root has been correctly bootstrapped - if (nodeService.exists(RM_CONFIG) == false) + if (!nodeService.exists(RM_CONFIG)) { // we don't need to do anything return; } // check that the behavior scripts folder exists - if (nodeService.exists(newBehaviorScriptsFolder) == false) + if (!nodeService.exists(newBehaviorScriptsFolder)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java index e4f9515c9d..a55f4f99f2 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21CapabilityPatch.java @@ -105,7 +105,7 @@ public class RMv21CapabilityPatch extends RMv21PatchComponent Set capabilities = role.getCapabilities(); // only update if the capability is missing - if (capabilities.contains(capability) == false) + if (!capabilities.contains(capability)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RMAdminUserPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RMAdminUserPatch.java index bae1ecee72..d9000ea623 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RMAdminUserPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RMAdminUserPatch.java @@ -115,7 +115,7 @@ public class RMv21RMAdminUserPatch extends RMv21PatchComponent implements BeanNa String firstName = I18NUtil.getMessage(MSG_FIRST_NAME); String lastName = I18NUtil.getMessage(MSG_LAST_NAME); - if (authenticationService.authenticationExists(user) == false) + if (!authenticationService.authenticationExists(user)) { if (logger.isDebugEnabled()) { @@ -124,7 +124,7 @@ public class RMv21RMAdminUserPatch extends RMv21PatchComponent implements BeanNa authenticationService.createAuthentication(user, password.toCharArray()); - if (personService.personExists(user) == false) + if (!personService.personExists(user)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java index ff08dd92d5..7333db8cbb 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21ReportServicePatch.java @@ -72,7 +72,7 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent protected void executePatch() throws Throwable { // check whether report dir exists or not - if (nodeService.exists(RM_CONFIG_FOLDER) && nodeService.exists(TEMPLATE_ROOT) == false) + if (nodeService.exists(RM_CONFIG_FOLDER) && !nodeService.exists(TEMPLATE_ROOT)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java index b039efdd21..a4fd619a83 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v21/RMv21RolesPatch.java @@ -83,7 +83,7 @@ public class RMv21RolesPatch extends RMv21PatchComponent implements BeanNameAwar for (Role role : roles) { String roleGroupName = role.getRoleGroupName(); - if (authorityService.getAuthorityZones(roleGroupName).contains(RMAuthority.ZONE_APP_RM) == false) + if (!authorityService.getAuthorityZones(roleGroupName).contains(RMAuthority.ZONE_APP_RM)) { if (logger.isDebugEnabled()) { @@ -91,7 +91,7 @@ public class RMv21RolesPatch extends RMv21PatchComponent implements BeanNameAwar } addAuthorityToZone(roleGroupName); - if (parentAddedToZone == false) + if (!parentAddedToZone) { String allRolesGroupName = filePlanRoleService.getAllRolesContainerGroup(filePlan); addAuthorityToZone(allRolesGroupName); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java index ca1b915c70..9e093924be 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22CapabilityPatch.java @@ -106,7 +106,7 @@ public class RMv22CapabilityPatch extends AbstractModulePatch Set capabilities = role.getCapabilities(); // only update if the capability is missing - if (capabilities.contains(capability) == false) + if (!capabilities.contains(capability)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java index ad903c7ef3..5caa347679 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22ReportTemplatePatch.java @@ -79,7 +79,7 @@ public class RMv22ReportTemplatePatch extends AbstractModulePatch { NodeRef transferReport = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, TRANSFER_REPORT); NodeRef destructionReport = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, DESTRUCTION_REPORT); - if (nodeService.exists(transferReport) == false && nodeService.exists(destructionReport)) + if (!nodeService.exists(transferReport) && nodeService.exists(destructionReport)) { NodeRef parent = nodeService.getPrimaryParent(destructionReport).getParentRef(); 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 f5222dc78a..5319bc3550 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 @@ -446,9 +446,9 @@ public class RecordServiceImpl extends BaseBehaviourBean { NodeRef nodeRef = childAssocRef.getChildRef(); if (nodeService.exists(nodeRef) && - nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) == false && - nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) == false && - nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY) == false) + !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) && + !nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) && + !nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY)) { if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT)) { @@ -535,7 +535,7 @@ public class RecordServiceImpl extends BaseBehaviourBean public void onUpdateProperties(final NodeRef nodeRef, final Map before, final Map after) { if (AuthenticationUtil.getFullyAuthenticatedUser() != null && - AuthenticationUtil.isRunAsUserTheSystemUser() == false && + !AuthenticationUtil.isRunAsUserTheSystemUser() && nodeService.exists(nodeRef) && isRecord(nodeRef)) { @@ -565,8 +565,8 @@ public class RecordServiceImpl extends BaseBehaviourBean propertyUnchanged = EqualsHelper.nullSafeEquals(beforeValue, afterValue); } - if (propertyUnchanged == false && - isPropertyEditable(nodeRef, property) == false) + if (!propertyUnchanged && + !isPropertyEditable(nodeRef, property)) { // the user can't edit the record property throw new ModelAccessDeniedException( @@ -745,7 +745,7 @@ public class RecordServiceImpl extends BaseBehaviourBean @Override public Void doWork() throws Exception { - if (nodeService.hasAspect(nodeRef, ASPECT_RECORD) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_RECORD)) { // disable delete rules ruleService.disableRuleType("outbound"); @@ -867,7 +867,7 @@ public class RecordServiceImpl extends BaseBehaviourBean // In case of filing a report the created node will be made // a record within the "onCreateChildAssociation" method if // a destination for the report has been selected. - if (nodeService.hasAspect(record, ASPECT_RECORD) == false) + if (!nodeService.hasAspect(record, ASPECT_RECORD)) { // make record makeRecord(record); @@ -979,7 +979,7 @@ public class RecordServiceImpl extends BaseBehaviourBean beforeFileRecord.get(getTypeAndApsects(record)).beforeFileRecord(record); // check whether this item is already an item or not - if (isRecord(record) == false) + if (!isRecord(record)) { // make the item a record makeRecord(record); @@ -1016,7 +1016,7 @@ public class RecordServiceImpl extends BaseBehaviourBean List parentAssocs = nodeService.getParentAssocs(nodeRef); for (ChildAssociationRef childAssociationRef : parentAssocs) { - if (childAssociationRef.isPrimary() == false && childAssociationRef.getParentRef().equals(originatingLocation)) + if (!childAssociationRef.isPrimary() && childAssociationRef.getParentRef().equals(originatingLocation)) { nodeService.removeChildAssociation(childAssociationRef); break; @@ -1064,7 +1064,7 @@ public class RecordServiceImpl extends BaseBehaviourBean List parentAssocs = nodeService.getParentAssocs(nodeRef); for (ChildAssociationRef childAssociationRef : parentAssocs) { - if (childAssociationRef.isPrimary() == false && childAssociationRef.getParentRef().equals(originatingLocation)) + if (!childAssociationRef.isPrimary() && childAssociationRef.getParentRef().equals(originatingLocation)) { nodeService.removeChildAssociation(childAssociationRef); break; @@ -1136,7 +1136,7 @@ public class RecordServiceImpl extends BaseBehaviourBean ParameterCheck.mandatory("record", record); ParameterCheck.mandatory("property", property); - if (isRecord(record) == false) + if (!isRecord(record)) { throw new AlfrescoRuntimeException("Can not check if the property " + property.toString() + " is editable, because node reference is not a record."); } @@ -1241,10 +1241,10 @@ public class RecordServiceImpl extends BaseBehaviourBean result = true; } - else if (allowNonRecordEdit && allowRecordEdit == false) + else if (allowNonRecordEdit && !allowRecordEdit) { // can only edit non record properties - if (isRecordMetadata(property) == false) + if (!isRecordMetadata(property)) { if (logger.isDebugEnabled()) { @@ -1261,7 +1261,7 @@ public class RecordServiceImpl extends BaseBehaviourBean } } } - else if (allowNonRecordEdit == false && allowRecordEdit) + else if (!allowNonRecordEdit && allowRecordEdit) { // can only edit record properties if (isRecordMetadata(property)) @@ -1296,7 +1296,7 @@ public class RecordServiceImpl extends BaseBehaviourBean { boolean result = ArrayUtils.contains(RECORD_MODEL_URIS, property.getNamespaceURI()); - if (result == false && ArrayUtils.contains(NON_RECORD_MODEL_URIS, property.getNamespaceURI()) == false) + if (!result && !ArrayUtils.contains(NON_RECORD_MODEL_URIS, property.getNamespaceURI())) { PropertyDefinition def = dictionaryService.getProperty(property); if (def != null) @@ -1386,7 +1386,7 @@ public class RecordServiceImpl extends BaseBehaviourBean ParameterCheck.mandatory("nodeRef", nodeRef); ParameterCheck.mandatory("typeQName", typeQName); - if (nodeService.hasAspect(nodeRef, typeQName) == false) + if (!nodeService.hasAspect(nodeRef, typeQName)) { nodeService.addAspect(nodeRef, typeQName, null); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java index 49eb839b5b..b7550c0349 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/recordfolder/RecordFolderServiceImpl.java @@ -103,10 +103,10 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl public void setupRecordFolder(NodeRef nodeRef) { // initialise disposition details - if (nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE)) { DispositionSchedule di = dispositionService.getDispositionSchedule(nodeRef); - if (di != null && di.isRecordLevelDisposition() == false) + if (di != null && !di.isRecordLevelDisposition()) { nodeService.addAspect(nodeRef, ASPECT_DISPOSITION_LIFECYCLE, null); } @@ -132,7 +132,7 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("nodeRef", nodeRef); // Check we have a record folder - if (isRecordFolder(nodeRef) == false) + if (!isRecordFolder(nodeRef)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_RECORD_FOLDER_EXPECTED)); } @@ -143,7 +143,7 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl List records = recordService.getRecords(nodeRef); for (NodeRef record : records) { - if (recordService.isDeclared(record) == false) + if (!recordService.isDeclared(record)) { result = false; break; @@ -162,7 +162,7 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("nodeRef", nodeRef); // Check we have a record folder - if (isRecordFolder(nodeRef) == false) + if (!isRecordFolder(nodeRef)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_RECORD_FOLDER_EXPECTED)); } @@ -201,15 +201,15 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl // Check that the parent is a container QName parentType = nodeService.getType(rmContainer); - if (TYPE_RECORD_CATEGORY.equals(parentType) == false && - dictionaryService.isSubClass(parentType, TYPE_RECORD_CATEGORY) == false) + if (!TYPE_RECORD_CATEGORY.equals(parentType) && + !dictionaryService.isSubClass(parentType, TYPE_RECORD_CATEGORY)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_PARENT_RECORD_FOLDER_TYPE, parentType.toString())); } // Check that the the provided type is a sub-type of rm:recordFolder - if (TYPE_RECORD_FOLDER.equals(type) == false && - dictionaryService.isSubClass(type, TYPE_RECORD_FOLDER) == false) + if (!TYPE_RECORD_FOLDER.equals(type) && + !dictionaryService.isSubClass(type, TYPE_RECORD_FOLDER)) { throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_RECORD_FOLDER_TYPE, type.toString())); } @@ -299,7 +299,7 @@ public class RecordFolderServiceImpl extends ServiceBaseImpl if (isRecordFolder(nodeRef)) { - if (isRecordFolderClosed(nodeRef) == false) + if (!isRecordFolderClosed(nodeRef)) { nodeService.setProperty(nodeRef, PROP_IS_CLOSED, true); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java index 5dc5d0b1d0..29f6ee574c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java @@ -199,7 +199,7 @@ public class DeclarativeReportGenerator extends BaseReportGenerator private NodeRef getReportTemplate(String mimetype) { // check that the template root has been correctly bootstraped - if (fileFolderService.exists(TEMPLATE_ROOT) == false) + if (!fileFolderService.exists(TEMPLATE_ROOT)) { throw new AlfrescoRuntimeException("Unable to get report template, because the template root folder does not exist in the data dictionary."); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java index 44c4c3374a..259d5f6501 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java @@ -214,7 +214,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, //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); - if (nodeService.exists(nodeRef) == false) + if (!nodeService.exists(nodeRef)) { bootstrapImporterModule.execute(); } @@ -385,7 +385,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, String user = AuthenticationUtil.getFullyAuthenticatedUser(); authorityService.addAuthority(role.getRoleGroupName(), user); - if (filePlanAuthenticationService.getRmAdminUserName().equals(user) == false) + if (!filePlanAuthenticationService.getRmAdminUserName().equals(user)) { // Create the RM Admin User if it does not already exist createRMAdminUser(); @@ -485,7 +485,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, Set roleAuthorities = authorityService.getAllAuthoritiesInZone(getZoneName(rmRootNode), AuthorityType.GROUP); for (String roleAuthority : roleAuthorities) { - if (includeSystemRoles || isSystemRole(roleAuthority) == false) + if (includeSystemRoles || !isSystemRole(roleAuthority)) { String groupShortName = authorityService.getShortName(roleAuthority); String name = getShortRoleName(groupShortName, rmRootNode); @@ -531,7 +531,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, for (String roleAuthority : roleAuthorities) { Set users = authorityService.getContainedAuthorities(AuthorityType.USER, roleAuthority, false); - if (users.contains(user) && (includeSystemRoles || isSystemRole(roleAuthority) == false)) + if (users.contains(user) && (includeSystemRoles || !isSystemRole(roleAuthority))) { String groupShortName = authorityService.getShortName(roleAuthority); String name = getShortRoleName(groupShortName, rmRootNode); @@ -745,7 +745,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { public Role doWork() throws Exception { - if (existsRole(rmRootNode, role) == false) + if (!existsRole(rmRootNode, role)) { throw new AlfrescoRuntimeException("Unable to update role " + role + ", because it does not exist."); } @@ -868,7 +868,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, { public Void doWork() throws Exception { - if (getAllAssignedToRole(filePlan, role).contains(authorityName) == false) + if (!getAllAssignedToRole(filePlan, role).contains(authorityName)) { String roleAuthority = authorityService.getName(AuthorityType.GROUP, getFullRoleName(role, filePlan)); authorityService.addAuthority(roleAuthority, authorityName); @@ -918,7 +918,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService, String firstName = I18NUtil.getMessage(MSG_FIRST_NAME); String lastName = I18NUtil.getMessage(MSG_LAST_NAME); - if (authenticationService.authenticationExists(user) == false) + if (!authenticationService.authenticationExists(user)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java index b64abf5791..ead0db8c6d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AbstractRmWebScript.java @@ -111,7 +111,7 @@ public abstract class AbstractRmWebScript extends DeclarativeWebScript */ protected void checkMandatoryJsonParam(JSONObject json, String paramName) { - if (json.has(paramName) == false) + if (!json.has(paramName)) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Mandatory '" + paramName + "' parameter was not provided in request body"); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java index f3a3678d4c..603f6eff49 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyDodCertModelFixesGet.java @@ -162,7 +162,7 @@ public class ApplyDodCertModelFixesGet extends DeclarativeWebScript ContentReader reader = this.contentService.getReader(RM_CUSTOM_MODEL_NODE_REF, ContentModel.TYPE_CONTENT); - if (reader.exists() == false) {throw new AlfrescoRuntimeException("RM CustomModel has no content.");} + if (!reader.exists()) {throw new AlfrescoRuntimeException("RM CustomModel has no content.");} InputStream contentIn = null; M2Model deserializedModel = null; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java index 3940e4a7ab..e7bf384f53 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/ApplyFixMob1573Get.java @@ -98,7 +98,7 @@ public class ApplyFixMob1573Get extends DeclarativeWebScript ContentReader reader = this.contentService.getReader(RM_CUSTOM_MODEL_NODE_REF, ContentModel.TYPE_CONTENT); - if (reader.exists() == false) {throw new AlfrescoRuntimeException("RM CustomModel has no content.");} + if (!reader.exists()) {throw new AlfrescoRuntimeException("RM CustomModel has no content.");} InputStream contentIn = null; M2Model deserializedModel = null; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java index 5567c8e124..f540e88261 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java @@ -252,7 +252,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript String allRoleShortName = RMAuthority.ALL_ROLES_PREFIX + rmRoot.getId(); String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName); - if (authorityService.authorityExists(allRoleGroupName) == false) + if (!authorityService.authorityExists(allRoleGroupName)) { logger.info("Creating all roles group for root node: " + rmRoot.toString()); @@ -315,7 +315,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript permissionService.setInheritParentPermissions(recordFolder, false); } - if (nodeService.hasAspect(recordFolder, ASPECT_DISPOSITION_LIFECYCLE) == false) + if (!nodeService.hasAspect(recordFolder, ASPECT_DISPOSITION_LIFECYCLE)) { // See if the folder has a disposition schedule that needs to be applied DispositionSchedule ds = dispositionService.getDispositionSchedule(recordFolder); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java index 69c1eee04f..1c3911284f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionDelete.java @@ -37,7 +37,7 @@ import org.json.JSONException; /** * Implementation for Java backed webscript to remove RM custom property definitions * from the custom model. - * + * * @author Neil McErlean */ public class CustomPropertyDefinitionDelete extends AbstractRmWebScript @@ -45,7 +45,7 @@ public class CustomPropertyDefinitionDelete extends AbstractRmWebScript private static final String PROP_ID = "propId"; private static Log logger = LogFactory.getLog(CustomPropertyDefinitionDelete.class); - + private RecordsManagementAdminService rmAdminService; public void setRecordsManagementAdminService(RecordsManagementAdminService rmAdminService) @@ -70,40 +70,40 @@ public class CustomPropertyDefinitionDelete extends AbstractRmWebScript logger.debug(msg.toString()); } ftlModel = removePropertyDefinition(propQName); - } + } catch (JSONException je) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je); } - + return ftlModel; } - + private QName getPropertyFromReq(WebScriptRequest req) { Map templateVars = req.getServiceMatch().getTemplateVars(); String propIdString = templateVars.get(PROP_ID); - + QName propQName = this.rmAdminService.getQNameForClientId(propIdString); Map existingPropDefs = rmAdminService.getCustomPropertyDefinitions(); - if (existingPropDefs.containsKey(propQName) == false) + if (!existingPropDefs.containsKey(propQName)) { - throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, + throw new WebScriptException(HttpServletResponse.SC_NOT_FOUND, "Requested property definition (id:" + propIdString + ") does not exist"); } - + return propQName; } - + /** * Applies custom properties to the specified record node. */ protected Map removePropertyDefinition(QName propQName) throws JSONException { Map result = new HashMap(); - + rmAdminService.removeCustomPropertyDefinition(propQName); result.put("propertyqname", propQName.toPrefixString(namespaceService)); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java index d7a7eb05a0..e2c60c709e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java @@ -161,7 +161,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript break; } } - if (exists == false) + if (!exists) { QName constraintRefQName = QName.createQName(constraintRef, namespaceService); result = rmAdminService.setCustomPropertyDefinitionConstraint(propQName, constraintRefQName); @@ -179,7 +179,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript } catch (PropertyAlreadyExistsMetadataException ex) { - if (updated == false) + if (!updated) { String propIdAsString = rmAdminService.getQNameForClientId(label).toPrefixString(namespaceService); throw new PropertyAlreadyExistsMetadataException(propIdAsString); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java index 4ec827165c..0e8d5ade25 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionActionDefinitionPost.java @@ -40,7 +40,7 @@ import org.json.JSONTokener; /** * Implementation for Java backed webscript to create a new dispositon action definition. - * + * * @author Gavin Cornwell */ public class DispositionActionDefinitionPost extends DispositionAbstractBase @@ -55,14 +55,14 @@ public class DispositionActionDefinitionPost extends DispositionAbstractBase DispositionSchedule schedule = parseRequestForSchedule(req); // retrieve the rest of the post body and create the action - // definition + // definition JSONObject json = null; DispositionActionDefinition actionDef = null; try { json = new JSONObject(new JSONTokener(req.getContent().getContent())); actionDef = createActionDefinition(json, schedule); - } + } catch (IOException iox) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, @@ -73,16 +73,16 @@ public class DispositionActionDefinitionPost extends DispositionAbstractBase throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Could not parse JSON from req.", je); } - + // create model object with just the action data Map model = new HashMap(1); model.put("action", createActionDefModel(actionDef, req.getURL() + "/" + actionDef.getId())); return model; } - + /** * Creates a dispositionActionDefinition node in the repo. - * + * * @param json The JSON to use to create the action definition * @param schedule The DispositionSchedule the action is for * @return The DispositionActionDefinition representing the new action definition @@ -91,45 +91,45 @@ public class DispositionActionDefinitionPost extends DispositionAbstractBase DispositionSchedule schedule) throws JSONException { // extract the data from the JSON request - if (json.has("name") == false) + if (!json.has("name")) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Mandatory 'name' parameter was not provided in request body"); } - + // create the properties for the action definition Map props = new HashMap(8); String name = json.getString("name"); props.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, name); - + if (json.has("description")) { props.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, json.getString("description")); } - + if (json.has("period")) { props.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, json.getString("period")); } - + if (json.has("periodProperty")) { QName periodProperty = QName.createQName(json.getString("periodProperty"), this.namespaceService); props.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD_PROPERTY, periodProperty); } - + if (json.has("eligibleOnFirstCompleteEvent")) { - props.put(RecordsManagementModel.PROP_DISPOSITION_EVENT_COMBINATION, + props.put(RecordsManagementModel.PROP_DISPOSITION_EVENT_COMBINATION, json.getBoolean("eligibleOnFirstCompleteEvent") ? "or" : "and"); } - + if (json.has("location")) { - props.put(RecordsManagementModel.PROP_DISPOSITION_LOCATION, + props.put(RecordsManagementModel.PROP_DISPOSITION_LOCATION, json.getString("location")); } - + if (json.has("events")) { JSONArray events = json.getJSONArray("events"); @@ -140,7 +140,7 @@ public class DispositionActionDefinitionPost extends DispositionAbstractBase } props.put(RecordsManagementModel.PROP_DISPOSITION_EVENT, (Serializable)eventsList); } - + // add the action definition to the schedule return this.dispositionService.addDispositionActionDefinition(schedule, props); } 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 bac9e1f77e..b8d32979b2 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 @@ -160,7 +160,7 @@ public class RmActionPost extends DeclarativeWebScript boolean firstTime = true; for (NodeRef targetNodeRef : targetNodeRefs) { - if (nodeService.exists(targetNodeRef) == false) + if (!nodeService.exists(targetNodeRef)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "The targetNode does not exist (" + targetNodeRef.toString() + ")"); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java index 68055798c0..23ffdd89ec 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventDelete.java @@ -65,7 +65,7 @@ public class RmEventDelete extends DeclarativeWebScript } // Check the event exists - if (rmEventService.existsEvent(eventName) == false) + if (!rmEventService.existsEvent(eventName)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "The event " + eventName + " does not exist."); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java index a2292de8cb..6fcfc429e0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventGet.java @@ -63,7 +63,7 @@ public class RmEventGet extends DeclarativeWebScript } // Check the event exists - if (rmEventService.existsEvent(eventName) == false) + if (!rmEventService.existsEvent(eventName)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "The event " + eventName + " does not exist."); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java index a125979837..1d0edb340c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventPut.java @@ -79,7 +79,7 @@ public class RmEventPut extends RMEventBase String eventName = templateVars.get(PARAM_EVENTNAME); if (eventName == null || eventName.isEmpty() || - rmEventService.existsEvent(eventName) == false) + !rmEventService.existsEvent(eventName)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "No event name was provided."); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java index 4d5f7b2f0b..936e3b7004 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmEventsPost.java @@ -136,7 +136,7 @@ public class RmEventsPost extends RMEventBase { boolean canCreateEvent = true; - if (rmEventService.canCreateEvent(eventDisplayLabel, eventName) == false) + if (!rmEventService.canCreateEvent(eventDisplayLabel, eventName)) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Cannot create event. An event with the display label '" diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java index 85a53d9ff8..6c66bfec70 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleDelete.java @@ -58,7 +58,7 @@ public class RmRoleDelete extends RoleDeclarativeWebScript } // Check that the role exists - if (filePlanRoleService.existsRole(filePlan, roleParam) == false) + if (!filePlanRoleService.existsRole(filePlan, roleParam)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "The role " + roleParam + " does not exist on the records managment root " + filePlan.toString()); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java index 4d905915ba..cc0945d13e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRoleGet.java @@ -55,7 +55,7 @@ public class RmRoleGet extends RoleDeclarativeWebScript } // Check that the role exists - if (filePlanRoleService.existsRole(filePlan, roleParam) == false) + if (!filePlanRoleService.existsRole(filePlan, roleParam)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "The role " + roleParam + " does not exist on the records managment root " + filePlan); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java index 7c73cd1255..4deece600a 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RmRolePut.java @@ -88,7 +88,7 @@ public class RmRolePut extends RoleDeclarativeWebScript } // Check that the role exists - if (filePlanRoleService.existsRole(filePlan, roleParam) == false) + if (!filePlanRoleService.existsRole(filePlan, roleParam)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "The role " + roleParam + " does not exist on the records managment root " + filePlan); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java index 0c38847f94..b3fa59cdf4 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java @@ -97,9 +97,9 @@ public class RoleDeclarativeWebScript extends DeclarativeWebScript String storeId = templateVars.get("store_id"); String id = templateVars.get("id"); - if (StringUtils.isEmpty(storeType) == false && - StringUtils.isEmpty(storeId) == false && - StringUtils.isEmpty(id) == false) + if (!StringUtils.isEmpty(storeType) && + !StringUtils.isEmpty(storeId) && + !StringUtils.isEmpty(id)) { StoreRef storeRef = new StoreRef(storeType, storeId); NodeRef nodeRef = new NodeRef(storeRef, id); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java index a352f59744..a0484cfecd 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/capability/CapabilitiesGet.java @@ -149,7 +149,7 @@ public class CapabilitiesGet extends DeclarativeWebScript for (Map.Entry entry : map.entrySet()) { AccessStatus accessStatus = entry.getValue(); - if (AccessStatus.DENIED.equals(accessStatus) == false) + if (!AccessStatus.DENIED.equals(accessStatus)) { Capability capability = entry.getKey(); list.add(capability.getName()); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java index d5ac7e5832..f250cef249 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSavedSearchesPost.java @@ -110,7 +110,7 @@ public class RMSavedSearchesPost extends DeclarativeWebScript JSONObject json = new JSONObject(new JSONTokener(req.getContent().getContent())); // Get the details of the saved search - if (json.has("name") == false) + if (!json.has("name")) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Mandatory 'name' parameter was not provided in request body"); @@ -127,7 +127,7 @@ public class RMSavedSearchesPost extends DeclarativeWebScript isPublic = json.getBoolean("public"); } // NOTE: we do not need to worry about the query - if (json.has("params") == false) + if (!json.has("params")) { throw new WebScriptException(Status.STATUS_BAD_REQUEST, "Mandatory 'params' parameter was not provided in request body"); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java index a097e393c1..3c28ac8b20 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java @@ -331,7 +331,7 @@ public class RMSearchGet extends DeclarativeWebScript for (Map.Entry entry : nodeProperties.entrySet()) { QName qName = entry.getKey().getPrefixedQName(namespaceService); - if (NamespaceService.SYSTEM_MODEL_1_0_URI.equals(qName.getNamespaceURI()) == false) + if (!NamespaceService.SYSTEM_MODEL_1_0_URI.equals(qName.getNamespaceURI())) { String prefixName = qName.getPrefixString().replace(":", "_"); Serializable value = entry.getValue(); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java index 23eed25666..fe1b0465cb 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java @@ -121,7 +121,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear JSONObject report = jsonArray.getJSONObject(i); // Get the name - if (report.has(SavedSearchDetails.NAME) == false) + if (!report.has(SavedSearchDetails.NAME)) { throw new AlfrescoRuntimeException("Unable to load report details because name has not been specified. \n" + reportsJSON); } @@ -133,7 +133,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear } // Get the query - if (report.has(SavedSearchDetails.SEARCH) == false) + if (!report.has(SavedSearchDetails.SEARCH)) { throw new AlfrescoRuntimeException("Unable to load report details because search has not been specified for report " + name + ". \n" + reportsJSON); } @@ -224,7 +224,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear if (searchParameters.isIncludeRecords()) { appendAspect(aspectQuery, "rma:record"); - if (searchParameters.isIncludeUndeclaredRecords() == false) + if (!searchParameters.isIncludeUndeclaredRecords()) { appendAspect(aspectQuery, "rma:declaredRecord"); } @@ -478,7 +478,7 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear } // Get the private container for the current user - if (savedSearchDetails.isPublic() == false) + if (!savedSearchDetails.isPublic()) { final String userName = AuthenticationUtil.getFullyAuthenticatedUser(); NodeRef userContainer = fileFolderService.searchSimple(container, userName); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java index 62fe7b2d0b..a9184d97a0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/SavedSearchDetails.java @@ -133,7 +133,7 @@ public class SavedSearchDetails extends ReportDetails } // Get the name - if (search.has(NAME) == false) + if (!search.has(NAME)) { throw new AlfrescoRuntimeException("Can not create saved search details from json, because required name is not present. " + jsonString); } @@ -153,7 +153,7 @@ public class SavedSearchDetails extends ReportDetails // Get the query String query = null; - if (search.has(SEARCH) == false) + if (!search.has(SEARCH)) { // We are probably dealing with a "old" style saved search if (search.has(PARAMS)) 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 7d01c36e0e..ff8e425899 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 @@ -135,7 +135,7 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut { // check group to see if the user is contained Set contained = getAuthorityService().getContainedAuthorities(AuthorityType.USER, authority, false); - if (contained.isEmpty() == false && + if (!contained.isEmpty() && contained.contains(userName)) { result = true; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java index dd93dfed40..b4801182de 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityServiceImpl.java @@ -155,7 +155,7 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("applyToParents", applyToParents); // add the aspect if missing - if (nodeService.hasAspect(nodeRef, ASPECT_EXTENDED_SECURITY) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_EXTENDED_SECURITY)) { nodeService.addAspect(nodeRef, ASPECT_EXTENDED_SECURITY, null); } @@ -238,8 +238,8 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl for (String authority : authorities) { - if ((authority.equals(PermissionService.ALL_AUTHORITIES) == false && authority.equals(PermissionService.OWNER_AUTHORITY) == false) && - (referenceCountMap == null || referenceCountMap.containsKey(authority) == false)) + if ((!authority.equals(PermissionService.ALL_AUTHORITIES) && !authority.equals(PermissionService.OWNER_AUTHORITY)) && + (referenceCountMap == null || !referenceCountMap.containsKey(authority))) { // add the authority to the role filePlanRoleService.assignRoleToAuthority(filePlan, roleName, authority); @@ -267,7 +267,7 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl for (String key : keys) { - if (key.equals(PermissionService.ALL_AUTHORITIES) == false) + if (!key.equals(PermissionService.ALL_AUTHORITIES)) { if (map.containsKey(key)) { @@ -369,7 +369,7 @@ public class ExtendedSecurityServiceImpl extends ServiceBaseImpl // remove the keys for (String key : keys) { - if (key.equals(PermissionService.ALL_AUTHORITIES) == false) + if (!key.equals(PermissionService.ALL_AUTHORITIES)) { Integer count = map.get(key); if (count != null) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java index 294ad47179..d2ababc027 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/FilePlanPermissionServiceImpl.java @@ -159,7 +159,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl ParameterCheck.mandatory("recordCategory", recordCategory); // assert that we have a record category in our hands - if (instanceOf(recordCategory, TYPE_RECORD_CATEGORY) == false) + if (!instanceOf(recordCategory, TYPE_RECORD_CATEGORY)) { throw new AlfrescoRuntimeException("Unable to setup record category permissions, because node is not a record category."); } @@ -181,7 +181,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl Set perms = permissionService.getAllSetPermissions(parentNodeRef); for (AccessPermission perm : perms) { - if (fillingOnly == false || + if (!fillingOnly || RMPermissionModel.FILING.equals(perm.getPermission())) { AccessStatus accessStatus = perm.getAccessStatus(); @@ -225,8 +225,8 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl Set perms = permissionService.getAllSetPermissions(catNodeRef); for (AccessPermission perm : perms) { - if (ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) == false && - ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority()) == false) + if (!ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) && + !ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority())) { AccessStatus accessStatus = perm.getAccessStatus(); boolean allow = false; @@ -293,8 +293,8 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl Set perms = permissionService.getAllSetPermissions(parent); for (AccessPermission perm : perms) { - if (ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) == false && - ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority()) == false) + if (!ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) && + !ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority())) { AccessStatus accessStatus = perm.getAccessStatus(); boolean allow = false; @@ -331,8 +331,8 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl Set perms = permissionService.getAllSetPermissions(parent); for (AccessPermission perm : perms) { - if (ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) == false && - ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority()) == false) + if (!ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) && + !ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority())) { AccessStatus accessStatus = perm.getAccessStatus(); boolean allow = false; @@ -372,12 +372,12 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl Set origionalRecordPerms= permissionService.getAllSetPermissions(record); for (AccessPermission perm : origionalRecordPerms) { - if (ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) == false && - ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority()) == false) + if (!ExtendedReaderDynamicAuthority.EXTENDED_READER.equals(perm.getAuthority()) && + !ExtendedWriterDynamicAuthority.EXTENDED_WRITER.equals(perm.getAuthority())) { if ((perm.getPermission().equals(RMPermissionModel.FILING) || perm.getPermission().equals(RMPermissionModel.FILE_RECORDS)) && - origionalParentPerms.contains(perm) == false) + !origionalParentPerms.contains(perm)) { // then we can assume this is a permission we want to preserve keepPerms.add(perm); @@ -508,7 +508,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl private void setPermissionDown(NodeRef nodeRef, String authority, String permission) { // skip out node's that inherit (for example hold and transfer) - if (permissionService.getInheritParentPermissions(nodeRef) == false) + if (!permissionService.getInheritParentPermissions(nodeRef)) { // set permissions setPermissionImpl(nodeRef, authority, permission); @@ -561,7 +561,7 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl public Boolean doWork() throws Exception { // can't delete permissions if inherited (eg hold and transfer containers) - if (permissionService.getInheritParentPermissions(nodeRef) == false) + if (!permissionService.getInheritParentPermissions(nodeRef)) { // Delete permission on this node permissionService.deletePermission(nodeRef, authority, permission); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java index 1881b5e2d4..c69118222c 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RMMethodSecurityPostProcessor.java @@ -124,7 +124,7 @@ public class RMMethodSecurityPostProcessor implements BeanFactoryPostProcessor String[] split = ((String)key).split("\\."); int index = split.length - 2; String securityBeanName = split[index] + SECURITY_BEAN_POSTFIX; - if (securityBeanNameCache.contains(securityBeanName) == false && beanFactory.containsBean(securityBeanName)) + if (!securityBeanNameCache.contains(securityBeanName) && beanFactory.containsBean(securityBeanName)) { if (logger.isDebugEnabled()) { diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java index caa0cdc5e4..c21648df45 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java @@ -149,7 +149,7 @@ public class ServiceBaseImpl implements RecordsManagementModel protected int getNextCount(NodeRef nodeRef) { int counter = 0; - if (nodeService.hasAspect(nodeRef, ASPECT_COUNTABLE) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_COUNTABLE)) { PropertyMap props = new PropertyMap(1); props.put(PROP_COUNT, 1); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java index 833fba1e76..1d7d97d606 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java @@ -96,7 +96,7 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra NodeRef nextChild = nextAssoc.getChildRef(); if (filePlanService.isFilePlanComponent(nextChild) && - freezeService.isFrozen(nextChild) == false) + !freezeService.isFrozen(nextChild)) { // If the child is a record, then the VitalRecord aspect needs to be applied or updated if (recordService.isRecord(nextChild)) @@ -124,7 +124,7 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra } // Recurse down the containment hierarchy to all containers - if (recordService.isRecord(nextChild) == false) + if (!recordService.isRecord(nextChild)) { this.propagateChangeToChildrenOf(nextChild); } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java index 947f15fae6..f0b55ce70d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/VitalRecordServiceImpl.java @@ -79,7 +79,7 @@ public class VitalRecordServiceImpl extends ServiceBaseImpl Map reviewProps = new HashMap(1); reviewProps.put(RecordsManagementModel.PROP_REVIEW_AS_OF, reviewAsOf); - if (nodeService.hasAspect(nodeRef, ASPECT_VITAL_RECORD) == false) + if (!nodeService.hasAspect(nodeRef, ASPECT_VITAL_RECORD)) { nodeService.addAspect(nodeRef, RecordsManagementModel.ASPECT_VITAL_RECORD, reviewProps); } diff --git a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java index 1d8dc3c458..025e3f92ff 100644 --- a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java +++ b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java @@ -75,7 +75,7 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame // strip the processor name from the value value = stripName(value); - if (value.isEmpty() == false) + if (!value.isEmpty()) { String[] values = value.split("\\.", 2); String field = values[0].trim(); diff --git a/rm-server/source/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java index 9e954ed2ec..f3b4cd6ca4 100644 --- a/rm-server/source/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java +++ b/rm-server/source/java/org/alfresco/repo/action/parameter/MessageParameterProcessor.java @@ -24,7 +24,7 @@ import org.springframework.extensions.surf.util.I18NUtil; /** * Message parameter processor. - * + * * @author Roy Wetherall * @since 2.1 */ @@ -38,10 +38,10 @@ public class MessageParameterProcessor extends ParameterProcessor { // the default position is to return the value un-changed String result = value; - + // strip the processor name from the value - value = stripName(value); - if (value.isEmpty() == false) + value = stripName(value); + if (!value.isEmpty()) { result = I18NUtil.getMessage(value); if (result == null) @@ -49,7 +49,7 @@ public class MessageParameterProcessor extends ParameterProcessor throw new AlfrescoRuntimeException("The message parameter processor could not resolve the message for the id " + value); } } - + return result; } } 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 9deda1f1ab..0b4ebe55bd 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 @@ -119,7 +119,7 @@ public class NodeParameterProcessor extends ParameterProcessor implements Parame // strip the processor name from the value value = stripName(value); - if (value.isEmpty() == false) + if (!value.isEmpty()) { QName qname = QName.createQName(value, namespaceService); diff --git a/rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java b/rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java index f739d84d25..d14065e3e5 100644 --- a/rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java +++ b/rm-server/source/java/org/alfresco/repo/action/parameter/ParameterProcessorComponent.java @@ -151,7 +151,7 @@ public class ParameterProcessorComponent implements ParameterSubstitutionSuggest { ParameterProcessor result = null; - if (value != null && value.isEmpty() == false) + if (value != null && !value.isEmpty()) { String[] values = value.split("\\.", 2); if (values.length != 0) diff --git a/rm-server/source/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java b/rm-server/source/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java index 2e2e6fb847..daffe5986c 100644 --- a/rm-server/source/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java +++ b/rm-server/source/java/org/alfresco/repo/policy/annotation/AnnotatedBehaviourPostProcessor.java @@ -131,14 +131,14 @@ public class AnnotatedBehaviourPostProcessor implements BeanPostProcessor // assert that the policy and type have been set!! ParameterCheck.mandatory("policy", policy); - if (behaviour.isService() == false) + if (!behaviour.isService()) { ParameterCheck.mandatory("type", type); } if (logger.isDebugEnabled()) { - if (behaviour.isService() == false) + if (!behaviour.isService()) { logger.debug(" ... binding " + behaviour.kind() + " behaviour for " + beanName + "." + method.getName() + " for policy " + policy.toString() + @@ -155,7 +155,7 @@ public class AnnotatedBehaviourPostProcessor implements BeanPostProcessor JavaBehaviour javaBehaviour = new JavaBehaviour(bean, method.getName(), behaviour.notificationFrequency()); // determine whether we should register the behaviour - if (bean instanceof BehaviourRegistry && behaviour.name().isEmpty() == false) + if (bean instanceof BehaviourRegistry && !behaviour.name().isEmpty()) { if (logger.isDebugEnabled()) { @@ -168,7 +168,7 @@ public class AnnotatedBehaviourPostProcessor implements BeanPostProcessor // deal with class behaviours if (BehaviourKind.CLASS.equals(behaviour.kind())) { - if (behaviour.isService() == false) + if (!behaviour.isService()) { // bind class behaviour for given type policyComponent.bindClassBehaviour(policy, type, javaBehaviour); @@ -182,7 +182,7 @@ public class AnnotatedBehaviourPostProcessor implements BeanPostProcessor // deal with association behaviours else if (BehaviourKind.ASSOCIATION.equals(behaviour.kind())) { - if (behaviour.isService() == false) + if (!behaviour.isService()) { // bind association behaviour for given type and assoc type policyComponent.bindAssociationBehaviour(policy, @@ -229,7 +229,7 @@ public class AnnotatedBehaviourPostProcessor implements BeanPostProcessor private QName resolveType(BehaviourBean behaviourBean, Behaviour behaviour) { QName type = null; - if (behaviour.isService() == false) + if (!behaviour.isService()) { if (behaviour.type().isEmpty()) { diff --git a/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java b/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java index 49d8c7e47a..d1f7333210 100644 --- a/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java +++ b/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java @@ -166,7 +166,7 @@ public class ExtendedRuleServiceImpl extends RuleServiceImpl isFilePlanComponentRule(rule)) { // ignore and - if (isIgnoredType(typeQName) == false) + if (!isIgnoredType(typeQName)) { if (runAsRmAdmin) { diff --git a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java index 762c4569fe..8a55692d24 100644 --- a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java +++ b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java @@ -110,7 +110,7 @@ public class RmClassesGet extends DictionaryWebServiceBase implements RecordsMan } //validate classfilter - if (isValidClassFilter(classFilter) == false) + if (!isValidClassFilter(classFilter)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the classfilter - " + classFilter + " provided in the URL"); } @@ -128,7 +128,7 @@ public class RmClassesGet extends DictionaryWebServiceBase implements RecordsMan if (name != null) { className = namespacePrefix + "_" + name; - if (isValidClassname(className) == false) + if (!isValidClassname(className)) { throw new WebScriptException(Status.STATUS_NOT_FOUND, "Check the name - " + name + "parameter in the URL"); } diff --git a/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java index 5f719f51b6..2075b9973c 100644 --- a/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java +++ b/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java @@ -237,9 +237,9 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript String storeId = templateVars.get("store_id"); String id = templateVars.get("id"); - if (StringUtils.isEmpty(storeType) == false && - StringUtils.isEmpty(storeId) == false && - StringUtils.isEmpty(id) == false) + if (!StringUtils.isEmpty(storeType) && + !StringUtils.isEmpty(storeId) && + !StringUtils.isEmpty(id)) { StoreRef storeRef = new StoreRef(storeType, storeId); NodeRef nodeRef = new NodeRef(storeRef, id); diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java index 1715b067d7..9826116fc4 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java @@ -146,11 +146,11 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase for (Capability capability : capabilities) { if (capability instanceof DeclarativeCapability && - capability instanceof DeclarativeCompositeCapability == false && - capability.isPrivate() == false && - capability.getName().equals("MoveRecords") == false && - capability.getName().equals("DeleteLinks") == false && - capability.getName().equals("ChangeOrDeleteReferences") == false) + !(capability instanceof DeclarativeCompositeCapability) && + !capability.isPrivate() && + !capability.getName().equals("MoveRecords") && + !capability.getName().equals("DeleteLinks") && + !capability.getName().equals("ChangeOrDeleteReferences")) { testDeclarativeCapability((DeclarativeCapability)capability); } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java index 0b58483d52..3e79151958 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java @@ -181,7 +181,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase private void doCheckFolder(NodeRef container, String dispositionInstructions, boolean isRecordLevel) { doCheck(container, dispositionInstructions, isRecordLevel); - if (isRecordLevel == false) + if (!isRecordLevel) { assertNotNull(dispositionService.getNextDispositionAction(container)); } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java index 318ecefdc7..ec0bcabe43 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java @@ -578,7 +578,7 @@ public class RMCaveatConfigServiceImplTest extends BaseSpringTest implements DOD if (parentGroupShortName != null) { String parentGroupFullName = authorityService.getName(AuthorityType.GROUP, parentGroupShortName); - if (authorityService.authorityExists(parentGroupFullName) == false) + if (!authorityService.authorityExists(parentGroupFullName)) { authorityService.createAuthority(AuthorityType.GROUP, groupShortName, groupShortName, null); authorityService.addAuthority(parentGroupFullName, groupShortName); diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java index acba5df002..bad3d05838 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java @@ -108,8 +108,8 @@ public class RecordServiceImplTest extends BaseRMTestCase */ private List getAspectList() { - QName[] aspects = new QName[] - { + QName[] aspects = new QName[] + { ASPECT_RECORD_META_DATA }; @@ -795,7 +795,7 @@ public class RecordServiceImplTest extends BaseRMTestCase } // assert fail not failure - if (failure == false) + if (!failure) { fail("Property should not have been editable."); } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java index 207df69f5e..fa4fda3b0f 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java @@ -518,7 +518,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase protected void setupTestDataImpl() { AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO"); - if (authDao.authorityExists(AuthenticationUtil.getSystemUserName()) == false) + if (!authDao.authorityExists(AuthenticationUtil.getSystemUserName())) { createPerson(AuthenticationUtil.getSystemUserName(), false); } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java index 69d2175502..7a496c223a 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java @@ -341,7 +341,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest protected void createUser(String userName) { - if (authenticationService.authenticationExists(userName) == false) + if (!authenticationService.authenticationExists(userName)) { authenticationService.createAuthentication(userName, "PWD".toCharArray()); @@ -367,7 +367,7 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest protected void createGroup(String groupName) { - if (authorityService.authorityExists(groupName) == false) + if (!authorityService.authorityExists(groupName)) { authorityService.createAuthority(AuthorityType.GROUP, groupName); } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java index 7667660d0e..e8c24fc941 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java @@ -178,7 +178,7 @@ public class CommonRMTestUtils implements RecordsManagementModel { properties = new HashMap(1); } - if (properties.containsKey(ContentModel.PROP_NAME) == false) + if (!properties.containsKey(ContentModel.PROP_NAME)) { properties.put(ContentModel.PROP_NAME, name); } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java index a47e735403..c23c9f3954 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java @@ -27,20 +27,20 @@ public class TestAction extends RMActionExecuterAbstractBase public static final String NAME = "testAction"; public static final String PARAM = "testActionParam"; public static final String PARAM_VALUE = "value"; - + @Override protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { - if (action.getParameterValue(PARAM).equals(PARAM_VALUE) == false) + if (!action.getParameterValue(PARAM).equals(PARAM_VALUE)) { throw new RuntimeException("Unexpected parameter value. Expected " + PARAM_VALUE + " actual " + action.getParameterValue(PARAM)); } this.nodeService.addAspect(actionedUponNodeRef, ASPECT_RECORD, null); - } - + } + @Override public boolean isDispositionAction() { return true; - } + } } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java index 4ae2342ce3..e3e02c9499 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java @@ -27,14 +27,14 @@ public class TestActionParams extends RMActionExecuterAbstractBase { public static final String NAME = "testActionParams"; public static final String PARAM_DATE = "paramDate"; - + @Override protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { Object dateValue = action.getParameterValue(PARAM_DATE); - if ((dateValue instanceof java.util.Date) == false) + if (!(dateValue instanceof java.util.Date)) { throw new AlfrescoRuntimeException("Param was not a Date as expected."); } - } + } } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java index 55d0d57c81..38b9e4dc3f 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java @@ -94,7 +94,7 @@ public class TestActionPropertySubs extends RMActionExecuterAbstractBase private void assertEquals(String expected, String actual) { - if (expected.equals(actual) == false) + if (!expected.equals(actual)) { throw new AlfrescoRuntimeException("Expected value " + expected + " does not match actual value " + actual); }