Allon Mureinik has uploaded a new change for review.
Change subject: core: Removed the unused GetImageByImageIdQuery
......................................................................
core: Removed the unused GetImageByImageIdQuery
This patch removes the unused query GetImageByImageIdQuery.
This patch contains:
1. Removing aforementioned class, which has no usages in the code.
2. Removed the GetImageByImageId constant from VdcQueryType.
3. Renamed GetImageByImageIdParameters to
GetStorageDomainsByImageIdParameters since
GetStorageDomainsByImageIdQuery is now the only class that uses it.
Change-Id: Iae7d64612863aac3c0e0721b57dcb3f7e4b74092
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImageByImageIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQuery.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQueryTest.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImageByImageIdParameters.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainsByImageIdParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
7 files changed, 29 insertions(+), 45 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/13137/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImageByImageIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImageByImageIdQuery.java
deleted file mode 100644
index 9747a70..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetImageByImageIdQuery.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import org.ovirt.engine.core.common.queries.GetImageByImageIdParameters;
-
-public class GetImageByImageIdQuery<P extends GetImageByImageIdParameters>
- extends QueriesCommandBase<P> {
- public GetImageByImageIdQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
-
getQueryReturnValue().setReturnValue(getDbFacade().getDiskImageDao().get(getParameters().getImageId()));
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQuery.java
index ad651c6..c831b20 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQuery.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll.storage;
import org.ovirt.engine.core.bll.QueriesCommandBase;
-import org.ovirt.engine.core.common.queries.GetImageByImageIdParameters;
+import
org.ovirt.engine.core.common.queries.GetStorageDomainsByImageIdParameters;
-public class GetStorageDomainsByImageIdQuery<P extends
GetImageByImageIdParameters>
+public class GetStorageDomainsByImageIdQuery<P extends
GetStorageDomainsByImageIdParameters>
extends QueriesCommandBase<P> {
public GetStorageDomainsByImageIdQuery(P parameters) {
super(parameters);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQueryTest.java
index 41d1990..5ef059f 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/GetStorageDomainsByImageIdQueryTest.java
@@ -12,12 +12,12 @@
import org.ovirt.engine.core.bll.AbstractQueryTest;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
-import org.ovirt.engine.core.common.queries.GetImageByImageIdParameters;
+import
org.ovirt.engine.core.common.queries.GetStorageDomainsByImageIdParameters;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dao.StorageDomainDAO;
/** A test case for the {@link GetStorageDomainsByImageIdQuery} class. */
-public class GetStorageDomainsByImageIdQueryTest extends
AbstractQueryTest<GetImageByImageIdParameters,
GetStorageDomainsByImageIdQuery<GetImageByImageIdParameters>> {
+public class GetStorageDomainsByImageIdQueryTest extends
AbstractQueryTest<GetStorageDomainsByImageIdParameters,
GetStorageDomainsByImageIdQuery<GetStorageDomainsByImageIdParameters>> {
@Test
public void testExecuteQueryCommandWithEmptyList() {
@@ -32,7 +32,7 @@
when(storageDomainDAOMock.getAllStorageDomainsByImageId(imageId)).thenReturn(expected);
// Run the query
- GetStorageDomainsByImageIdQuery<GetImageByImageIdParameters> query =
getQuery();
+ GetStorageDomainsByImageIdQuery<GetStorageDomainsByImageIdParameters>
query = getQuery();
query.executeQueryCommand();
// Assert the result
@@ -79,7 +79,7 @@
when(storageDomainDAOMock.getAllStorageDomainsByImageId(imageId)).thenReturn(expected);
// Run the query
- GetStorageDomainsByImageIdQuery<GetImageByImageIdParameters> query =
getQuery();
+ GetStorageDomainsByImageIdQuery<GetStorageDomainsByImageIdParameters>
query = getQuery();
query.executeQueryCommand();
// Assert the result
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImageByImageIdParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImageByImageIdParameters.java
deleted file mode 100644
index 4fee674..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetImageByImageIdParameters.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetImageByImageIdParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = 8163118634744815433L;
-
- public GetImageByImageIdParameters(Guid imageId) {
- _imageId = imageId;
- }
-
- private Guid _imageId = new Guid();
-
- public Guid getImageId() {
- return _imageId;
- }
-
- public GetImageByImageIdParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainsByImageIdParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainsByImageIdParameters.java
new file mode 100644
index 0000000..1d77914
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainsByImageIdParameters.java
@@ -0,0 +1,20 @@
+package org.ovirt.engine.core.common.queries;
+
+import org.ovirt.engine.core.compat.Guid;
+
+public class GetStorageDomainsByImageIdParameters extends
VdcQueryParametersBase {
+ private static final long serialVersionUID = 8163118634744815433L;
+
+ public GetStorageDomainsByImageIdParameters(Guid imageId) {
+ _imageId = imageId;
+ }
+
+ private Guid _imageId = new Guid();
+
+ public Guid getImageId() {
+ return _imageId;
+ }
+
+ public GetStorageDomainsByImageIdParameters() {
+ }
+}
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 0530375..5bc028b 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
@@ -98,7 +98,6 @@
GetAllDisks(VdcQueryAuthType.User),
GetUnregisteredDisks,
GetUnregisteredDisk,
- GetImageByImageId,
GetDiskByDiskId(VdcQueryAuthType.User),
// Users queries
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
index 646264d..e794028 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskStorageListModel.java
@@ -4,7 +4,7 @@
import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
-import org.ovirt.engine.core.common.queries.GetImageByImageIdParameters;
+import
org.ovirt.engine.core.common.queries.GetStorageDomainsByImageIdParameters;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.ui.frontend.AsyncQuery;
@@ -53,8 +53,8 @@
}
};
- GetImageByImageIdParameters getImageByImageIdParameters =
- new GetImageByImageIdParameters(diskImage.getImageId());
+ GetStorageDomainsByImageIdParameters getImageByImageIdParameters =
+ new
GetStorageDomainsByImageIdParameters(diskImage.getImageId());
getImageByImageIdParameters.setRefresh(getIsQueryFirstTime());
Frontend.RunQuery(VdcQueryType.GetStorageDomainsByImageId,
getImageByImageIdParameters, _asyncQuery);
--
To view, visit http://gerrit.ovirt.org/13137
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae7d64612863aac3c0e0721b57dcb3f7e4b74092
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
