From 0c3190d2e77b2ff725ac5db16d5bc95c445ea622 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Thu, 24 Sep 2020 10:59:50 +0100 Subject: [PATCH 1/8] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 82d40a6b50..c00eaa87f7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.4.0 + 3.5.0-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git - V3.4.0 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 0419dd0ede..eeb583062c 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.0 + 3.5.0-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index f4672ebd22..08b8b1bf57 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.4.0 + 3.5.0-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index b37fa80a35..ebce8bf216 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.0 + 3.5.0-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 9dba6d01b4..7176268586 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.4.0 + 3.5.0-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index f1784d3e52..7c19b1535b 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.4.0 + 3.5.0-SNAPSHOT From 7d5f31233461106ca6dbc48e94ff453b829d70ba Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Mon, 28 Sep 2020 10:21:20 +0300 Subject: [PATCH 2/8] APPS-361: [AGS/S3]Moving records between buckets in S3 (also possible moving records between stores-filecontenstore) fails --- .../model/rma/aspect/RecordAspect.java | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index cc8f3fc58e..cf1857b4bd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -39,7 +39,6 @@ import org.alfresco.module.org_alfresco_module_rm.model.behaviour.AbstractDispos import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService; import org.alfresco.module.org_alfresco_module_rm.util.ContentBinDuplicationUtility; -import org.alfresco.repo.content.ContentServicePolicies; import org.alfresco.repo.copy.CopyBehaviourCallback; import org.alfresco.repo.copy.CopyDetails; import org.alfresco.repo.copy.CopyServicePolicies; @@ -77,7 +76,7 @@ public class RecordAspect extends AbstractDisposableItem RecordsManagementPolicies.OnRemoveReference, NodeServicePolicies.OnMoveNodePolicy, CopyServicePolicies.OnCopyCompletePolicy, - ContentServicePolicies.OnContentPropertyUpdatePolicy + NodeServicePolicies.OnUpdatePropertiesPolicy { /** Well-known location of the scripts folder. */ // TODO make configurable @@ -373,21 +372,6 @@ public class RecordAspect extends AbstractDisposableItem } } - @Override - @Behaviour - ( - kind = BehaviourKind.CLASS, - notificationFrequency = NotificationFrequency.FIRST_EVENT - ) - public void onContentPropertyUpdate(NodeRef nodeRef, QName propertyQName, ContentData beforeValue, ContentData afterValue) - { - // Allow creation of content but not update - if (beforeValue != null) - { - throw new IntegrityException(I18NUtil.getMessage(MSG_CANNOT_UPDATE_RECORD_CONTENT), null); - } - } - /** * Behaviour to remove the shared link before declare a record * and to create new bin if the node is a copy or has copies @@ -421,4 +405,37 @@ public class RecordAspect extends AbstractDisposableItem } }, AuthenticationUtil.getSystemUserName()); } + + /** + * Behaviour to prevent content update for records + * + * @see org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy#onUpdateProperties(NodeRef, Map, Map) + */ + @Override + @Behaviour + ( + kind = BehaviourKind.CLASS, + notificationFrequency = NotificationFrequency.EVERY_EVENT + ) + public void onUpdateProperties(NodeRef nodeRef, Map before, Map after) + { + String storeNameAfter = (String) after.get(ContentModel.PROP_STORE_NAME); + + ContentData contentBefore = (ContentData) before.get(ContentModel.PROP_CONTENT); + ContentData contentAfter = (ContentData) after.get(ContentModel.PROP_CONTENT); + + // Check only storeNameAfter since the store name is updated before this method is triggered + // Does not allow content setting content to null when moving content between stores (case not covered by + // ContentPropertyRestrictionInterceptor) + if (storeNameAfter != null && contentAfter != null) + { + return; + } + else if (contentBefore != null) + { + { + throw new IntegrityException(I18NUtil.getMessage(MSG_CANNOT_UPDATE_RECORD_CONTENT), null); + } + } + } } From 845ddebd20ded64b05f0c5f079fe5ccbfd24e441 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Mon, 28 Sep 2020 13:12:35 +0300 Subject: [PATCH 3/8] APPS-361: [AGS/S3]Moving records between buckets in S3 (also possible moving records between stores-filecontenstore) fails - Fixed issue and added unit tests --- .../model/rma/aspect/RecordAspect.java | 4 +-- .../rma/aspect/RecordAspectUnitTest.java | 34 ++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index cf1857b4bd..52915ffca9 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -415,7 +415,7 @@ public class RecordAspect extends AbstractDisposableItem @Behaviour ( kind = BehaviourKind.CLASS, - notificationFrequency = NotificationFrequency.EVERY_EVENT + notificationFrequency = NotificationFrequency.FIRST_EVENT ) public void onUpdateProperties(NodeRef nodeRef, Map before, Map after) { @@ -425,7 +425,7 @@ public class RecordAspect extends AbstractDisposableItem ContentData contentAfter = (ContentData) after.get(ContentModel.PROP_CONTENT); // Check only storeNameAfter since the store name is updated before this method is triggered - // Does not allow content setting content to null when moving content between stores (case not covered by + // Does not allow setting content to null when moving content between stores (case not covered by // ContentPropertyRestrictionInterceptor) if (storeNameAfter != null && contentAfter != null) { diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java index 60aee3793d..4b2eb829b8 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java @@ -29,19 +29,29 @@ package org.alfresco.module.org_alfresco_module_rm.model.rma.aspect; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_ARCHIVED; +import static org.alfresco.model.ContentModel.PROP_CONTENT; +import static org.alfresco.model.ContentModel.PROP_STORE_NAME; import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.ASPECT_RECORD; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; +import java.io.Serializable; +import java.util.Locale; +import java.util.Map; + +import com.google.common.collect.ImmutableMap; + import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService; import org.alfresco.module.org_alfresco_module_rm.util.ContentBinDuplicationUtility; +import org.alfresco.repo.node.integrity.IntegrityException; import org.alfresco.service.cmr.repository.AssociationRef; +import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.namespace.QName; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -123,5 +133,27 @@ public class RecordAspectUnitTest verify(mockContentBinDuplicationUtility, times(1)).duplicate(COPY_REF); } + /** + * Check that an IntegrityException is thrown when content is changed + */ + @Test (expected = IntegrityException.class) + public void testOnUpdatePropertiesContentChanged() + { + Map before = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", + 0L, "UTF-8", Locale.UK)); + Map after = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", 0L, "UTF-8", Locale.UK)); + recordAspect.onUpdateProperties(NODE_REF, before, after); + } + /** + * Check that no exception is thrown when moving record between stores + */ + @Test + public void testOnUpdatePropertiesContentMovedToAnotherStore() + { + Map before = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", 0L, "UTF" + + "-8", Locale.UK)); + Map after = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", 0L, "UTF-8", Locale.UK), PROP_STORE_NAME, "store2"); + recordAspect.onUpdateProperties(NODE_REF, before, after); + } } From e590a4bae7879c84030e46aa96b2952cbe3983f2 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Mon, 28 Sep 2020 18:19:37 +0300 Subject: [PATCH 4/8] APPS-361: [AGS/S3]Moving records between buckets in S3 (also possible moving records between stores-filecontenstore) fails - Fixed file as record case --- .../model/rma/aspect/RecordAspect.java | 5 ++--- .../model/rma/aspect/RecordAspectUnitTest.java | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index 52915ffca9..d9ae2138b0 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -57,6 +57,7 @@ import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.ScriptService; import org.alfresco.service.namespace.QName; +import org.alfresco.util.EqualsHelper; import org.springframework.extensions.surf.util.I18NUtil; /** @@ -431,11 +432,9 @@ public class RecordAspect extends AbstractDisposableItem { return; } - else if (contentBefore != null) + else if (!EqualsHelper.nullSafeEquals(contentBefore, contentAfter)) { - { throw new IntegrityException(I18NUtil.getMessage(MSG_CANNOT_UPDATE_RECORD_CONTENT), null); - } } } } diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java index 4b2eb829b8..57cc4738ac 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java @@ -141,7 +141,8 @@ public class RecordAspectUnitTest { Map before = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", 0L, "UTF-8", Locale.UK)); - Map after = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", 0L, "UTF-8", Locale.UK)); + Map after = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl2", "text" + + "/plain", 0L, "UTF-8", Locale.UK)); recordAspect.onUpdateProperties(NODE_REF, before, after); } From beec140066e4035743c3bfc0658bde43f8af1a31 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Wed, 7 Oct 2020 17:32:19 +0300 Subject: [PATCH 5/8] APPS-361: [AGS/S3]Moving records between buckets in S3 (also possible moving records between stores-filecontenstore) fails - Fixed case causing some tests to fail --- .../org_alfresco_module_rm/model/rma/aspect/RecordAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java index d9ae2138b0..ca52ced361 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspect.java @@ -432,7 +432,7 @@ public class RecordAspect extends AbstractDisposableItem { return; } - else if (!EqualsHelper.nullSafeEquals(contentBefore, contentAfter)) + else if (contentBefore != null && !contentBefore.equals(contentAfter)) { throw new IntegrityException(I18NUtil.getMessage(MSG_CANNOT_UPDATE_RECORD_CONTENT), null); } From da9de0ae03979c2374df9ac21dd38d3c3287acc5 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Thu, 8 Oct 2020 10:21:10 +0300 Subject: [PATCH 6/8] APPS-361: [AGS/S3]Moving records between buckets in S3 (also possible moving records between stores-filecontenstore) fails - Minor test change --- .../model/rma/aspect/RecordAspectUnitTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java index 57cc4738ac..9c2540b85b 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java @@ -152,9 +152,11 @@ public class RecordAspectUnitTest @Test public void testOnUpdatePropertiesContentMovedToAnotherStore() { - Map before = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", 0L, "UTF" + + Map before = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl1", "text" + + "/plain", 0L, "UTF" + "-8", Locale.UK)); - Map after = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl", "text/plain", 0L, "UTF-8", Locale.UK), PROP_STORE_NAME, "store2"); + Map after = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl2", "text" + + "/plain", 0L, "UTF-8", Locale.UK), PROP_STORE_NAME, "store2"); recordAspect.onUpdateProperties(NODE_REF, before, after); } } From fe38fd1d5f399024ef1110de818f6c88816faeeb Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Thu, 8 Oct 2020 12:57:09 +0300 Subject: [PATCH 7/8] APPS-361: [AGS/S3]Moving records between buckets in S3 (also possible moving records between stores-filecontenstore) fails - Reverted changes not necessary after merging 'release/V3.4' into 'feature/APPS-361' --- .travis.yml | 8 ++++---- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c4fe96bb2..ff91f16232 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,10 @@ git: branches: only: - - master - - /feature\/.*/ - - /merge\/.*/ - - /hotfix\/.*/ + - /release\/V3.\d+.*/ + - /feature-3.\d+\/.*/ + - /merge-3.\d+\/.*/ + - /hotfix-3.\d+\/.*/ cache: directories: diff --git a/pom.xml b/pom.xml index c00eaa87f7..f0ea500520 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.5.0-SNAPSHOT + 3.4.1-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git scm:git:ssh://git@github.com/Alfresco/governance-services.git - HEAD + V3.4.0 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 5eee570158..07aa4d97e9 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-SNAPSHOT + 3.4.1-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 08b8b1bf57..1207eddf86 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.5.0-SNAPSHOT + 3.4.1-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index ebce8bf216..cc0be9ba64 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.5.0-SNAPSHOT + 3.4.1-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index cca3898591..fd227719b3 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-SNAPSHOT + 3.4.1-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 7c19b1535b..8e8b8ef613 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.5.0-SNAPSHOT + 3.4.1-SNAPSHOT From 03a7aaebbb505e85f1806720ea5c822b7077b107 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Thu, 8 Oct 2020 13:58:36 +0300 Subject: [PATCH 8/8] APPS-361: [AGS/S3]Moving records between buckets in S3 (also possible moving records between stores-filecontenstore) fails - Addressed review comments --- .../model/rma/aspect/RecordAspectUnitTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java index 9c2540b85b..52b79cb02f 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/RecordAspectUnitTest.java @@ -153,8 +153,7 @@ public class RecordAspectUnitTest public void testOnUpdatePropertiesContentMovedToAnotherStore() { Map before = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl1", "text" + - "/plain", 0L, "UTF" + - "-8", Locale.UK)); + "/plain", 0L, "UTF-8", Locale.UK)); Map after = ImmutableMap.of(PROP_CONTENT, new ContentData("dummyContentUrl2", "text" + "/plain", 0L, "UTF-8", Locale.UK), PROP_STORE_NAME, "store2"); recordAspect.onUpdateProperties(NODE_REF, before, after);