From 723183021addd441ca6f72aad621dec3c1eef76c Mon Sep 17 00:00:00 2001 From: cagache Date: Mon, 1 Jul 2019 16:34:24 +0300 Subject: [PATCH] Removed redundant conditional expression --- .../audit/RecordsManagementAuditServiceImpl.java | 2 +- .../model/rma/type/RecordCategoryType.java | 2 +- .../script/CustomPropertyDefinitionPut.java | 2 +- .../org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java | 4 ++-- .../legacy/service/CustomEMailMappingServiceImplTest.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index ee746ec0d8..4321ac0c09 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -1072,7 +1072,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean NodeRef nodeRef = params.getNodeRef(); int maxEntries = params.getMaxEntries(); // Reverse order if the results are limited - boolean forward = maxEntries > 0 ? false : true; + boolean forward = maxEntries <= 0; // start the audit trail report writeAuditTrailHeader(writer, params, reportFormat); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java index 76cfcdb3b7..7e27bb01d7 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordCategoryType.java @@ -226,7 +226,7 @@ public class RecordCategoryType extends BaseBehaviourBean @Override public boolean getMustCopy(QName classQName, CopyDetails copyDetails) { - return nodeService.getType(copyDetails.getTargetParentNodeRef()).equals(TYPE_RECORD_FOLDER) ? false : true; + return !nodeService.getType(copyDetails.getTargetParentNodeRef()).equals(TYPE_RECORD_FOLDER); } }; } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java index a8f5b4b779..f490951e4c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java @@ -161,7 +161,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript if (constraintRef == null) { result = rmAdminService.removeCustomPropertyDefinitionConstraints(propQName); - updated = constraints.isEmpty() ? false : true; + updated = !constraints.isEmpty(); } else { diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java index 60bab513dd..45f64bbe2e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/ApiNodesModelFactory.java @@ -533,7 +533,7 @@ public class ApiNodesModelFactory if (includeParam.contains(RMNode.PARAM_HAS_RETENTION_SCHEDULE)) { DispositionSchedule ds = dispositionService.getDispositionSchedule(info.getNodeRef()); - recordCategoryChild.setHasRetentionSchedule(ds !=null ? true : false); + recordCategoryChild.setHasRetentionSchedule(ds != null); } if((!isMinimalInfo && propertyFilter.isAllowed(RMNode.PARAM_IS_CLOSED)) || (isMinimalInfo && includeParam.contains(RMNode.PARAM_IS_CLOSED))) { @@ -673,7 +673,7 @@ public class ApiNodesModelFactory if (parameters.getInclude().contains(RMNode.PARAM_HAS_RETENTION_SCHEDULE)) { DispositionSchedule ds = dispositionService.getDispositionSchedule(info.getNodeRef()); - recordCategory.setHasRetentionSchedule(ds !=null ? true : false); + recordCategory.setHasRetentionSchedule(ds != null); } return recordCategory; diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java index d3a38e502f..19f4892cc9 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java @@ -145,11 +145,11 @@ public class CustomEMailMappingServiceImplTest extends BaseRMTestCase private boolean checkCustomMappingsSize(int expected) { - return expected == eMailMappingService.getCustomMappings().size() ? true : false; + return expected == eMailMappingService.getCustomMappings().size(); } private boolean checkEmailMappingKeysSize(int expected) { - return expected == eMailMappingService.getEmailMappingKeys().size() ? true : false; + return expected == eMailMappingService.getEmailMappingKeys().size(); } }