From d645c19e37d03248e6c5bb9651a5594accc468eb Mon Sep 17 00:00:00 2001 From: cagache Date: Mon, 1 Jul 2019 16:19:52 +0300 Subject: [PATCH] Removed unnecessary semicolon --- .../caveat/RMListOfValuesConstraint.java | 2 +- .../DispositionActionRelativePositions.java | 2 +- .../audit/RecordsManagementAuditServiceImpl.java | 2 +- .../fileplan/FilePlanComponentKind.java | 2 +- .../relationship/RelationshipType.java | 2 +- .../script/TransferReportGet.java | 2 +- .../script/TransferReportPost.java | 2 +- .../util/UpdateActionType.java | 2 +- .../record/InplaceRecordPermissionTest.java | 4 ---- .../test/integration/record/MoveRecordTest.java | 2 +- .../test/legacy/action/CreateRecordActionTest.java | 2 +- .../action/RecordableVersionConfigActionTest.java | 6 +++--- .../legacy/service/DispositionServiceImplTest.java | 4 ++-- .../service/ExtendedSecurityServiceImplTest.java | 2 +- .../RecordsManagementAdminServiceImplTest.java | 2 +- .../content/EagerContentStoreCleanerUnitTest.java | 2 +- .../cleanser/ContentCleanser522022MUnitTest.java | 2 +- .../impl/ExtendedPermissionServiceImplUnitTest.java | 12 +++++++----- 18 files changed, 26 insertions(+), 28 deletions(-) diff --git a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java index d183e79528..a3e03633d8 100644 --- a/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java +++ b/rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java @@ -64,7 +64,7 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint // closed marking - all values must match AND, // open marking - at least one value must match - OR; + OR } // note: alternative to static init could be to use 'registered' constraint diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java index 37c9793115..6efa240d1e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/evaluator/DispositionActionRelativePositions.java @@ -35,5 +35,5 @@ package org.alfresco.module.org_alfresco_module_rm.action.evaluator; */ public enum DispositionActionRelativePositions { - ANY, NEXT, PREVIOUS; + ANY, NEXT, PREVIOUS } 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 58f8b92a4b..ee746ec0d8 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 @@ -796,7 +796,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean format == ReportFormat.HTML ? AUDIT_TRAIL_HTML_FILE_SUFFIX : AUDIT_TRAIL_JSON_FILE_SUFFIX); try (FileOutputStream fileOutputStream = new FileOutputStream(auditTrailFile); - Writer fileWriter = new BufferedWriter(new OutputStreamWriter(fileOutputStream,"UTF8"));) + Writer fileWriter = new BufferedWriter(new OutputStreamWriter(fileOutputStream,"UTF8"))) { // Get the results, dumping to file getAuditTrailImpl(params, null, fileWriter, format); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java index a4d3fe75da..70a7b4bdc9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java @@ -51,5 +51,5 @@ public enum FilePlanComponentKind HOLD_CONTAINER, DISPOSITION_SCHEDULE, UNFILED_RECORD_CONTAINER, - UNFILED_RECORD_FOLDER; + UNFILED_RECORD_FOLDER } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java index df7d19cfe2..3b13f4aeab 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/relationship/RelationshipType.java @@ -39,5 +39,5 @@ import org.alfresco.api.AlfrescoPublicApi; public enum RelationshipType { BIDIRECTIONAL, - PARENTCHILD; + PARENTCHILD } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java index 8d3d1430c2..95dff43602 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportGet.java @@ -129,7 +129,7 @@ public class TransferReportGet extends BaseTransferWebScript // create the writer try (FileOutputStream fileOutputStream = new FileOutputStream(report); - Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"));) + Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"))) { // get all 'transferred' nodes NodeRef[] itemsToTransfer = getTransferNodes(transferNode); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java index 36b18dddf4..fe2fc9fdcb 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/TransferReportPost.java @@ -237,7 +237,7 @@ public class TransferReportPost extends BaseTransferWebScript // create the writer try (FileOutputStream fileOutputStream = new FileOutputStream(report) ; - Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"));) + Writer writer = new OutputStreamWriter(fileOutputStream, Charset.forName("UTF-8"))) { // get all 'transferred' nodes NodeRef[] itemsToTransfer = getTransferNodes(transferNode); diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java index a156966506..d05cc8107c 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/UpdateActionType.java @@ -38,5 +38,5 @@ import org.alfresco.api.AlfrescoPublicApi; public enum UpdateActionType { ADD, - REMOVE; + REMOVE } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java index 8563786312..6f7b33ba02 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/InplaceRecordPermissionTest.java @@ -704,7 +704,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase AccessStatus.DENIED, // view record capability AccessStatus.DENIED, // edit non record metadata capability AccessStatus.DENIED)); // edit record metadata capability - ; } /** @@ -772,7 +771,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase AccessStatus.DENIED, // view record capability AccessStatus.DENIED, // edit non record metadata capability AccessStatus.DENIED)); // edit record metadata capability - ; } /** @@ -902,7 +900,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase AccessStatus.DENIED, // view record capability AccessStatus.DENIED, // edit non record metadata capability AccessStatus.DENIED)); // edit record metadata capability - ; } /** @@ -932,7 +929,6 @@ public class InplaceRecordPermissionTest extends BaseRMTestCase .expect(3) .from(() -> authorityService.getContainedAuthorities(null, "GROUP_INPLACE_RECORD_MANAGEMENT", true).size()) .because("The read and write groups are reused."); - ; } /** diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java index 3a464f68dc..5ac543fbeb 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/MoveRecordTest.java @@ -80,7 +80,7 @@ public class MoveRecordTest extends BaseRMTestCase sourceCategory = filePlanService.createRecordCategory(filePlan, GUID.generate()); utils.createBasicDispositionSchedule(sourceCategory, GUID.generate(), GUID.generate(), true, true); sourceRecordFolder = recordFolderService.createRecordFolder(sourceCategory, GUID.generate()); - destinationCategory = filePlanService.createRecordCategory(filePlan, GUID.generate());; + destinationCategory = filePlanService.createRecordCategory(filePlan, GUID.generate()); destinationRecordFolder = recordFolderService.createRecordFolder(destinationCategory, GUID.generate()); // create record diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java index 0afe5d76f5..85426f92f9 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java @@ -75,7 +75,7 @@ public class CreateRecordActionTest extends BaseRMTestCase assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(dmDocument, RMPermissionModel.READ_RECORDS)); assertEquals(AccessStatus.ALLOWED, permissionService.hasPermission(filePlan, RMPermissionModel.VIEW_RECORDS)); - }; + } }, dmCollaborator); } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java index 17d58c17cd..20c7dbfa07 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RecordableVersionConfigActionTest.java @@ -104,7 +104,7 @@ public class RecordableVersionConfigActionTest extends BaseRMTestCase public void test(Void result) throws Exception { assertNull(nodeService.getProperty(dmFolder, PROP_RECORDABLE_VERSION_POLICY)); - }; + } }, dmCollaborator); @@ -122,7 +122,7 @@ public class RecordableVersionConfigActionTest extends BaseRMTestCase public void test(Void result) throws Exception { assertNull(nodeService.getProperty(document2, PROP_RECORDABLE_VERSION_POLICY)); - }; + } }, dmCollaborator); @@ -145,7 +145,7 @@ public class RecordableVersionConfigActionTest extends BaseRMTestCase public void test(Void result) throws Exception { assertNull(nodeService.getProperty(document3, PROP_RECORDABLE_VERSION_POLICY)); - }; + } }, dmCollaborator); } diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java index 115a0e31f4..9768755ede 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java @@ -622,7 +622,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase checkDisposableItemUnchanged(mhRecordFolder42); checkDisposableItemUnchanged(record43); checkDisposableItemUnchanged(mhRecordFolder44); - checkDisposableItemUnchanged(record45);; + checkDisposableItemUnchanged(record45); } }); @@ -644,7 +644,7 @@ public class DispositionServiceImplTest extends BaseRMTestCase checkDisposableItemChanged(mhRecordFolder42); checkDisposableItemUnchanged(record43); checkDisposableItemUnchanged(mhRecordFolder44); - checkDisposableItemUnchanged(record45);; + checkDisposableItemUnchanged(record45); } }); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java index 1cc47bddd5..403ef9c56f 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java @@ -135,7 +135,7 @@ public class ExtendedSecurityServiceImplTest extends BaseRMTestCase doTestInTransaction(new Test() { - Set extendedReaders = new HashSet<>(2);; + Set extendedReaders = new HashSet<>(2); public Void run() throws Exception { diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java index e7ba8ce948..698b5aa871 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java @@ -599,7 +599,7 @@ public class RecordsManagementAdminServiceImplTest extends BaseRMTestCase RelationshipDefinition relationshipDefinition = relationshipService.createRelationshipDefinition(displayName); // Get the qualified name - QName qNameResult = QName.createQName(RM_CUSTOM_PREFIX, relationshipDefinition.getUniqueName(), namespaceService);; + QName qNameResult = QName.createQName(RM_CUSTOM_PREFIX, relationshipDefinition.getUniqueName(), namespaceService); System.out.println("Creating new " + refType + " reference definition: " + qNameResult); System.out.println(" params- label: '" + label + "' source: '" + source + "' target: '" + target + "'"); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java index 051e0fcb6a..40a91b8170 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/EagerContentStoreCleanerUnitTest.java @@ -57,7 +57,7 @@ public class EagerContentStoreCleanerUnitTest extends BaseUnitTest @InjectMocks private EagerContentStoreCleaner eagerContentStoreCleaner = new EagerContentStoreCleaner() { /** dummy implementation */ - public boolean registerOrphanedContentUrl(String contentUrl, boolean force) {return true;}; + public boolean registerOrphanedContentUrl(String contentUrl, boolean force) {return true;} }; @Mock private ContentCleanser mockedContentCleanser; diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java index 5489d77fc2..db98760b2a 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/content/cleanser/ContentCleanser522022MUnitTest.java @@ -51,7 +51,7 @@ public class ContentCleanser522022MUnitTest extends BaseUnitTest @InjectMocks @Spy private ContentCleanser522022M contentCleanser522022M = new ContentCleanser522022M() { /** dummy implementations */ - protected void overwrite(File file, OverwriteOperation overwriteOperation) {}; + protected void overwrite(File file, OverwriteOperation overwriteOperation) {} }; @Mock private File mockedFile; diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java index 58035626a8..a10a6637cc 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/repo/security/permissions/impl/ExtendedPermissionServiceImplUnitTest.java @@ -73,15 +73,17 @@ public class ExtendedPermissionServiceImplUnitTest extends BaseUnitTest /** permission service impl, default */ private @InjectMocks @Spy ExtendedPermissionServiceImpl extendedPermissionServiceImpl = new ExtendedPermissionServiceImpl() { - protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; }; - }; + protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; } + }; /** permission service impl instance extended for reader/writer tests */ private @InjectMocks ExtendedPermissionServiceImpl extendedPermissionServiceImplWithReaderWritersSet = new ExtendedPermissionServiceImpl() { - protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; }; - public java.util.Set getReaders(Long aclId) { return READERS; }; - public java.util.Set getWriters(Long aclId) { return WRITERS; }; + protected AccessStatus hasPermissionImpl(NodeRef nodeRef, String perm) { return AccessStatus.UNDETERMINED; } + + public java.util.Set getReaders(Long aclId) { return READERS; } + + public java.util.Set getWriters(Long aclId) { return WRITERS; } }; /** mocks */