Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetStorageServerConnectionsQuery
......................................................................
core: Remove GetStorageServerConnectionsQuery
GetStorageServerConnectionsQuery is not used anywhere in the code, and
hence should be removed.
This patch removes the following:
1. The GetStorageServerConnectionsQuery class
2. The GetStorageServerConnections constant representing it in
VdcQueryType
3. The getAll() method in StorageServerConnectionsDAO (which was only
used by the query), its implementation, and its test.
4. The GetAllFromstoage_server_connections stored procedure that was
only used by the said DAO function.
Note that the test for StorageServerConnectionsDao.get(Guid) is slightly
redone so it no longer depends on getAll()'s implementation.
Change-Id: I352f819dd3a7b272ccf1b39cfcf76cca62a8ee10
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M backend/manager/dbscripts/storages_san_sp.sql
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionsQuery.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java
6 files changed, 8 insertions(+), 64 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/13228/1
diff --git a/backend/manager/dbscripts/storages_san_sp.sql
b/backend/manager/dbscripts/storages_san_sp.sql
index 113ca95..fe9bbfa 100644
--- a/backend/manager/dbscripts/storages_san_sp.sql
+++ b/backend/manager/dbscripts/storages_san_sp.sql
@@ -413,20 +413,6 @@
-Create or replace FUNCTION GetAllFromstorage_server_connections()
-RETURNS SETOF storage_server_connections
- AS $procedure$
-BEGIN
- RETURN QUERY SELECT *
- FROM storage_server_connections;
-
-END; $procedure$
-LANGUAGE plpgsql;
-
-
-
-
-
Create or replace FUNCTION Getstorage_server_connectionsByid(v_id VARCHAR(50))
RETURNS SETOF storage_server_connections
AS $procedure$
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionsQuery.java
deleted file mode 100644
index 4af4daf..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageServerConnectionsQuery.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.ovirt.engine.core.bll.storage;
-
-import org.ovirt.engine.core.bll.*;
-import org.ovirt.engine.core.common.queries.*;
-import org.ovirt.engine.core.dal.dbbroker.*;
-
-public class GetStorageServerConnectionsQuery<P extends
VdcQueryParametersBase> extends QueriesCommandBase<P> {
- public GetStorageServerConnectionsQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
-
getQueryReturnValue().setReturnValue(DbFacade.getInstance().getStorageServerConnectionDao().getAll());
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
index 1bdb96b..30a5da7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
@@ -213,7 +213,6 @@
GetStorageDomainsByConnection,
GetStorageDomainsByStoragePoolId(VdcQueryAuthType.User),
GetStorageDomainsByImageId,
- GetStorageServerConnections,
GetVgList,
GetDeviceList,
DiscoverSendTargets,
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java
index c7f6c74..1926f1b 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java
@@ -31,13 +31,6 @@
StorageServerConnections getForIqn(String iqn);
/**
- * Retrieves all connections.
- *
- * @return the list of connections
- */
- List<StorageServerConnections> getAll();
-
- /**
* Retrieves all connections of Active/Unknown/InActive domains in the
specified storage pool.
*
* @param pool
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAODbFacadeImpl.java
index e952104..9ca64e1 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAODbFacadeImpl.java
@@ -3,13 +3,14 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
+
import org.ovirt.engine.core.common.businessentities.NfsVersion;
-import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
+import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacadeUtils;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
/**
* <code>StorageServerConnectionDAODbFacadeImpl</code> provides an
implementation of {@link StorageServerConnectionDAO}
@@ -30,13 +31,6 @@
return
getCallsHandler().executeRead("Getstorage_server_connectionsByIqn", mapper,
getCustomMapSqlParameterSource()
.addValue("iqn", iqn));
- }
-
- @Override
- public List<StorageServerConnections> getAll() {
- return
getCallsHandler().executeReadList("GetAllFromstorage_server_connections",
- mapper,
- getCustomMapSqlParameterSource());
}
@Override
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java
index 46f6469..258ac6a 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java
@@ -15,7 +15,6 @@
public class StorageServerConnectionDAOTest extends BaseDAOTestCase {
private static final int SERVER_CONNECTION_COUNT_FOR_SPECIFIC_STORAGE = 7;
- private static final int SERVER_CONNECTION_COUNT = 9;
private static final String EXISTING_DOMAIN_STORAGE_NAME =
"fDMzhE-wx3s-zo3q-Qcxd-T0li-yoYU-QvVePk";
private static final Guid EXISTING_STORAGE_POOL_ID = new
Guid("6d849ebf-755f-4552-ad09-9a090cda105d");
@@ -75,18 +74,6 @@
}
/**
- * Ensures all server connections are returned.
- */
- @Test
- public void testgetAll() {
- List<StorageServerConnections> result = dao.getAll();
-
- assertNotNull(result);
- assertFalse(result.isEmpty());
- assertEquals(SERVER_CONNECTION_COUNT, result.size());
- }
-
- /**
* @return
*/
@Test
@@ -138,13 +125,14 @@
*/
@Test
public void testSaveServerConnection() {
- List<StorageServerConnections> before = dao.getAll();
+ StorageServerConnections conn = dao.get(newServerConnection.getid());
+ assertNull(conn);
dao.save(newServerConnection);
- List<StorageServerConnections> after = dao.getAll();
+ conn = dao.get(newServerConnection.getid());
- assertEquals(before.size() + 1, after.size());
+ assertEquals(newServerConnection, conn);
}
/**
--
To view, visit http://gerrit.ovirt.org/13228
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I352f819dd3a7b272ccf1b39cfcf76cca62a8ee10
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
