Merged release/V2.4 into master

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml

@@ -67,6 +67,10 @@
       <property name="recordFolderService" ref="recordFolderService" />
    </bean>
 
+   <bean id="rma.nonElectronicRecord" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.NonElectronicRecordType" parent="rm.baseBehaviour">
+      <property name="recordService" ref="RecordService" />
+   </bean>
+
    <bean id="rma.filePlan" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.FilePlanType" parent="rm.baseBehaviour">
       <property name="identifierService" ref="recordsManagementIdentifierService"/>
         <property name="filePlanService" ref="FilePlanService" />

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/NonElectronicRecordType.java

@@ -0,0 +1,99 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * 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 <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
+
+import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
+import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
+import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
+import org.alfresco.repo.node.NodeServicePolicies;
+import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
+import org.alfresco.repo.policy.annotation.Behaviour;
+import org.alfresco.repo.policy.annotation.BehaviourBean;
+import org.alfresco.repo.policy.annotation.BehaviourKind;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * rma:nonElectronicDocument behaviour bean.
+ *
+ * @author silviudinuta
+ * @since 2.4
+ */
+@BehaviourBean(defaultType = "rma:nonElectronicDocument")
+public class NonElectronicRecordType extends BaseBehaviourBean implements NodeServicePolicies.OnUpdateNodePolicy
+{
+
+    /** record service */
+    protected RecordService recordService;
+
+    /**
+     * @param recordService record service
+     */
+    public void setRecordService(RecordService recordService)
+    {
+        this.recordService = recordService;
+    }
+
+    @Behaviour(kind = BehaviourKind.CLASS, notificationFrequency = NotificationFrequency.FIRST_EVENT)
+    @Override
+    public void onUpdateNode(final NodeRef nodeRef)
+    {
+        AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
+        {
+            @Override
+            public Void doWork()
+            {
+                final NodeRef child = nodeRef;
+                if (nodeService.exists(child))
+                {
+                    NodeRef parentRef = nodeService.getPrimaryParent(child).getParentRef();
+                    QName parentType = nodeService.getType(parentRef);
+                    boolean isUnfiledRecordContainer = parentType
+                                .equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER);
+                    boolean isUnfiledRecordFolder = parentType
+                                .equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER);
+                    if (isUnfiledRecordContainer || isUnfiledRecordFolder)
+                    {
+                        if (!nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT))
+                        {
+                            nodeService.addAspect(child, ASPECT_FILE_PLAN_COMPONENT, null);
+                        }
+                        if (!nodeService.hasAspect(child, ASPECT_RECORD))
+                        {
+                            recordService.makeRecord(child);
+                        }
+                    }
+                }
+                return null;
+            }
+        });
+    }
+
+}

rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/NonElectronicRecordTypeUnitTest.java

@@ -0,0 +1,113 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * 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 <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
+import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
+import org.alfresco.module.org_alfresco_module_rm.test.util.MockAuthenticationUtilHelper;
+import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil;
+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.cmr.repository.StoreRef;
+import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * @author silviudinuta
+ */
+public class NonElectronicRecordTypeUnitTest implements RecordsManagementModel, ContentModel
+{
+    private final static NodeRef CHILD_NODE_REF = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
+                GUID.generate());
+    private final static NodeRef PARENT_NODE_REF = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE,
+                GUID.generate());
+
+    @InjectMocks
+    NonElectronicRecordType nonElectronicRecordType;
+
+    @Mock
+    AuthenticationUtil mockAuthenticationUtil;
+
+    @Mock
+    RecordService mockedRecordService;
+
+    @Mock
+    NodeService mockedNodeService;
+
+    @Before
+    public void setUp()
+    {
+        MockitoAnnotations.initMocks(this);
+        MockAuthenticationUtilHelper.setup(mockAuthenticationUtil);
+        when(mockedNodeService.exists(CHILD_NODE_REF)).thenReturn(true);
+        when(mockedNodeService.exists(PARENT_NODE_REF)).thenReturn(true);
+
+        ChildAssociationRef generateChildAssociationRef = mock(ChildAssociationRef.class);
+        when(generateChildAssociationRef.getParentRef()).thenReturn(PARENT_NODE_REF);
+        when(generateChildAssociationRef.getChildRef()).thenReturn(CHILD_NODE_REF);
+
+        when(mockedNodeService.getPrimaryParent(CHILD_NODE_REF)).thenReturn(generateChildAssociationRef);
+        when(mockedNodeService.getType(PARENT_NODE_REF)).thenReturn(TYPE_UNFILED_RECORD_FOLDER);
+    }
+
+    @Test
+    public void testOnUpdateWithAspectsAlreadyPresent()
+    {
+        when(mockedNodeService.hasAspect(CHILD_NODE_REF, ASPECT_FILE_PLAN_COMPONENT)).thenReturn(true);
+        when(mockedNodeService.hasAspect(CHILD_NODE_REF, ASPECT_RECORD)).thenReturn(true);
+
+        nonElectronicRecordType.onUpdateNode(CHILD_NODE_REF);
+
+        verify(mockedNodeService, never()).addAspect(CHILD_NODE_REF, ASPECT_FILE_PLAN_COMPONENT, null);
+        verify(mockedRecordService, never()).makeRecord(CHILD_NODE_REF);
+    }
+
+    @Test
+    public void testOnUpdateWithoutTheAspects()
+    {
+        when(mockedNodeService.hasAspect(CHILD_NODE_REF, ASPECT_FILE_PLAN_COMPONENT)).thenReturn(false);
+        when(mockedNodeService.hasAspect(CHILD_NODE_REF, ASPECT_RECORD)).thenReturn(false);
+
+        nonElectronicRecordType.onUpdateNode(CHILD_NODE_REF);
+
+        verify(mockedNodeService, times(1)).addAspect(CHILD_NODE_REF, ASPECT_FILE_PLAN_COMPONENT, null);
+        verify(mockedRecordService, times(1)).makeRecord(CHILD_NODE_REF);
+    }
+}