Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove IsVdsWithSameNameExist
......................................................................
core: Remove IsVdsWithSameNameExist
IsVdsWithSameNameExistQuery is not used anywhere in
the code, and hence should be removed.
This patch removes the following:
1. The IsVdsWithSameNameExistQuery class
2. The IsVdsWithSameNameExist constant representing
it in VdcQueryType
3. The IsVdsWithSameNameExistParameters class which
was only used by the removed query class.
3. The getByVdsName(String) method in VdsStaticDAO
(which was only used by the query), its implementation, and its
test.
4. The GetVdsStaticByVdsNam stored procedure
that was only used by the said DAO function.
Change-Id: I676cca49a2cc62c7b0716589ee26d2bcffd3cbb7
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M backend/manager/dbscripts/vds_sp.sql
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVdsWithSameNameExistQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVdsWithSameNameExistParameters.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
7 files changed, 0 insertions(+), 97 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/13290/1
diff --git a/backend/manager/dbscripts/vds_sp.sql
b/backend/manager/dbscripts/vds_sp.sql
index 7c874ce..74da6b0 100644
--- a/backend/manager/dbscripts/vds_sp.sql
+++ b/backend/manager/dbscripts/vds_sp.sql
@@ -504,24 +504,6 @@
--Vitaly add
-
-
-Create or replace FUNCTION GetVdsStaticByVdsName(v_vds_name VARCHAR(255))
RETURNS SETOF vds_static
- AS $procedure$
-BEGIN
-BEGIN
- RETURN QUERY SELECT vds_static.*
- FROM vds_static
- WHERE vds_name = v_vds_name;
- END;
-
- RETURN;
-END; $procedure$
-LANGUAGE plpgsql;
-
-
-
-
Create or replace FUNCTION GetVdsStaticByHostName(v_host_name VARCHAR(255))
RETURNS SETOF vds_static
AS $procedure$
BEGIN
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVdsWithSameNameExistQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVdsWithSameNameExistQuery.java
deleted file mode 100644
index f4095d9..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVdsWithSameNameExistQuery.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.*;
-
-public class IsVdsWithSameNameExistQuery<P extends
IsVdsWithSameNameExistParameters> extends QueriesCommandBase<P> {
- public IsVdsWithSameNameExistQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
-
getQueryReturnValue().setReturnValue(VdsHandler.isVdsWithSameNameExistStatic(getParameters().getVmName()));
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
index 3853004..e9c3103 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java
@@ -67,20 +67,12 @@
}
- public boolean isVdsWithSameNameExist(String vdsName) {
- return isVdsWithSameNameExistStatic(vdsName);
- }
-
public boolean isVdsWithSameHostExist(String hostName) {
return isVdsWithSameHostExistStatic(hostName);
}
public boolean isVdsWithSameIpExists(String ipAddress) {
return isVdsWithSameIpExistsStatic(ipAddress);
- }
-
- public static boolean isVdsWithSameNameExistStatic(String vdsName) {
- return DbFacade.getInstance().getVdsStaticDao().getByVdsName(vdsName)
!= null;
}
public static boolean isVdsWithSameHostExistStatic(String hostName) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVdsWithSameNameExistParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVdsWithSameNameExistParameters.java
deleted file mode 100644
index 6beef89..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVdsWithSameNameExistParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class IsVdsWithSameNameExistParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = 7065542492217271851L;
-
- public IsVdsWithSameNameExistParameters(String vdsName) {
- _vdsName = vdsName;
- }
-
- private String _vdsName;
-
- public String getVmName() {
- return _vdsName;
- }
-
- public IsVdsWithSameNameExistParameters() {
- }
-}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
index 3869acf..d24b406 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAO.java
@@ -12,15 +12,6 @@
*/
public interface VdsStaticDAO extends GenericDao<VdsStatic, Guid> {
/**
- * Finds the instance with the specified name.
- *
- * @param name
- * the name
- * @return the instance
- */
- VdsStatic getByVdsName(String name);
-
- /**
* Retrieves the instance for the given host name.
*
* @param hostname
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
index ebc5857..ae20d6e 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsStaticDAODbFacadeImpl.java
@@ -28,14 +28,6 @@
}
@Override
- public VdsStatic getByVdsName(String name) {
- return getCallsHandler().executeRead("GetVdsStaticByVdsName",
- VdsStaticRowMapper.instance,
- getCustomMapSqlParameterSource()
- .addValue("vds_name", name));
- }
-
- @Override
public VdsStatic getByHostName(String host) {
return getCallsHandler().executeRead("GetVdsStaticByHostName",
VdsStaticRowMapper.instance,
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
index 75edf24..8727903 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
@@ -59,28 +59,6 @@
}
/**
- * Ensures null is returned when the name is invalid.
- */
- @Test
- public void testGetByVdsNameWithInvalidName() {
- VdsStatic result = dao.getByVdsName("farkle");
-
- assertNull(result);
- }
-
- /**
- * Ensures that retrieving by name works.
- */
- @Test
- public void testGetByVdsName() {
- VdsStatic result = dao.getByVdsName(existingVds.getName());
-
- assertNotNull(result);
- assertEquals(existingVds.getName(), result.getName());
- }
-
-
- /**
* Ensures all the right VdsStatic instances are returned.
*/
@Test
--
To view, visit http://gerrit.ovirt.org/13290
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I676cca49a2cc62c7b0716589ee26d2bcffd3cbb7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
