inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-2193 (Cannot classify non electronic document)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@102702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-04-26 20:02:30 +00:00
parent 07fc43cf29
commit 899cf5fad1
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImpl.java
View File

@@ -18,6 +18,7 @@
*/ */
package org.alfresco.module.org_alfresco_module_rm.classification; package org.alfresco.module.org_alfresco_module_rm.classification;
import static org.alfresco.module.org_alfresco_module_rm.util.RMParameterCheck.checkNotBlank;
import static org.alfresco.util.ParameterCheck.mandatory; import static org.alfresco.util.ParameterCheck.mandatory;
import java.io.Serializable; import java.io.Serializable;
@@ -221,12 +222,12 @@ public class ClassificationServiceImpl extends ServiceBaseImpl
public void classifyContent(String classificationLevelId, String classificationAuthority, public void classifyContent(String classificationLevelId, String classificationAuthority,
Set<String> classificationReasonIds, NodeRef content) Set<String> classificationReasonIds, NodeRef content)
{ {
mandatory("classificationLevelId", classificationLevelId); checkNotBlank("classificationLevelId", classificationLevelId);
mandatory("classificationAuthority", classificationAuthority); checkNotBlank("classificationAuthority", classificationAuthority);
mandatory("classificationReasonIds", classificationReasonIds); mandatory("classificationReasonIds", classificationReasonIds);
mandatory("content", content); mandatory("content", content);
if (!nodeService.getType(content).equals(ContentModel.TYPE_CONTENT)) if (!dictionaryService.isSubClass(nodeService.getType(content), ContentModel.TYPE_CONTENT))
{ {
throw new InvalidNode(content, "The supplied node is not a content node."); throw new InvalidNode(content, "The supplied node is not a content node.");
} }

7
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java
View File

@@ -37,6 +37,7 @@ import java.util.Set;
import java.util.stream.Stream; import java.util.stream.Stream;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.InvalidNode; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.InvalidNode;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.MissingConfiguration; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationServiceException.MissingConfiguration;
@@ -45,6 +46,7 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils;
import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper; 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.AuthenticationUtil;
import org.alfresco.service.cmr.attributes.AttributeService; import org.alfresco.service.cmr.attributes.AttributeService;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
@@ -110,6 +112,7 @@ public class ClassificationServiceImplUnitTest
@Mock private AuthenticationUtil mockedAuthenticationUtil; @Mock private AuthenticationUtil mockedAuthenticationUtil;
@Mock private ClassificationServiceDAO mockClassificationServiceDAO; @Mock private ClassificationServiceDAO mockClassificationServiceDAO;
@Mock private NodeService mockNodeService; @Mock private NodeService mockNodeService;
@Mock private DictionaryService mockDictionaryService;
/** Using a mock appender in the class logger so that we can verify some of the logging requirements. */ /** Using a mock appender in the class logger so that we can verify some of the logging requirements. */
@Mock private Appender mockAppender; @Mock private Appender mockAppender;
@Mock private ClassificationLevelManager mockLevelManager; @Mock private ClassificationLevelManager mockLevelManager;
@@ -272,7 +275,7 @@ public class ClassificationServiceImplUnitTest
when(mockReasonManager.findReasonById("reasonId2")).thenReturn(reason2); when(mockReasonManager.findReasonById("reasonId2")).thenReturn(reason2);
// Create a content node. // Create a content node.
NodeRef content = new NodeRef("fake://content/"); NodeRef content = new NodeRef("fake://content/");
when(mockNodeService.getType(content)).thenReturn(ContentModel.TYPE_CONTENT); when(mockDictionaryService.isSubClass(mockNodeService.getType(content), ContentModel.TYPE_CONTENT)).thenReturn(true);
when(mockNodeService.hasAspect(content, ClassifiedContentModel.ASPECT_CLASSIFIED)).thenReturn(false); when(mockNodeService.hasAspect(content, ClassifiedContentModel.ASPECT_CLASSIFIED)).thenReturn(false);
// Call the method under test. // Call the method under test.
@@ -314,7 +317,7 @@ public class ClassificationServiceImplUnitTest
{ {
// Create a classified piece of content. // Create a classified piece of content.
NodeRef classifiedContent = new NodeRef("classified://content/"); NodeRef classifiedContent = new NodeRef("classified://content/");
when(mockNodeService.getType(classifiedContent)).thenReturn(ContentModel.TYPE_CONTENT); when(mockDictionaryService.isSubClass(mockNodeService.getType(classifiedContent), ContentModel.TYPE_CONTENT)).thenReturn(true);
when(mockNodeService.hasAspect(classifiedContent, ClassifiedContentModel.ASPECT_CLASSIFIED)).thenReturn(true); when(mockNodeService.hasAspect(classifiedContent, ClassifiedContentModel.ASPECT_CLASSIFIED)).thenReturn(true);
// Call the method under test. // Call the method under test.