Allon Mureinik has uploaded a new change for review.
Change subject: engine: Remove name query parameters containers
......................................................................
engine: Remove name query parameters containers
This patch removes all the query parameter classes that are nothing more
than containers for an entity name and replaces all their usages with
NameQueryParameters.
Change-Id: Ie17feb6bb06323b090dafeefa00ea96c4cc4d5a4
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByNameQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByNameQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmPoolWithSameNameExistsQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQuery.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQueryTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQueryTest.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMNameParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMTemplateNameParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParametersBase.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsByNameParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsGroupByNameParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmPoolWithSameNameExistsParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmTemlateWithSameNameExistParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmWithSameNameExistParameters.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/MultilevelAdministrationByRoleNameParameters.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NameQueryParameters.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagsResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java
34 files changed, 93 insertions(+), 260 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/15182/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQuery.java
index fdb60f5..12ff60d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQuery.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll;
-import org.ovirt.engine.core.common.queries.GetAllAuditLogsByVMNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
/** A query to return all the Audit Logs according to a given VM name */
-public class GetAllAuditLogsByVMNameQuery<P extends
GetAllAuditLogsByVMNameParameters> extends QueriesCommandBase<P> {
+public class GetAllAuditLogsByVMNameQuery<P extends NameQueryParameters>
extends QueriesCommandBase<P> {
public GetAllAuditLogsByVMNameQuery(P parameters) {
super(parameters);
@@ -14,6 +14,6 @@
protected void executeQueryCommand() {
getQueryReturnValue().setReturnValue(
getDbFacade().getAuditLogDao()
- .getAllByVMName(getParameters().getVmName(),
getUserID(), getParameters().isFiltered()));
+ .getAllByVMName(getParameters().getName(),
getUserID(), getParameters().isFiltered()));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQuery.java
index d088c40..a52e2f0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQuery.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll;
-import
org.ovirt.engine.core.common.queries.GetAllAuditLogsByVMTemplateNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
/** A query to return all the Audit Logs according to a given VM Template name
*/
-public class GetAllAuditLogsByVMTemplateNameQuery<P extends
GetAllAuditLogsByVMTemplateNameParameters> extends QueriesCommandBase<P> {
+public class GetAllAuditLogsByVMTemplateNameQuery<P extends
NameQueryParameters> extends QueriesCommandBase<P> {
public GetAllAuditLogsByVMTemplateNameQuery(P parameters) {
super(parameters);
@@ -14,7 +14,7 @@
protected void executeQueryCommand() {
getQueryReturnValue().setReturnValue(
getDbFacade().getAuditLogDao().getAllByVMTemplateName(
- getParameters().getVmTemplateName(),
+ getParameters().getName(),
getUserID(),
getParameters().isFiltered()));
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java
index 9b3afcc..c93173b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRoleByNameQuery.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll;
-import
org.ovirt.engine.core.common.queries.MultilevelAdministrationByRoleNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-public class GetRoleByNameQuery<P extends
MultilevelAdministrationByRoleNameParameters> extends QueriesCommandBase<P> {
+public class GetRoleByNameQuery<P extends NameQueryParameters> extends
QueriesCommandBase<P> {
public GetRoleByNameQuery(P parameters)
{
@@ -14,6 +14,6 @@
protected void executeQueryCommand() {
getQueryReturnValue().setReturnValue(DbFacade.getInstance()
.getRoleDao()
- .getByName(getParameters().getRoleName()));
+ .getByName(getParameters().getName()));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java
index 0b2016c..d7f1864 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetTagByTagNameQuery.java
@@ -1,14 +1,14 @@
package org.ovirt.engine.core.bll;
-import org.ovirt.engine.core.common.queries.GetTagByTagNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
-public class GetTagByTagNameQuery<P extends GetTagByTagNameParameters> extends
QueriesCommandBase<P> {
+public class GetTagByTagNameQuery<P extends NameQueryParameters> extends
QueriesCommandBase<P> {
public GetTagByTagNameQuery(P parameters) {
super(parameters);
}
@Override
protected void executeQueryCommand() {
-
getQueryReturnValue().setReturnValue(TagsDirector.getInstance().GetTagByName(getParameters().getTagName()));
+
getQueryReturnValue().setReturnValue(TagsDirector.getInstance().GetTagByName(getParameters().getName()));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByNameQuery.java
index 7980187..107b9ea 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByNameQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByNameQuery.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll;
import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.queries.GetVdsByNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
-public class GetVdsByNameQuery<P extends GetVdsByNameParameters> extends
QueriesCommandBase<P> {
+public class GetVdsByNameQuery<P extends NameQueryParameters> extends
QueriesCommandBase<P> {
public GetVdsByNameQuery(P parameters) {
super(parameters);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByNameQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByNameQuery.java
index 5989bed..9c51f5d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByNameQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupByNameQuery.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.bll;
-import org.ovirt.engine.core.common.queries.GetVdsGroupByNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
-public class GetVdsGroupByNameQuery<P extends GetVdsGroupByNameParameters>
extends QueriesCommandBase<P> {
+public class GetVdsGroupByNameQuery<P extends NameQueryParameters> extends
QueriesCommandBase<P> {
public GetVdsGroupByNameQuery(P parameters) {
super(parameters);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmPoolWithSameNameExistsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmPoolWithSameNameExistsQuery.java
index b7a77f5..25ad402 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmPoolWithSameNameExistsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmPoolWithSameNameExistsQuery.java
@@ -1,9 +1,9 @@
package org.ovirt.engine.core.bll;
-import
org.ovirt.engine.core.common.queries.IsVmPoolWithSameNameExistsParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
-public class IsVmPoolWithSameNameExistsQuery<P extends
IsVmPoolWithSameNameExistsParameters>
+public class IsVmPoolWithSameNameExistsQuery<P extends NameQueryParameters>
extends QueriesCommandBase<P> {
public IsVmPoolWithSameNameExistsQuery(P parameters) {
super(parameters);
@@ -12,6 +12,6 @@
@Override
protected void executeQueryCommand() {
getQueryReturnValue().setReturnValue(
-
DbFacade.getInstance().getVmPoolDao().getByName(getParameters().getVmPoolName())
!= null);
+
DbFacade.getInstance().getVmPoolDao().getByName(getParameters().getName()) !=
null);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java
index e6b4f78..b50286b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmTemlateWithSameNameExistQuery.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.bll;
-import
org.ovirt.engine.core.common.queries.IsVmTemlateWithSameNameExistParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
-public class IsVmTemlateWithSameNameExistQuery<P extends
IsVmTemlateWithSameNameExistParameters>
+public class IsVmTemlateWithSameNameExistQuery<P extends NameQueryParameters>
extends QueriesCommandBase<P> {
public IsVmTemlateWithSameNameExistQuery(P parameters) {
super(parameters);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQuery.java
index d6ed821..c38f9a5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQuery.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.bll;
-import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
-public class IsVmWithSameNameExistQuery<P extends
IsVmWithSameNameExistParameters> extends QueriesCommandBase<P> {
+public class IsVmWithSameNameExistQuery<P extends NameQueryParameters> extends
QueriesCommandBase<P> {
public IsVmWithSameNameExistQuery(P parameters) {
super(parameters);
}
@@ -13,6 +13,6 @@
}
protected boolean isVmWithSameNameExistStatic() {
- return
VmHandler.isVmWithSameNameExistStatic(getParameters().getVmName());
+ return
VmHandler.isVmWithSameNameExistStatic(getParameters().getName());
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQueryTest.java
index d3142e7..90a4aaa 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMNameQueryTest.java
@@ -9,18 +9,18 @@
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.AuditLog;
-import org.ovirt.engine.core.common.queries.GetAllAuditLogsByVMNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.dao.AuditLogDAO;
import org.ovirt.engine.core.utils.RandomUtils;
/** A test case for the {@link GetAllAuditLogsByVMNameQuery} class. */
-public class GetAllAuditLogsByVMNameQueryTest extends
AbstractUserQueryTest<GetAllAuditLogsByVMNameParameters,
GetAllAuditLogsByVMNameQuery<? extends GetAllAuditLogsByVMNameParameters>> {
+public class GetAllAuditLogsByVMNameQueryTest extends
AbstractUserQueryTest<NameQueryParameters, GetAllAuditLogsByVMNameQuery<?
extends NameQueryParameters>> {
@Test
public void testExecuteQueryCommand() {
// Mock the Query Parameters
String vmName = RandomUtils.instance().nextString(10, true);
- when(getQueryParameters().getVmName()).thenReturn(vmName);
+ when(getQueryParameters().getName()).thenReturn(vmName);
// Set up the expected result
AuditLog expectedResult = new AuditLog();
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQueryTest.java
index 1c8b3df..4f3006b 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllAuditLogsByVMTemplateNameQueryTest.java
@@ -9,19 +9,19 @@
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.AuditLog;
-import
org.ovirt.engine.core.common.queries.GetAllAuditLogsByVMTemplateNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.dao.AuditLogDAO;
import org.ovirt.engine.core.utils.RandomUtils;
/** A test case for the {@link GetAllAuditLogsByVMTemplateNameQuery} class. */
public class GetAllAuditLogsByVMTemplateNameQueryTest
- extends
AbstractUserQueryTest<GetAllAuditLogsByVMTemplateNameParameters,
GetAllAuditLogsByVMTemplateNameQuery<? extends
GetAllAuditLogsByVMTemplateNameParameters>> {
+ extends AbstractUserQueryTest<NameQueryParameters,
GetAllAuditLogsByVMTemplateNameQuery<? extends NameQueryParameters>> {
@Test
public void testExecuteQueryCommand() {
// Mock the Query Parameters
String vmTemplateName = RandomUtils.instance().nextString(10, true);
-
when(getQueryParameters().getVmTemplateName()).thenReturn(vmTemplateName);
+ when(getQueryParameters().getName()).thenReturn(vmTemplateName);
// Set up the expected result
AuditLog expectedResult = new AuditLog();
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQueryTest.java
index 7580636..65e08cc 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/IsVmWithSameNameExistQueryTest.java
@@ -5,17 +5,17 @@
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.utils.RandomUtils;
/** A test case for the {@link IsVmWithSameNameExistQuery} class. */
-public class IsVmWithSameNameExistQueryTest extends
AbstractUserQueryTest<IsVmWithSameNameExistParameters,
IsVmWithSameNameExistQuery<IsVmWithSameNameExistParameters>> {
+public class IsVmWithSameNameExistQueryTest extends
AbstractUserQueryTest<NameQueryParameters,
IsVmWithSameNameExistQuery<NameQueryParameters>> {
@Test
public void testExecuteQuery() {
// Mock the parameters
String vmName = RandomUtils.instance().nextString(10);
- when(getQueryParameters().getVmName()).thenReturn(vmName);
+ when(getQueryParameters().getName()).thenReturn(vmName);
// Mock the result
boolean result = RandomUtils.instance().nextBoolean();
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMNameParameters.java
deleted file mode 100644
index 0973150..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMNameParameters.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetAllAuditLogsByVMNameParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = -7548846146921429465L;
-
- /** The name of the VM to query Audit Logs by */
- private String vmName;
-
- public GetAllAuditLogsByVMNameParameters(String vmName) {
- this.vmName = vmName;
- }
-
- public GetAllAuditLogsByVMNameParameters() {
- }
-
- /** @return The name of the VM to query by */
- public String getVmName() {
- return vmName;
- }
-
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMTemplateNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMTemplateNameParameters.java
deleted file mode 100644
index 39df5d5..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllAuditLogsByVMTemplateNameParameters.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetAllAuditLogsByVMTemplateNameParameters extends
VdcQueryParametersBase {
- private static final long serialVersionUID = -2914402501834292594L;
-
- /** The name of the VM to query Audit Logs by */
- private String vmTemplateName;
-
- public GetAllAuditLogsByVMTemplateNameParameters(String vmTemplateName) {
- this.vmTemplateName = vmTemplateName;
- }
-
- public GetAllAuditLogsByVMTemplateNameParameters() {
- }
-
- /** @return The name of the VM to query by */
- public String getVmTemplateName() {
- return vmTemplateName;
- }
-
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParameters.java
deleted file mode 100644
index 3999d62..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParameters.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetTagByTagNameParameters extends GetTagByTagNameParametersBase {
- private static final long serialVersionUID = -3972142919748561620L;
-
- public GetTagByTagNameParameters(String tagName) {
- super(tagName);
- }
-
- public GetTagByTagNameParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParametersBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParametersBase.java
deleted file mode 100644
index 06cb16d..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetTagByTagNameParametersBase.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetTagByTagNameParametersBase extends VdcQueryParametersBase {
- private static final long serialVersionUID = -4620515574262550994L;
-
- public GetTagByTagNameParametersBase(String tagName) {
- _tagName = tagName;
- }
-
- private String _tagName;
-
- public String getTagName() {
- return _tagName;
- }
-
- public GetTagByTagNameParametersBase() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsByNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsByNameParameters.java
deleted file mode 100644
index 7260fad..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsByNameParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetVdsByNameParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = -5403234842490143970L;
-
- public GetVdsByNameParameters(String name) {
- _name = name;
- }
-
- private String _name;
-
- public String getName() {
- return _name;
- }
-
- public GetVdsByNameParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsGroupByNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsGroupByNameParameters.java
deleted file mode 100644
index 4ef7d24..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVdsGroupByNameParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class GetVdsGroupByNameParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = 1225647647659382659L;
-
- public GetVdsGroupByNameParameters(String name) {
- _name = name;
- }
-
- private String _name;
-
- public String getName() {
- return _name;
- }
-
- public GetVdsGroupByNameParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmPoolWithSameNameExistsParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmPoolWithSameNameExistsParameters.java
deleted file mode 100644
index 76446d1..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmPoolWithSameNameExistsParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class IsVmPoolWithSameNameExistsParameters extends
VdcQueryParametersBase {
- private static final long serialVersionUID = -3533344997052757929L;
-
- public IsVmPoolWithSameNameExistsParameters(String vmPoolName) {
- _vmPoolName = vmPoolName;
- }
-
- private String _vmPoolName;
-
- public String getVmPoolName() {
- return _vmPoolName;
- }
-
- public IsVmPoolWithSameNameExistsParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmTemlateWithSameNameExistParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmTemlateWithSameNameExistParameters.java
deleted file mode 100644
index 5ecf9f1..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmTemlateWithSameNameExistParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class IsVmTemlateWithSameNameExistParameters extends
VdcQueryParametersBase {
- private static final long serialVersionUID = -6485460471694366238L;
-
- public IsVmTemlateWithSameNameExistParameters(String name) {
- _name = name;
- }
-
- private String _name;
-
- public String getName() {
- return _name;
- }
-
- public IsVmTemlateWithSameNameExistParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmWithSameNameExistParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmWithSameNameExistParameters.java
deleted file mode 100644
index 418184a..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IsVmWithSameNameExistParameters.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class IsVmWithSameNameExistParameters extends VdcQueryParametersBase {
- private static final long serialVersionUID = -329586454172262561L;
-
- public IsVmWithSameNameExistParameters(String vmName) {
- _vmName = vmName;
- }
-
- private String _vmName;
-
- public String getVmName() {
- return _vmName;
- }
-
- public IsVmWithSameNameExistParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/MultilevelAdministrationByRoleNameParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/MultilevelAdministrationByRoleNameParameters.java
deleted file mode 100644
index 6c458bf..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/MultilevelAdministrationByRoleNameParameters.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.ovirt.engine.core.common.queries;
-
-public class MultilevelAdministrationByRoleNameParameters extends
MultilevelAdministrationsQueriesParameters {
- private static final long serialVersionUID = 584607807898620094L;
-
- private String privateRoleName;
-
- public String getRoleName() {
- return privateRoleName;
- }
-
- private void setRoleName(String value) {
- privateRoleName = value;
- }
-
- public MultilevelAdministrationByRoleNameParameters(String roleName) {
- setRoleName(roleName);
- }
-
- public MultilevelAdministrationByRoleNameParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NameQueryParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NameQueryParameters.java
new file mode 100644
index 0000000..9277749
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/NameQueryParameters.java
@@ -0,0 +1,22 @@
+package org.ovirt.engine.core.common.queries;
+
+
+/**
+ * Parameter class for the "GetByName" queries
+ */
+public class NameQueryParameters extends VdcQueryParametersBase {
+
+ private static final long serialVersionUID = 4281700157334399396L;
+ private String name;
+
+ public NameQueryParameters() {
+ }
+
+ public NameQueryParameters(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
index cd5a4d0..8c177a4 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
@@ -12,18 +12,17 @@
import org.ovirt.engine.api.common.util.StatusUtils;
import org.ovirt.engine.api.model.Action;
import org.ovirt.engine.api.model.BaseResource;
-import org.ovirt.engine.api.model.Host;
import org.ovirt.engine.api.model.CreationStatus;
+import org.ovirt.engine.api.model.Host;
import org.ovirt.engine.api.resource.ActionResource;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
-import org.ovirt.engine.core.common.queries.GetVdsByNameParameters;
+import org.ovirt.engine.core.common.businessentities.VDS;
+import org.ovirt.engine.core.common.interfaces.SearchType;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
-import org.ovirt.engine.core.common.businessentities.VDS;
-
-import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.compat.Guid;
@@ -60,7 +59,7 @@
protected Object resolveCreated(VdcReturnValueBase result, EntityResolver
entityResolver, Class<? extends BaseResource> suggestedParentType) {
try {
- return entityResolver.resolve((Guid)result.getActionReturnValue());
+ return entityResolver.resolve(result.getActionReturnValue());
} catch (Exception e) {
// we tolerate a failure in the entity resolution
// as the substantive action (entity creation) has
@@ -152,7 +151,7 @@
? new Guid(host.getId())
: getEntity(VDS.class,
VdcQueryType.GetVdsByName,
- new GetVdsByNameParameters(host.getName()),
+ new NameQueryParameters(host.getName()),
host.getName()).getId();
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
index 10c79ce..6ed365c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResource.java
@@ -15,7 +15,7 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.permissions;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
-import
org.ovirt.engine.core.common.queries.MultilevelAdministrationByRoleNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -41,8 +41,8 @@
org.ovirt.engine.core.common.businessentities.Role entity =
getEntity(
org.ovirt.engine.core.common.businessentities.Role.class,
VdcQueryType.GetRoleByName,
- new
MultilevelAdministrationByRoleNameParameters(role.getName()),
-
role.getName());
+ new NameQueryParameters(role.getName()),
+ role.getName());
role.setId(entity.getId().toString());
}
return performCreate(VdcActionType.AddSystemPermission,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagsResource.java
index 9ae55ec..ced953a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagsResource.java
@@ -4,17 +4,15 @@
import javax.ws.rs.core.Response;
-
import org.ovirt.engine.api.model.Tag;
import org.ovirt.engine.api.model.Tags;
import org.ovirt.engine.api.resource.TagResource;
import org.ovirt.engine.api.resource.TagsResource;
-
import org.ovirt.engine.core.common.action.TagsActionParametersBase;
import org.ovirt.engine.core.common.action.TagsOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.queries.GetTagByTagNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -83,7 +81,7 @@
}
protected tags lookupTagByName(String name) {
- return getEntity(tags.class, VdcQueryType.GetTagByTagName, new
GetTagByTagNameParameters(name), name);
+ return getEntity(tags.class, VdcQueryType.GetTagByTagName, new
NameQueryParameters(name), name);
}
protected class TagNameResolver extends EntityIdResolver<Guid> {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
index b75b223..69e7e68 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
@@ -43,9 +43,9 @@
import org.ovirt.engine.core.common.businessentities.VmStatic;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
import org.ovirt.engine.core.common.interfaces.SearchType;
-import org.ovirt.engine.core.common.queries.GetVdsGroupByNameParameters;
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
@@ -442,7 +442,7 @@
}
public VDSGroup lookupClusterByName(String name) {
- return getEntity(VDSGroup.class, VdcQueryType.GetVdsGroupByName, new
GetVdsGroupByNameParameters(name), "GetVdsGroupByName");
+ return getEntity(VDSGroup.class, VdcQueryType.GetVdsGroupByName, new
NameQueryParameters(name), "GetVdsGroupByName");
}
protected void setBallooning(VM vm) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java
index 648bcc6..2253699 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAssignedRolesResourceTest.java
@@ -14,7 +14,7 @@
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.permissions;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
-import
org.ovirt.engine.core.common.queries.MultilevelAdministrationByRoleNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -133,8 +133,8 @@
public void testAddAssignedRoleByName() throws Exception {
setUriInfo(setUpBasicUriExpectations());
setUpGetEntityExpectations(VdcQueryType.GetRoleByName,
- MultilevelAdministrationByRoleNameParameters.class,
- new String[] { "RoleName" },
+ NameQueryParameters.class,
+ new String[] { "Name" },
new Object[] { NAMES[1] },
getRole());
setUpCreationExpectations(VdcActionType.AddSystemPermission,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagResourceTest.java
index 4dd6338..81b699a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagResourceTest.java
@@ -14,8 +14,8 @@
import org.ovirt.engine.core.common.action.TagsOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.queries.GetTagByTagNameParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -106,8 +106,8 @@
@Test
public void testMoveNamedParent() throws Exception {
setUpEntityQueryExpectations(VdcQueryType.GetTagByTagName,
- GetTagByTagNameParameters.class,
- new String[] { "TagName" },
+ NameQueryParameters.class,
+ new String[] { "Name" },
new Object[] { NAMES[PARENT_IDX] },
getEntity(NEW_PARENT_IDX));
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
index e714c8e..2cef3a3 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
@@ -20,8 +20,8 @@
import org.ovirt.engine.core.common.action.TagsOperationParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.tags;
-import org.ovirt.engine.core.common.queries.GetTagByTagNameParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -136,8 +136,8 @@
true,
null,
VdcQueryType.GetTagByTagName,
- GetTagByTagNameParameters.class,
- new String[] { "TagName" },
+ NameQueryParameters.class,
+ new String[] { "Name" },
new Object[] { NAMES[0] },
getEntity(0));
@@ -152,8 +152,8 @@
setUriInfo(setUpBasicUriExpectations());
setUpEntityQueryExpectations(VdcQueryType.GetTagByTagName,
- GetTagByTagNameParameters.class,
- new String[] { "TagName" },
+ NameQueryParameters.class,
+ new String[] { "Name" },
new Object[] { NAMES[PARENT_IDX] },
getEntity(PARENT_IDX));
@@ -165,8 +165,8 @@
true,
null,
VdcQueryType.GetTagByTagName,
- GetTagByTagNameParameters.class,
- new String[] { "TagName" },
+ NameQueryParameters.class,
+ new String[] { "Name" },
new Object[] { NAMES[0] },
getEntity(0));
@@ -195,8 +195,8 @@
true,
null,
VdcQueryType.GetTagByTagName,
- GetTagByTagNameParameters.class,
- new String[] { "TagName" },
+ NameQueryParameters.class,
+ new String[] { "Name" },
new Object[] { NAMES[0] },
entity);
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
index 8fdd860..534a43d 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
@@ -59,8 +59,8 @@
import org.ovirt.engine.core.common.businessentities.VmPayload;
import org.ovirt.engine.core.common.businessentities.VmStatistics;
import org.ovirt.engine.core.common.interfaces.SearchType;
-import org.ovirt.engine.core.common.queries.GetVdsByNameParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.utils.VmDeviceType;
import org.ovirt.engine.core.compat.Guid;
@@ -733,7 +733,7 @@
protected void setUpGetHostIdExpectations(int idx) throws Exception {
VDS host =
BackendHostsResourceTest.setUpEntityExpectations(control.createMock(VDS.class),
idx);
setUpGetEntityExpectations(VdcQueryType.GetVdsByName,
- GetVdsByNameParameters.class,
+ NameQueryParameters.class,
new String[] { "Name" },
new Object[] { NAMES[idx] },
host);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 266deeb..7f33ff2 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -76,10 +76,8 @@
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters;
-import
org.ovirt.engine.core.common.queries.IsVmPoolWithSameNameExistsParameters;
-import
org.ovirt.engine.core.common.queries.IsVmTemlateWithSameNameExistParameters;
-import org.ovirt.engine.core.common.queries.IsVmWithSameNameExistParameters;
import
org.ovirt.engine.core.common.queries.MultilevelAdministrationsQueriesParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.ServerParameters;
import
org.ovirt.engine.core.common.queries.StorageServerConnectionQueryParametersBase;
@@ -1254,7 +1252,7 @@
}
};
Frontend.RunQuery(VdcQueryType.IsVmTemlateWithSameNameExist,
- new IsVmTemlateWithSameNameExistParameters(name),
+ new NameQueryParameters(name),
aQuery);
}
@@ -1266,7 +1264,7 @@
return source != null ? !((Boolean) source).booleanValue() :
false;
}
};
- Frontend.RunQuery(VdcQueryType.IsVmWithSameNameExist, new
IsVmWithSameNameExistParameters(name), aQuery);
+ Frontend.RunQuery(VdcQueryType.IsVmWithSameNameExist, new
NameQueryParameters(name), aQuery);
}
public static void getDataCentersWithPermittedActionOnClusters(AsyncQuery
aQuery, ActionGroup actionGroup,
@@ -2011,7 +2009,7 @@
}
};
Frontend.RunQuery(VdcQueryType.IsVmPoolWithSameNameExists,
- new IsVmPoolWithSameNameExistsParameters(name),
+ new NameQueryParameters(name),
aQuery);
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java
index d1fd300..14d93b4 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/UserPortalTemplateEventListModel.java
@@ -5,7 +5,7 @@
import org.ovirt.engine.core.common.businessentities.AuditLog;
import org.ovirt.engine.core.common.businessentities.VmTemplate;
-import
org.ovirt.engine.core.common.queries.GetAllAuditLogsByVMTemplateNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.ui.uicommonweb.Linq;
@@ -18,7 +18,7 @@
}
super.syncSearch(VdcQueryType.GetAllAuditLogsByVMTemplateName,
- new
GetAllAuditLogsByVMTemplateNameParameters(getEntity().getName()));
+ new NameQueryParameters(getEntity().getName()));
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java
index f0ccace..201be6c 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UserPortalVmEventListModel.java
@@ -5,7 +5,7 @@
import org.ovirt.engine.core.common.businessentities.AuditLog;
import org.ovirt.engine.core.common.businessentities.VM;
-import org.ovirt.engine.core.common.queries.GetAllAuditLogsByVMNameParameters;
+import org.ovirt.engine.core.common.queries.NameQueryParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.ui.uicommonweb.Linq;
@@ -19,7 +19,7 @@
VM vm = (VM) getEntity();
- super.syncSearch(VdcQueryType.GetAllAuditLogsByVMName, new
GetAllAuditLogsByVMNameParameters(vm.getName()));
+ super.syncSearch(VdcQueryType.GetAllAuditLogsByVMName, new
NameQueryParameters(vm.getName()));
}
@Override
--
To view, visit http://gerrit.ovirt.org/15182
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie17feb6bb06323b090dafeefa00ea96c4cc4d5a4
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
