Sharad Mishra has uploaded a new change for review.
Change subject: core: Change class name from action_version_map to
ActionVersionMap.
......................................................................
core: Change class name from action_version_map to ActionVersionMap.
Change-Id: I453502472d431f3a4358a3f30c59467f590459bb
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQuery.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAOWrapperImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/actiongroup/ActionVersionMapDAOHibernateImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ActionGroupDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
10 files changed, 41 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/10042/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index 2951761..0dc8390 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -49,7 +49,7 @@
import
org.ovirt.engine.core.common.businessentities.BusinessEntitySnapshot.EntityStatusSnapshot;
import
org.ovirt.engine.core.common.businessentities.BusinessEntitySnapshot.SnapshotType;
import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.common.businessentities.async_tasks;
import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.common.businessentities.tags;
@@ -700,7 +700,7 @@
protected boolean isBackwardsCompatible() {
boolean result = true;
- action_version_map actionVersionMap = DbFacade.getInstance()
+ ActionVersionMap actionVersionMap = DbFacade.getInstance()
.getActionGroupDao().getActionVersionMapByActionType(getActionType());
// if actionVersionMap not null check cluster level
// cluster level ok check storage_pool level
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQuery.java
index de174e2..7068440 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQuery.java
@@ -3,7 +3,7 @@
import java.util.HashMap;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.common.queries.CommandVersionsInfo;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
@@ -17,7 +17,7 @@
protected void executeQueryCommand() {
HashMap<VdcActionType, CommandVersionsInfo> resultMap =
new HashMap<VdcActionType, CommandVersionsInfo>();
- for (action_version_map actionVersionMap :
getActionGroupDao().getAllActionVersionMap()) {
+ for (ActionVersionMap actionVersionMap :
getActionGroupDao().getAllActionVersionMap()) {
CommandVersionsInfo info =
new
CommandVersionsInfo(actionVersionMap.getstorage_pool_minimal_version(),
actionVersionMap.getcluster_minimal_version());
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java
index 3ab5e86..8ea6587 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetCommandsCompatibilityVersionsQueryTest.java
@@ -11,7 +11,7 @@
import org.junit.Before;
import org.junit.Test;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.common.queries.CommandVersionsInfo;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
@@ -37,9 +37,9 @@
@Test
public void testExecuteQueryCommand() {
GetCommandsCompatibilityVersionsQuery<VdcQueryParametersBase>
queryToRun = getQuery();
- List<action_version_map> entriesFromDb =
- Arrays.asList(new action_version_map(VdcActionType.RunVm,
RUN_VM_VERSION, RUN_VM_VERSION),
- new action_version_map(VdcActionType.AddVmFromSnapshot,
+ List<ActionVersionMap> entriesFromDb =
+ Arrays.asList(new ActionVersionMap(VdcActionType.RunVm,
RUN_VM_VERSION, RUN_VM_VERSION),
+ new ActionVersionMap(VdcActionType.AddVmFromSnapshot,
ADD_VM_FROM_SNAPSHOT_VERSION,
ADD_VM_FROM_SNAPSHOT_VERSION));
doReturn(entriesFromDb).when(actionGroupDaoMock).getAllActionVersionMap();
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/action_version_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
similarity index 88%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/action_version_map.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
index fb7fd7b..803cfb2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/action_version_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
@@ -16,19 +16,19 @@
@Entity
@Table(name = "action_version_map")
@TypeDef(name = "guid", typeClass = GuidType.class)
-public class action_version_map implements Serializable {
+public class ActionVersionMap implements Serializable {
private static final long serialVersionUID = -212222175662336097L;
- public action_version_map() {
+ public ActionVersionMap() {
}
- public action_version_map(VdcActionType actionType, String
clusterMinimalVersion, String storagePoolMinimalVersion) {
+ public ActionVersionMap(VdcActionType actionType, String
clusterMinimalVersion, String storagePoolMinimalVersion) {
setaction_type(actionType);
setcluster_minimal_version(clusterMinimalVersion);
setstorage_pool_minimal_version(storagePoolMinimalVersion);
}
- public action_version_map(VdcActionType actionType, Version
clusterMinimalVersion, Version storagePoolMinimalVersion) {
+ public ActionVersionMap(VdcActionType actionType, Version
clusterMinimalVersion, Version storagePoolMinimalVersion) {
this(actionType, clusterMinimalVersion.toString(),
storagePoolMinimalVersion.toString());
}
@@ -90,7 +90,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- action_version_map other = (action_version_map) obj;
+ ActionVersionMap other = (ActionVersionMap) obj;
if (actionType != other.actionType)
return false;
if (clusterMinimalVersion == null) {
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAO.java
index 4548578..e6836ef 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAO.java
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -24,11 +24,11 @@
// TODO APIs to be removed when Hibernate migration is completed
- action_version_map getActionVersionMapByActionType(VdcActionType
action_type);
+ ActionVersionMap getActionVersionMapByActionType(VdcActionType
action_type);
- void addActionVersionMap(action_version_map action_version_map);
+ void addActionVersionMap(ActionVersionMap action_version_map);
void removeActionVersionMap(VdcActionType action_type);
- List<action_version_map> getAllActionVersionMap();
+ List<ActionVersionMap> getAllActionVersionMap();
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAODbFacadeImpl.java
index b73175e..128cdba 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAODbFacadeImpl.java
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.compat.Guid;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
@@ -28,7 +28,7 @@
}
@Override
- public action_version_map getActionVersionMapByActionType(VdcActionType
action_type) {
+ public ActionVersionMap getActionVersionMapByActionType(VdcActionType
action_type) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("action_type", action_type);
return
getCallsHandler().executeRead("Getaction_version_mapByaction_type",
@@ -37,7 +37,7 @@
}
@Override
- public void addActionVersionMap(action_version_map action_version_map) {
+ public void addActionVersionMap(ActionVersionMap action_version_map) {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("action_type",
action_version_map.getaction_type()).addValue("cluster_minimal_version",
action_version_map.getcluster_minimal_version()).addValue("storage_pool_minimal_version",
@@ -53,7 +53,7 @@
}
@Override
- public List<action_version_map> getAllActionVersionMap() {
+ public List<ActionVersionMap> getAllActionVersionMap() {
MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource();
return
getCallsHandler().executeReadList("GetAllFromaction_version_map",
ActionVersionMapMapper.instance,
@@ -61,12 +61,12 @@
}
- private static class ActionVersionMapMapper implements
ParameterizedRowMapper<action_version_map> {
+ private static class ActionVersionMapMapper implements
ParameterizedRowMapper<ActionVersionMap> {
public static final ActionVersionMapMapper instance = new
ActionVersionMapMapper();
@Override
- public action_version_map mapRow(ResultSet rs, int rowNum) throws
SQLException {
- action_version_map entity = new action_version_map();
+ public ActionVersionMap mapRow(ResultSet rs, int rowNum) throws
SQLException {
+ ActionVersionMap entity = new ActionVersionMap();
entity.setaction_type(VdcActionType.forValue(rs.getInt("action_type")));
entity.setcluster_minimal_version(rs.getString("cluster_minimal_version"));
entity.setstorage_pool_minimal_version(rs.getString("storage_pool_minimal_version"));
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAOWrapperImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAOWrapperImpl.java
index eee109d..e8c4e38 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAOWrapperImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ActionGroupDAOWrapperImpl.java
@@ -7,7 +7,7 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.actiongroup.ActionVersionMapDAOHibernateImpl;
import org.ovirt.engine.core.dao.actiongroup.RoleGroupMapDAOHibernateImpl;
@@ -29,12 +29,12 @@
}
@Override
- public action_version_map getActionVersionMapByActionType(VdcActionType
action_type) {
+ public ActionVersionMap getActionVersionMapByActionType(VdcActionType
action_type) {
return actionVersionMapDAO.get(action_type.getValue());
}
@Override
- public void addActionVersionMap(action_version_map map) {
+ public void addActionVersionMap(ActionVersionMap map) {
actionVersionMapDAO.save(map);
}
@@ -44,7 +44,7 @@
}
@Override
- public List<action_version_map> getAllActionVersionMap() {
+ public List<ActionVersionMap> getAllActionVersionMap() {
throw new NotImplementedException();
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/actiongroup/ActionVersionMapDAOHibernateImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/actiongroup/ActionVersionMapDAOHibernateImpl.java
index 4d83438..f2b737e 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/actiongroup/ActionVersionMapDAOHibernateImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/actiongroup/ActionVersionMapDAOHibernateImpl.java
@@ -1,10 +1,10 @@
package org.ovirt.engine.core.dao.actiongroup;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.dao.BaseDAOHibernateImpl;
-public class ActionVersionMapDAOHibernateImpl extends
BaseDAOHibernateImpl<action_version_map, Integer> {
+public class ActionVersionMapDAOHibernateImpl extends
BaseDAOHibernateImpl<ActionVersionMap, Integer> {
public ActionVersionMapDAOHibernateImpl() {
- super(action_version_map.class);
+ super(ActionVersionMap.class);
}
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ActionGroupDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ActionGroupDAOTest.java
index ba08fc3..9463b31 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ActionGroupDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ActionGroupDAOTest.java
@@ -10,7 +10,7 @@
import org.junit.Test;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.compat.Guid;
public class ActionGroupDAOTest extends BaseDAOTestCase {
@@ -18,8 +18,8 @@
private static final int ACTION_VERSION_MAP_COUNT = 2;
private static final Guid EXISTING_ROLE_ID = new
Guid("f5972bfa-7102-4d33-ad22-9dd421bfba78");
private ActionGroupDAO dao;
- private action_version_map existingActionMap;
- private action_version_map newActionMap;
+ private ActionVersionMap existingActionMap;
+ private ActionVersionMap newActionMap;
@Override
public void setUp() throws Exception {
@@ -27,7 +27,7 @@
dao = prepareDAO(dbFacade.getActionGroupDao());
existingActionMap =
dao.getActionVersionMapByActionType(VdcActionType.AddVm);
- newActionMap = new
action_version_map(VdcActionType.ActivateStorageDomain, "3.0", "3.0");
+ newActionMap = new
ActionVersionMap(VdcActionType.ActivateStorageDomain, "3.0", "3.0");
}
@Test
@@ -41,7 +41,7 @@
@Test
public void testGetAllActionVersionMap() {
- List<action_version_map> result = dao.getAllActionVersionMap();
+ List<ActionVersionMap> result = dao.getAllActionVersionMap();
assertNotNull(result);
assertFalse(result.isEmpty());
assertEquals(ACTION_VERSION_MAP_COUNT, result.size());
@@ -49,7 +49,7 @@
@Test
public void testGetActionVersionMapByType() {
- action_version_map result =
dao.getActionVersionMapByActionType(existingActionMap.getaction_type());
+ ActionVersionMap result =
dao.getActionVersionMapByActionType(existingActionMap.getaction_type());
assertNotNull(result);
assertEquals(existingActionMap, result);
@@ -59,7 +59,7 @@
public void testAddActionVersionMap() {
dao.addActionVersionMap(newActionMap);
- action_version_map result =
dao.getActionVersionMapByActionType(newActionMap.getaction_type());
+ ActionVersionMap result =
dao.getActionVersionMapByActionType(newActionMap.getaction_type());
assertNotNull(result);
assertEquals(newActionMap, result);
@@ -69,7 +69,7 @@
public void testRemoveActionVersionMap() {
dao.removeActionVersionMap(existingActionMap.getaction_type());
- action_version_map result =
dao.getActionVersionMapByActionType(existingActionMap.getaction_type());
+ ActionVersionMap result =
dao.getActionVersionMapByActionType(existingActionMap.getaction_type());
assertNull(result);
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
index 7fd81ff..a6f6e8b 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDAOTestCase.java
@@ -34,7 +34,7 @@
import org.ovirt.engine.core.common.businessentities.VmDynamic;
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import org.ovirt.engine.core.common.businessentities.action_version_map;
+import org.ovirt.engine.core.common.businessentities.ActionVersionMap;
import org.ovirt.engine.core.common.businessentities.ad_groups;
import org.ovirt.engine.core.common.businessentities.async_tasks;
import org.ovirt.engine.core.common.businessentities.bookmarks;
@@ -195,7 +195,7 @@
if (sessionFactory == null) {
sessionFactory =
new AnnotationConfiguration()
- .addAnnotatedClass(action_version_map.class)
+ .addAnnotatedClass(ActionVersionMap.class)
.addAnnotatedClass(ad_groups.class)
.addAnnotatedClass(async_tasks.class)
.addAnnotatedClass(AuditLog.class)
--
To view, visit http://gerrit.ovirt.org/10042
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I453502472d431f3a4358a3f30c59467f590459bb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
