From 6979f6ce44d6448d24522dbf536e851aec24421f Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 12 Jul 2016 17:31:37 +0300
Subject: [PATCH] RM-3339 - review updates

---
 .../patch/rm-patch-context.xml                   |  1 -
 .../patch/ModulePatchExecuterImpl.java           | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
index 411c43c668..95f4003fe2 100755
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml
@@ -7,7 +7,6 @@
    <bean id="rm.modulePatchExecuter" parent="module.baseComponent" class="org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchExecuterImpl">
       <property name="moduleId" value="org_alfresco_module_rm"/>
       <property name="description" value="RM patch executer"/>
-      <property name="moduleSchemaKeyName" value="module-schema"/>
       <property name="sinceVersion" value="2.2"/>
       <property name="executeOnceOnly" value="false"/>
       <property name="moduleSchema" value="2501"/>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java
index efac5a4ee3..6c77a8d883 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/ModulePatchExecuterImpl.java
@@ -55,7 +55,7 @@ public class ModulePatchExecuterImpl extends   AbstractModuleComponent
     private static final int START_SCHEMA = 0;
 
     /** attribute key */
-    private String moduleSchemaKeyName;
+    private static final String KEY_MODULE_SCHEMA = "module-schema";
 
     /** configured module schema version */
     protected int moduleSchema = START_SCHEMA;
@@ -66,14 +66,6 @@ public class ModulePatchExecuterImpl extends   AbstractModuleComponent
     /** module patches */
     protected Map<String, ModulePatch> modulePatches = new HashMap<String, ModulePatch>(21);
 
-    /**
-     * @param moduleSchemaKeyName  configured module schema key name
-     */
-    public void setModuleSchemaKeyName(String moduleSchemaKeyName)
-    {
-        this.moduleSchemaKeyName = moduleSchemaKeyName;
-    }
-
     /**
      * @param attributeService  attribute service
      */
@@ -157,9 +149,9 @@ public class ModulePatchExecuterImpl extends   AbstractModuleComponent
     protected int getCurrentSchema()
     {
         Integer result = START_SCHEMA;
-        if (attributeService.exists(moduleSchemaKeyName, getModuleId()))
+        if (attributeService.exists(KEY_MODULE_SCHEMA, getModuleId()))
         {
-            result = (Integer)attributeService.getAttribute(moduleSchemaKeyName, getModuleId());
+            result = (Integer)attributeService.getAttribute(KEY_MODULE_SCHEMA, getModuleId());
         }
         return result;
     }
@@ -171,7 +163,7 @@ public class ModulePatchExecuterImpl extends   AbstractModuleComponent
      */
     protected void updateSchema(int newSchema)
     {
-        attributeService.setAttribute(Integer.valueOf(newSchema), moduleSchemaKeyName,  getModuleId());
+        attributeService.setAttribute(Integer.valueOf(newSchema), KEY_MODULE_SCHEMA,  getModuleId());
     }
 
     /**