From 09e3766230f5a7aa2f9d5c991c2c74ea67ad5238 Mon Sep 17 00:00:00 2001
From: Sara Aspery <sara.aspery@alfresco.com>
Date: Mon, 12 Jun 2017 16:42:05 +0100
Subject: [PATCH] RM-5175_Complete_record_with_missing_metadata changes after
 review

---
 .../action/impl/DeclareRecordAction.java       |  8 ++------
 .../test/util/CommonRMTestUtils.java           | 18 ++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
index 2ccfee90cf..d701500601 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
@@ -197,16 +197,12 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
         // check for missing mandatory metadata from custom aspect definitions
         if (result)
         {
-            QName aspect;
+            QName aspect = ASPECT_RECORD;
             if (nodeRefType.equals(TYPE_NON_ELECTRONIC_DOCUMENT))
-            //if (nodeRefType.getLocalName()))
             {
                 aspect = TYPE_NON_ELECTRONIC_DOCUMENT;
             }
-            else
-            {
-                aspect = ASPECT_RECORD;
-            }
+
             // get customAspectImpl
             String localName = aspect.toPrefixString(getNamespaceService()).replace(":", "");
             localName = MessageFormat.format("{0}CustomProperties", localName);
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
index f0b8e2829f..65a731455d 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java
@@ -310,28 +310,14 @@ public class CommonRMTestUtils implements RecordsManagementModel
     {
         Map<QName, Serializable> props = new HashMap<QName, Serializable>(1);
         props.put(ContentModel.PROP_TITLE, title);
-        return createNonElectronicRecordImpl(recordFolder, name, props);
-    }
+        props.put(ContentModel.PROP_NAME, name);
 
-    /**
-     * Helper to consolidate creation of non-electronic record
-     */
-    private NodeRef createNonElectronicRecordImpl(NodeRef recordFolder, String name, Map<QName, Serializable> properties)
-    {
         // Create the document
-        if (properties == null)
-        {
-            properties = new HashMap<QName, Serializable>(1);
-        }
-        if (!properties.containsKey(ContentModel.PROP_NAME))
-        {
-            properties.put(ContentModel.PROP_NAME, name);
-        }
         NodeRef record = nodeService.createNode(recordFolder,
                 ContentModel.ASSOC_CONTAINS,
                 QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name),
                 RecordsManagementModel.TYPE_NON_ELECTRONIC_DOCUMENT,
-                properties).getChildRef();
+                props).getChildRef();
         return record;
     }