()
{
public Void doWork()
{
- final NodeRef sourceNode = renditionService.getSourceNode(renditionNodeRef).getParentRef();
- if (contentClassificationService.isClassified(sourceNode))
+ final ChildAssociationRef chAssRef = renditionService.getSourceNode(renditionNodeRef);
+ final NodeRef sourceNode = chAssRef.getParentRef();
+ if (contentClassificationService.isClassified(sourceNode) &&
+ referralAdminService.getAttachedReferralFrom(renditionNodeRef, ASPECT_CLASSIFIED) != null)
{
- // All renditions should be given the same classification as their source node
- servicesExtras.copyAspect(sourceNode, renditionNodeRef, ASPECT_CLASSIFIED);
+ referralAdminService.attachReferrer(renditionNodeRef, sourceNode, ASSOC_CLASSIFIED_RENDITION);
}
+
return null;
}
}, authenticationUtil.getSystemUserName());
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
index 97f71efddd..91cfee419a 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspect.java
@@ -20,17 +20,13 @@ package org.alfresco.module.org_alfresco_module_rm.model.clf.aspect;
import static org.alfresco.module.org_alfresco_module_rm.util.RMCollectionUtils.diffKey;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Map;
-
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationException.MissingDowngradeInstructions;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationLevel;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService.Reclassification;
import org.alfresco.module.org_alfresco_module_rm.classification.model.ClassifiedContentModel;
+import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService;
import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
-import org.alfresco.module.org_alfresco_module_rm.util.CoreServicesExtras;
import org.alfresco.module.org_alfresco_module_rm.util.RMCollectionUtils.Difference;
import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
@@ -44,10 +40,15 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
/**
* clf:classification behaviour bean
*
- * @since 3.0.a
+ * @since 2.4.a
*/
@BehaviourBean
(
@@ -58,31 +59,27 @@ public class ClassifiedAspect extends BaseBehaviourBean implements NodeServicePo
ClassifiedContentModel
{
private ClassificationSchemeService classificationSchemeService;
+ private ReferralAdminService referralAdminService;
private RenditionService renditionService;
- private CoreServicesExtras servicesExtras;
public void setClassificationSchemeService(ClassificationSchemeService service)
{
this.classificationSchemeService = service;
}
+ public void setReferralAdminService(ReferralAdminService service)
+ {
+ this.referralAdminService = service;
+ }
+
public void setRenditionService(RenditionService service)
{
this.renditionService = service;
}
- public void setCoreServicesExtras(CoreServicesExtras extras)
- {
- this.servicesExtras = extras;
- }
-
/**
* Behaviour associated with updating the classified aspect properties.
*
- * Ensures that on reclassification of content (in other words a change in the value of the
- * {@link ClassifiedContentModel#PROP_CURRENT_CLASSIFICATION clf:currentClassification} property)
- * that various metadata are correctly updated as a side-effect.
- *
* Validates the consistency of the properties.
*/
@Override
@@ -91,7 +88,7 @@ public class ClassifiedAspect extends BaseBehaviourBean implements NodeServicePo
kind = BehaviourKind.CLASS,
notificationFrequency = NotificationFrequency.EVERY_EVENT
)
- public void onUpdateProperties(final NodeRef nodeRef,
+ public void onUpdateProperties(final NodeRef classifiedNode,
final Map before,
final Map after)
{
@@ -101,7 +98,7 @@ public class ClassifiedAspect extends BaseBehaviourBean implements NodeServicePo
{
final Difference classificationChange = diffKey(before, after, PROP_CURRENT_CLASSIFICATION);
- if (classificationChange == Difference.CHANGED && nodeService.hasAspect(nodeRef, ASPECT_CLASSIFIED))
+ if (classificationChange == Difference.CHANGED && nodeService.hasAspect(classifiedNode, ASPECT_CLASSIFIED))
{
final String oldValue = (String)before.get(PROP_CURRENT_CLASSIFICATION);
final String newValue = (String)after.get(PROP_CURRENT_CLASSIFICATION);
@@ -113,14 +110,12 @@ public class ClassifiedAspect extends BaseBehaviourBean implements NodeServicePo
if (reclassification != null)
{
- nodeService.setProperty(nodeRef, PROP_LAST_RECLASSIFICATION_ACTION, reclassification.toModelString());
- nodeService.setProperty(nodeRef, PROP_LAST_RECLASSIFY_AT, new Date());
+ nodeService.setProperty(classifiedNode, PROP_LAST_RECLASSIFICATION_ACTION, reclassification.toModelString());
+ nodeService.setProperty(classifiedNode, PROP_LAST_RECLASSIFY_AT, new Date());
}
}
- checkConsistencyOfProperties(nodeRef);
-
- copyClassifiedPropertiesToRenditions(nodeRef);
+ checkConsistencyOfProperties(classifiedNode);
return null;
}
@@ -136,33 +131,33 @@ public class ClassifiedAspect extends BaseBehaviourBean implements NodeServicePo
@Behaviour
(
kind = BehaviourKind.CLASS,
- notificationFrequency = NotificationFrequency.EVERY_EVENT
+ notificationFrequency = NotificationFrequency.FIRST_EVENT
)
- public void onAddAspect(final NodeRef nodeRef, final QName aspectTypeQName)
+ public void onAddAspect(final NodeRef classifiedNode, final QName aspectTypeQName)
{
AuthenticationUtil.runAs(new RunAsWork()
{
public Void doWork()
{
- checkConsistencyOfProperties(nodeRef);
+ checkConsistencyOfProperties(classifiedNode);
- copyClassifiedPropertiesToRenditions(nodeRef);
+ // If this node has any renditions, we must ensure that they inherit the classification
+ // from their source node.
+ final List renditions = renditionService.getRenditions(classifiedNode);
+ for (ChildAssociationRef chAssRef : renditions)
+ {
+ final NodeRef renditionNode = chAssRef.getChildRef();
+ if (referralAdminService.getAttachedReferralFrom(renditionNode, ASPECT_CLASSIFIED_RENDITION) == null)
+ {
+ referralAdminService.attachReferrer(renditionNode, classifiedNode, ASSOC_CLASSIFIED_RENDITION);
+ }
+ }
return null;
}
}, AuthenticationUtil.getSystemUserName());
}
- private void copyClassifiedPropertiesToRenditions(NodeRef nodeRef)
- {
- // All renditions should be given the same classification as their source node
- for (final ChildAssociationRef chAssRef : renditionService.getRenditions(nodeRef))
- {
- final NodeRef renditionNode = chAssRef.getChildRef();
- servicesExtras.copyAspect(nodeRef, renditionNode, ASPECT_CLASSIFIED);
- }
- }
-
/**
* Check the consistency of the classification properties and throw an exception if they are invalid.
*
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImplUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImplUnitTest.java
index bc141bcc5c..b708aeb96a 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImplUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ContentClassificationServiceImplUnitTest.java
@@ -45,6 +45,7 @@ import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationE
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationException.LevelIdNotFound;
import org.alfresco.module.org_alfresco_module_rm.classification.model.ClassifiedContentModel;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
+import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataService;
import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper;
import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
@@ -80,6 +81,7 @@ public class ContentClassificationServiceImplUnitTest implements ClassifiedConte
@Mock FreezeService mockFreezeService;
@Mock SecurityClearanceService mockSecurityClearanceService;
@Mock AuthenticationUtil mockAuthenticationUtil;
+ @Mock ReferredMetadataService mockReferredMetadataService;
@Mock ClassificationAspectProperties mockPropertiesDTO;
@Captor ArgumentCaptor> propertiesCaptor;
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/ClassifiedRenditionsUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/ClassifiedRenditionsUnitTest.java
deleted file mode 100644
index da48e63539..0000000000
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/ClassifiedRenditionsUnitTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2005-2015 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-package org.alfresco.module.org_alfresco_module_rm.model.clf;
-
-import static java.util.Arrays.asList;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import org.alfresco.model.RenditionModel;
-import org.alfresco.module.org_alfresco_module_rm.classification.ContentClassificationService;
-import org.alfresco.module.org_alfresco_module_rm.classification.model.ClassifiedContentModel;
-import org.alfresco.module.org_alfresco_module_rm.model.clf.aspect.ClassifiedAspect;
-import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper;
-import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil;
-import org.alfresco.module.org_alfresco_module_rm.util.CoreServicesExtras;
-import org.alfresco.service.cmr.rendition.RenditionService;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-
-/**
- * Unit tests for {@link ClassifiedRenditions}.
- *
- * @since 3.0.a
- */
-public class ClassifiedRenditionsUnitTest implements ClassifiedContentModel
-{
- private static final NodeRef SOURCE_NODE = new NodeRef("node://ref/");
- private static final NodeRef RENDITION_1 = new NodeRef("node://rendition1/");
- private static final NodeRef RENDITION_2 = new NodeRef("node://rendition2/");
-
- @InjectMocks ClassifiedAspect classifiedAspect;
-
- @Mock AuthenticationUtil mockAuthenticationUtil;
- @Mock ContentClassificationService mockContentClassificationService;
- @Mock CoreServicesExtras mockCoreServicesExtras;
- @Mock NodeService mockNodeService;
- @Mock RenditionService mockRenditionService;
-
- @Before
- public void setUp()
- {
- initMocks(this);
-
- MockAuthenticationUtilHelper.setup(mockAuthenticationUtil);
- }
-
- @Test public void newRenditionOfClassifiedNodeShouldItselfBeClassified()
- {
- when(mockRenditionService.getRenditions(SOURCE_NODE))
- .thenReturn(asList(rendition(SOURCE_NODE, RENDITION_1), rendition(SOURCE_NODE, RENDITION_2)));
- when(mockRenditionService.getSourceNode(RENDITION_1)).thenReturn(rendition(SOURCE_NODE, RENDITION_1));
- when(mockRenditionService.getSourceNode(RENDITION_2)).thenReturn(rendition(SOURCE_NODE, RENDITION_2));
- when(mockContentClassificationService.isClassified(SOURCE_NODE)).thenReturn(true);
-
- final ClassifiedRenditions behaviour = new ClassifiedRenditions();
- behaviour.setAuthenticationUtil(mockAuthenticationUtil);
- behaviour.setContentClassificationService(mockContentClassificationService);
- behaviour.setCoreServicesExtras(mockCoreServicesExtras);
- behaviour.setNodeService(mockNodeService);
- behaviour.setRenditionService(mockRenditionService);
-
- behaviour.onAddAspect(RENDITION_2, RenditionModel.ASPECT_RENDITION);
-
- verify(mockCoreServicesExtras).copyAspect(SOURCE_NODE, RENDITION_2, ClassifiedContentModel.ASPECT_CLASSIFIED);
- }
-
- /** Creates a test Rendition ChildAssociationRef. */
- private ChildAssociationRef rendition(NodeRef source, NodeRef rendition)
- {
- return new ChildAssociationRef(RenditionModel.ASSOC_RENDITION, source, RenditionModel.ASSOC_RENDITION, rendition);
- }
-}
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
index 35d7404ac9..30e89eff75 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/clf/aspect/ClassifiedAspectUnitTest.java
@@ -19,52 +19,46 @@
package org.alfresco.module.org_alfresco_module_rm.model.clf.aspect;
import static java.util.Arrays.asList;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
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.Date;
-import java.util.HashMap;
-import java.util.Map;
-
import org.alfresco.model.RenditionModel;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationException.MissingDowngradeInstructions;
-import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationLevel;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService;
import org.alfresco.module.org_alfresco_module_rm.classification.model.ClassifiedContentModel;
+import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferralAdminService;
import org.alfresco.module.org_alfresco_module_rm.util.CoreServicesExtras;
import org.alfresco.service.cmr.rendition.RenditionService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
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;
import org.mockito.Mock;
+import java.util.Date;
+
/**
* Unit tests for the {@link ClassifiedAspect}.
*
* @author Tom Page
- * @since 3.0.a
+ * @author Neil Mc Erlean
+ * @since 2.4.a
*/
public class ClassifiedAspectUnitTest implements ClassifiedContentModel
{
private static final NodeRef NODE_REF = new NodeRef("node://Ref/");
private static final NodeRef RENDITION_1 = new NodeRef("node://rendition1/");
private static final NodeRef RENDITION_2 = new NodeRef("node://rendition2/");
- private static final ClassificationLevel TOP_SECRET = new ClassificationLevel("Top Secret", "Top Secret");
- private static final ClassificationLevel SECRET = new ClassificationLevel("Secret", "Secret");
@InjectMocks ClassifiedAspect classifiedAspect;
@Mock ClassificationSchemeService mockClassificationSchemeService;
@Mock CoreServicesExtras mockCoreServicesExtras;
@Mock NodeService mockNodeService;
@Mock RenditionService mockRenditionService;
+ @Mock ReferralAdminService mockReferralAdminService;
@Before
public void setUp()
@@ -135,50 +129,20 @@ public class ClassifiedAspectUnitTest implements ClassifiedContentModel
classifiedAspect.checkConsistencyOfProperties(NODE_REF);
}
- /** Check that when a node is classified, its renditions are also classified. */
- @Test public void classificationOfNodeShouldClassifyRenditions()
+ @Test public void newlyClassifiedNodeShouldLinkItsMetadataToAllRenditions()
{
- for (NodeRef n : asList(NODE_REF, RENDITION_1, RENDITION_2))
- {
- when(mockNodeService.hasAspect(n, ASPECT_CLASSIFIED)).thenReturn(true);
- }
- when(mockClassificationSchemeService.getClassificationLevelById(eq("Top Secret"))).thenReturn(TOP_SECRET);
- when(mockClassificationSchemeService.getClassificationLevelById(eq("Secret"))).thenReturn(SECRET);
- when(mockClassificationSchemeService.getReclassification(any(), any())).thenReturn(ClassificationSchemeService.Reclassification.DOWNGRADE);
- when(mockRenditionService.getRenditions(eq(NODE_REF)))
+ when(mockRenditionService.getRenditions(NODE_REF))
.thenReturn(asList(rendition(NODE_REF, RENDITION_1), rendition(NODE_REF, RENDITION_2)));
+ for (final NodeRef rendition : asList(RENDITION_1, RENDITION_2))
+ {
+ when(mockRenditionService.getSourceNode(rendition)).thenReturn(rendition(NODE_REF, rendition));
+ }
classifiedAspect.onAddAspect(NODE_REF, ASPECT_CLASSIFIED);
for (NodeRef rendition : asList(RENDITION_1, RENDITION_2))
{
- verify(mockCoreServicesExtras).copyAspect(NODE_REF, rendition, ClassifiedContentModel.ASPECT_CLASSIFIED);
- }
- }
-
- @Test public void reclassificationOfNodeShouldReclassifyRenditions()
- {
- for (NodeRef n : asList(NODE_REF, RENDITION_1, RENDITION_2))
- {
- when(mockNodeService.hasAspect(n, ASPECT_CLASSIFIED)).thenReturn(true);
- }
- when(mockClassificationSchemeService.getClassificationLevelById("Top Secret")).thenReturn(TOP_SECRET);
- when(mockClassificationSchemeService.getClassificationLevelById("Secret")).thenReturn(SECRET);
- when(mockClassificationSchemeService.getReclassification(any(), any())).thenReturn(ClassificationSchemeService.Reclassification.DOWNGRADE);
- when(mockRenditionService.getRenditions(eq(NODE_REF)))
- .thenReturn(asList(rendition(NODE_REF, RENDITION_1), rendition(NODE_REF, RENDITION_2)));
-
- Map oldProps = new HashMap<>();
- oldProps.put(PROP_CLASSIFIED_BY, "userone");
- oldProps.put(PROP_CURRENT_CLASSIFICATION, "Top Secret");
- Map newProps = new HashMap<>(oldProps);
- newProps.put(PROP_CURRENT_CLASSIFICATION, "Secret");
-
- classifiedAspect.onUpdateProperties(NODE_REF, oldProps, newProps);
-
- for (NodeRef rendition : asList(RENDITION_1, RENDITION_2))
- {
- verify(mockCoreServicesExtras).copyAspect(NODE_REF, rendition, ClassifiedContentModel.ASPECT_CLASSIFIED);
+ verify(mockReferralAdminService).attachReferrer(rendition, NODE_REF, ASSOC_CLASSIFIED_RENDITION);
}
}