From a495c73d578e85aaf5bd034980ec091d2fa97f5c Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Mon, 14 Dec 2015 22:09:52 +0000 Subject: [PATCH 1/2] RM-2194: Review feedback git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@120140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org_alfresco_module_rm/alfresco-global.properties | 4 ++-- .../version/ExtendedVersionableAspect.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties index ede402b625..627a3feef5 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties @@ -73,7 +73,7 @@ rm.completerecord.mandatorypropertiescheck.enabled=true rm.patch.v22.convertToStandardFilePlan=false # -# Extended auto-version behaviour. If true and other auto-version properties are satisified, then -# a document will be auto-versioned when it's type is changed. +# Extended auto-version behaviour. If true and other auto-version properties are satisfied, then +# a document will be auto-versioned when its type is changed. # version.store.enableAutoVersionOnTypeChange=false diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java index 27c1257166..31200792e8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java @@ -142,13 +142,13 @@ public class ExtendedVersionableAspect implements NodeServicePolicies.OnSetNodeT public void onSetNodeType(NodeRef nodeRef, QName oldType, QName newType) { if (isAutoVersionOnTypeChange && - nodeService.exists(nodeRef) == true && + nodeService.exists(nodeRef) && !LockUtils.isLockedAndReadOnly(nodeRef, lockService) && - nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) == true && - nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) == false) + nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) && + !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY)) { Map versionedNodeRefs = (Map)alfrescoTransactionSupport.getResource(KEY_VERSIONED_NODEREFS); - if (versionedNodeRefs == null || versionedNodeRefs.containsKey(nodeRef) == false) + if (versionedNodeRefs == null || !versionedNodeRefs.containsKey(nodeRef)) { // Determine whether the node is auto versionable (for content updates) or not boolean autoVersion = false; From 9b9b0da8ed3149b1774c7ddcbb5a9e34f68386a5 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Mon, 14 Dec 2015 22:29:02 +0000 Subject: [PATCH 2/2] RM-2562: review feedback git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@120142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../version/DeleteRecordVersionTest.java | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java index 8f716cc4fe..cabe2a630a 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeleteRecordVersionTest.java @@ -345,7 +345,7 @@ public class DeleteRecordVersionTest extends RecordableVersionsBaseTest * When I delete version record 1.2 * Then 1.1 is the most recent version */ - public void testDeleteLatestVersion() + public void testDeleteCurrentVersion() { final NodeRef myDocument = createDocumentWithRecordVersions(); @@ -361,44 +361,43 @@ public class DeleteRecordVersionTest extends RecordableVersionsBaseTest public void when() { - Version version10 = versionHistory.getVersion("1.0"); - NodeRef recordVersion10 = recordableVersionService.getVersionRecord(version10); + Version version12 = versionHistory.getVersion("1.2"); + NodeRef recordVersion12 = recordableVersionService.getVersionRecord(version12); - // delete record version 1.0 - nodeService.deleteNode(recordVersion10); + // delete record version 1.2 + nodeService.deleteNode(recordVersion12); } public void then() { - // check the deleted version - Version version10 = versionHistory.getVersion("1.0"); - assertNotNull(version10); - assertTrue(recordableVersionService.isRecordedVersionDestroyed(version10)); - NodeRef recordVersion10 = recordableVersionService.getVersionRecord(version10); - assertNull(recordVersion10); + // check 1.2 + Version version12 = versionHistory.getVersion("1.2"); + assertNotNull(version12); + assertTrue(recordableVersionService.isRecordedVersionDestroyed(version12)); + assertNull(recordableVersionService.getVersionRecord(version12)); - // verify 1.2 setup as expected - Version version12 = versionHistory.getHeadVersion(); - assertEquals("1.2", version12.getVersionLabel()); - NodeRef recordVersion12 = recordableVersionService.getVersionRecord(version12); - assertNotNull(recordVersion12); - - assertTrue(relationshipService.getRelationshipsTo(recordVersion12, RelationshipService.RELATIONSHIP_VERSIONS).isEmpty()); - - Set from12 = relationshipService.getRelationshipsFrom(recordVersion12, RelationshipService.RELATIONSHIP_VERSIONS); - assertEquals(1, from12.size()); - - // verify 1.1 setup as expected - Version version11 = versionHistory.getPredecessor(version12); - assertEquals("1.1", version11.getVersionLabel()); + // verify 1.1 + Version version11 = versionHistory.getVersion("1.1"); + assertNotNull(version11); NodeRef recordVersion11 = recordableVersionService.getVersionRecord(version11); assertNotNull(recordVersion11); - Set to11 = relationshipService.getRelationshipsTo(recordVersion11, RelationshipService.RELATIONSHIP_VERSIONS); - assertEquals(1, to11.size()); - assertEquals(recordVersion12, to11.iterator().next().getSource()); + assertTrue(relationshipService.getRelationshipsTo(recordVersion11, RelationshipService.RELATIONSHIP_VERSIONS).isEmpty()); - assertTrue(relationshipService.getRelationshipsFrom(recordVersion11, RelationshipService.RELATIONSHIP_VERSIONS).isEmpty()); + Set from11 = relationshipService.getRelationshipsFrom(recordVersion11, RelationshipService.RELATIONSHIP_VERSIONS); + assertEquals(1, from11.size()); + + // verify 1.0 + Version version10 = versionHistory.getVersion("1.0"); + assertNotNull(version10); + NodeRef recordVersion10 = recordableVersionService.getVersionRecord(version10); + assertNotNull(recordVersion10); + + Set to10 = relationshipService.getRelationshipsTo(recordVersion10, RelationshipService.RELATIONSHIP_VERSIONS); + assertEquals(1, to10.size()); + assertEquals(recordVersion11, to10.iterator().next().getSource()); + + assertTrue(relationshipService.getRelationshipsFrom(recordVersion10, RelationshipService.RELATIONSHIP_VERSIONS).isEmpty()); } }); }