RM-3339 - review updates

This commit is contained in:
Ana Bozianu
2016-07-12 17:31:37 +03:00
parent 8ca85000e1
commit 6979f6ce44
2 changed files with 4 additions and 13 deletions

View File

@@ -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"/>

View File

@@ -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());
}
/**