Ravi Nori has uploaded a new change for review.
Change subject: restapi : Remove dependency of VdcQueryParametersBase from core
classes
......................................................................
restapi : Remove dependency of VdcQueryParametersBase from core classes
Removes the dependency of VdcQueryParametersBase class
from the core api classes and used VdcParametersMap instead.
Change-Id: I91ae715c7c0325a706bbaf18f755865307e93d3a
Signed-off-by: Ravi Nori <rn...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDevicesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/SessionHelper.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
13 files changed, 51 insertions(+), 61 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/21484/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
index c0df979..3fbf5a51 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
@@ -18,7 +18,6 @@
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.SearchParameters;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.utils.VdcParametersMap;
import org.ovirt.engine.core.compat.Guid;
@@ -98,7 +97,7 @@
return searchParams;
}
- protected List<Q> getBackendCollection(VdcQueryType query,
VdcQueryParametersBase queryParams) {
+ protected <T extends VdcParametersMap> List<Q>
getBackendCollection(VdcQueryType query, T queryParams) {
return getBackendCollection(entityType, query, queryParams);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDevicesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDevicesResource.java
index 9b27bac..198cc23 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDevicesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDevicesResource.java
@@ -8,7 +8,6 @@
import org.ovirt.engine.api.resource.DevicesResource;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
import
org.ovirt.engine.api.restapi.resource.AbstractBackendSubResource.ParametersProvider;
@@ -23,12 +22,12 @@
protected VdcActionType removeAction;
protected VdcActionType updateType;
- public AbstractBackendDevicesResource(Class<D> modelType,
+ public <T extends VdcParametersMap>
AbstractBackendDevicesResource(Class<D> modelType,
Class<C> collectionType,
Class<Q> entityType,
Guid parentId,
VdcQueryType queryType,
- VdcQueryParametersBase queryParams,
+ T queryParams,
VdcActionType addAction,
VdcActionType removeAction,
VdcActionType updateType,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
index 5a516bf..8304b76 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendReadOnlyDevicesResource.java
@@ -11,8 +11,8 @@
import org.ovirt.engine.api.resource.ReadOnlyDeviceResource;
import org.ovirt.engine.api.resource.ReadOnlyDevicesResource;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryType;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
import org.ovirt.engine.core.compat.Guid;
public abstract class AbstractBackendReadOnlyDevicesResource<D extends
BaseDevice, C extends BaseDevices, Q extends IVdcQueryable>
@@ -22,14 +22,14 @@
protected Class<C> collectionType;
protected Guid parentId;
protected VdcQueryType queryType;
- protected VdcQueryParametersBase queryParams;
+ protected VdcParametersMap queryParams;
- public AbstractBackendReadOnlyDevicesResource(Class<D> modelType,
+ public <T extends VdcParametersMap>
AbstractBackendReadOnlyDevicesResource(Class<D> modelType,
Class<C> collectionType,
Class<Q> entityType,
Guid parentId,
VdcQueryType queryType,
- VdcQueryParametersBase
queryParams,
+ T queryParams,
String... subCollections) {
super(modelType, entityType, subCollections);
this.collectionType = collectionType;
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
index 0a3f9f5..0ce8643 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
@@ -23,9 +23,9 @@
import
org.ovirt.engine.core.common.queries.GetTasksStatusesByTasksIDsParameters;
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;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
import org.ovirt.engine.core.compat.Guid;
public abstract class AbstractBackendResource<R extends BaseResource, Q /*
extends IVdcQueryable */>
@@ -337,10 +337,10 @@
model.getLinks().add(link);
}
- protected <T> VdcQueryParametersBase getQueryParams(Class<? extends
VdcQueryParametersBase> queryParamsClass, T id) {
- VdcQueryParametersBase params = null;
+ protected <T extends VdcParametersMap, P> T getQueryParams(Class<? extends
VdcParametersMap> queryParamsClass, P id) {
+ T params = null;
try {
- params =
queryParamsClass.getConstructor(id.getClass()).newInstance(id);
+ params = (T)
queryParamsClass.getConstructor(id.getClass()).newInstance(id);
} catch (Exception e) {
// trivial class construction
}
@@ -418,9 +418,9 @@
public class QueryIdResolver<T> extends EntityIdResolver<T> {
private final VdcQueryType query;
- private final Class<? extends VdcQueryParametersBase> queryParamsClass;
+ private final Class<? extends VdcParametersMap> queryParamsClass;
- public QueryIdResolver(VdcQueryType query, Class<? extends
VdcQueryParametersBase> queryParamsClass) {
+ public QueryIdResolver(VdcQueryType query, Class<? extends
VdcParametersMap> queryParamsClass) {
this.query = query;
this.queryParamsClass = queryParamsClass;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResource.java
index bf0027f..ead8fb6 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResource.java
@@ -27,11 +27,19 @@
this.guid = asGuidOr404(id);
}
+ protected <T extends VdcParametersMap> R performGet(VdcQueryType query, T
params) {
+ return performGet(query, params, null);
+ }
+
+ /**
+ * Needs to dropped after changing BackendStorageDomainDiskResource to use
+ * VdcParametersMap which overrides this method.
+ */
protected R performGet(VdcQueryType query, VdcQueryParametersBase params) {
return performGet(query, params, null);
}
- protected R performGet(VdcQueryType query, VdcQueryParametersBase params,
Class<? extends BaseResource> suggestedParentType) {
+ protected <T extends VdcParametersMap> R performGet(VdcQueryType query, T
params, Class<? extends BaseResource> suggestedParentType) {
Q entity = getEntity(entityType, query, params, id, true);
return addLinks(populate(map(entity, null), entity),
suggestedParentType);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
index ed34bf5..f5ef20a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
@@ -30,7 +30,6 @@
import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters;
import org.ovirt.engine.core.common.queries.SearchParameters;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.utils.CoreVdcParameters;
@@ -77,18 +76,18 @@
}
}
- protected VdcQueryReturnValue runQuery(VdcQueryType queryType,
VdcQueryParametersBase queryParams) {
- queryParams.setFiltered(isFiltered());
+ protected <T extends VdcParametersMap> VdcQueryReturnValue
runQuery(VdcQueryType queryType, T queryParams) {
+ queryParams.put(CoreVdcParameters.FILTERED, isFiltered());
return backend.RunQuery(queryType, sessionize(queryParams));
}
- protected <T> T getEntity(Class<T> clz, VdcQueryType query,
VdcQueryParametersBase queryParams, String identifier) {
+ protected <T extends VdcParametersMap, P> P getEntity(Class<P> clz,
VdcQueryType query, T queryParams, String identifier) {
return getEntity(clz, query, queryParams, identifier, false);
}
- protected <T> T getEntity(Class<T> clz,
+ protected <T extends VdcParametersMap, P> P getEntity(Class<P> clz,
VdcQueryType query,
- VdcQueryParametersBase queryParams,
+ T queryParams,
String identifier,
boolean notFoundAs404) {
try {
@@ -98,9 +97,9 @@
}
}
- protected <T> T doGetEntity(Class<T> clz,
+ protected <T extends VdcParametersMap, P> P doGetEntity(Class<P> clz,
VdcQueryType query,
- VdcQueryParametersBase queryParams,
+ T queryParams,
String identifier) throws
BackendFailureException {
VdcQueryReturnValue result = runQuery(query, queryParams);
if (!result.getSucceeded() || result.getReturnValue() == null) {
@@ -113,13 +112,13 @@
return clz.cast(result.getReturnValue());
}
- protected <T> List<T> getBackendCollection(Class<T> clz, VdcQueryType
query, VdcQueryParametersBase queryParams) {
+ protected <T extends VdcParametersMap, P> List<P>
getBackendCollection(Class<P> clz, VdcQueryType query, T queryParams) {
try {
VdcQueryReturnValue result = runQuery(query, queryParams);
if (!result.getSucceeded()) {
backendFailure(result.getExceptionString());
}
- List<T> results = asCollection(clz, result.getReturnValue());
+ List<P> results = asCollection(clz, result.getReturnValue());
if (results!=null && getMaxResults()!=NO_LIMIT &&
getMaxResults()<results.size()) {
results = results.subList(0, getMaxResults());
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
index cb29972..ee6bcf6 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
@@ -24,7 +24,6 @@
import org.ovirt.engine.api.restapi.util.SessionHelper;
import org.ovirt.engine.api.restapi.utils.MalformedIdException;
import org.ovirt.engine.core.common.interfaces.BackendLocal;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.utils.VdcParametersMap;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.utils.log.Log;
@@ -95,10 +94,6 @@
public void setValidatorLocator(ValidatorLocator validatorLocator) {
this.validatorLocator = validatorLocator;
- }
-
- protected <P extends VdcQueryParametersBase> P sessionize(P parameters) {
- return sessionHelper.sessionize(parameters);
}
protected <P extends VdcParametersMap> P sessionize(P parameters) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/SessionHelper.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/SessionHelper.java
index a6cf025..73bd572 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/SessionHelper.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/SessionHelper.java
@@ -2,7 +2,6 @@
import org.ovirt.engine.api.common.invocation.Current;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.utils.CoreVdcParameters;
import org.ovirt.engine.core.common.utils.VdcParametersMap;
@@ -24,14 +23,6 @@
*/
public <P extends VdcParametersMap> P sessionize(P parameters) {
parameters.put(CoreVdcParameters.SESSION_ID, getSessionId());
- return parameters;
- }
-
- /**
- * Setting the sessionId on the parameters
- */
- public <P extends VdcQueryParametersBase> P sessionize(P parameters){
- parameters.setSessionId(getSessionId());
return parameters;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
index bd18ac4..5d1b592 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java
@@ -50,7 +50,6 @@
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.utils.CoreVdcParameters;
import org.ovirt.engine.core.common.utils.VdcParameter;
import org.ovirt.engine.core.common.utils.VdcParametersMap;
@@ -173,7 +172,7 @@
}
protected <E> void setUpGetEntityExpectations(VdcQueryType query,
- Class<? extends VdcQueryParametersBase> clz, String[] names,
Object[] values, E entity)
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values, E entity)
throws Exception {
VdcQueryReturnValue queryResult =
control.createMock(VdcQueryReturnValue.class);
expect(backend.RunQuery(eq(query), eqQueryParams(clz,
addSession(names), addSession(values)))).andReturn(
@@ -225,7 +224,9 @@
expect(result.getCanDoActionMessages()).andReturn(asList(errorMessage)).anyTimes();
setUpL10nExpectations(asList(errorMessage));
}
- expect(backend.RunAction(eq(task), TestHelper.eqActionParams(clz,
addSession(names), addSession(values), queryParamNames))).andReturn(result);
+ values = addSession(values);
+ queryParamNames = addSession(queryParamNames);
+ expect(backend.RunAction(eq(task), TestHelper.eqActionParams(clz,
names, values, queryParamNames))).andReturn(result);
VdcQueryReturnValue monitorResult =
control.createMock(VdcQueryReturnValue.class);
expect(monitorResult.getSucceeded()).andReturn(success).anyTimes();
@@ -247,9 +248,9 @@
}
protected <E> void setUpGetEntityExpectationsWithParamNames(VdcQueryType
query,
- Class<? extends VdcQueryParametersBase> clz, String[] names,
Object[] values, VdcParameter[] queryParamNames, E entity)
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values, VdcParameter[] queryParamNames, E entity)
throws Exception {
- VdcQueryParametersBase paramsBase =
control.createMock(VdcQueryParametersBase.class);
+ VdcParametersMap paramsBase =
control.createMock(VdcParametersMap.class);
int i = 0;
values = addSession(values);
queryParamNames = addSession(queryParamNames);
@@ -279,7 +280,7 @@
}
protected void setUpEntityQueryExpectations(VdcQueryType query,
- Class<? extends VdcQueryParametersBase> queryClass,
+ Class<? extends VdcParametersMap> queryClass,
String[] queryNames,
Object[] queryValues,
Object queryReturn) {
@@ -287,7 +288,7 @@
}
protected void setUpEntityQueryExpectations(VdcQueryType query,
- Class<? extends VdcQueryParametersBase> queryClass,
+ Class<? extends VdcParametersMap> queryClass,
String[] queryNames,
Object[] queryValues,
Object queryReturn,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
index 5f2c59f..0fe6228 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
@@ -26,7 +26,6 @@
import org.ovirt.engine.core.common.interfaces.SearchType;
import
org.ovirt.engine.core.common.queries.GetTasksStatusesByTasksIDsParameters;
import org.ovirt.engine.core.common.queries.SearchParameters;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.utils.VdcParametersMap;
@@ -205,7 +204,7 @@
boolean success,
Object taskReturn,
VdcQueryType query,
- Class<? extends
VdcQueryParametersBase> queryClass,
+ Class<? extends VdcParametersMap>
queryClass,
String[] queryNames,
Object[] queryValues,
Object queryReturn) {
@@ -273,7 +272,7 @@
ArrayList<Guid> asyncTasks,
ArrayList<AsyncTaskStatus>
asyncStatuses,
VdcQueryType query,
- Class<? extends
VdcQueryParametersBase> queryClass,
+ Class<? extends VdcParametersMap>
queryClass,
String[] queryNames,
Object[] queryValues,
Object queryReturn) {
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
index 843b45f..648f53a 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
@@ -24,9 +24,9 @@
import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
import org.ovirt.engine.core.compat.Guid;
public class BackendExportDomainDiskResourceTest
@@ -136,7 +136,7 @@
}
@Override
protected void setUpEntityQueryExpectations(VdcQueryType query,
- Class<? extends VdcQueryParametersBase> queryClass,
+ Class<? extends VdcParametersMap> queryClass,
String[] queryNames,
Object[] queryValues,
Object queryReturn,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
index a923b88..543a1e2 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
@@ -32,9 +32,9 @@
import org.ovirt.engine.core.common.queries.GetPermissionsForObjectParameters;
import org.ovirt.engine.core.common.queries.GetVmTemplateParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
import org.ovirt.engine.core.compat.Guid;
public class BackendExportDomainDisksResourceTest
@@ -212,7 +212,7 @@
}
@Override
protected void setUpEntityQueryExpectations(VdcQueryType query,
- Class<? extends VdcQueryParametersBase> queryClass,
+ Class<? extends VdcParametersMap> queryClass,
String[] queryNames,
Object[] queryValues,
Object queryReturn,
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
index f8bdbce..b8747ec 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
@@ -11,7 +11,6 @@
import org.ovirt.engine.core.common.queries.SearchParameters;
import org.ovirt.engine.core.common.utils.VdcParameter;
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.common.utils.VdcParametersMap;
@Ignore
@@ -201,13 +200,13 @@
}
}
- public static VdcQueryParametersBase eqQueryParams(Class<? extends
VdcQueryParametersBase> clz,
+ public static <T extends VdcParametersMap> T eqQueryParams(Class<? extends
VdcParametersMap> clz,
String[] names, Object[] values) {
EasyMock.reportMatcher(new QueryParametersEquals(clz, names, values));
return null;
}
- public static VdcQueryParametersBase eqQueryParams(Class<? extends
VdcQueryParametersBase> clz,
+ public static <T extends VdcParametersMap> T eqQueryParams(Class<? extends
VdcParametersMap> clz,
String[] names, Object[] values, VdcParameter[] queryParamNames) {
EasyMock.reportMatcher(new QueryParametersEqualsWithParamNames(clz,
names, values, queryParamNames));
return null;
@@ -219,11 +218,11 @@
*/
@Ignore
protected static class QueryParametersEquals implements IArgumentMatcher {
- Class<? extends VdcQueryParametersBase> clz;
+ Class<? extends VdcParametersMap> clz;
String[] names;
Object[] values;
- public QueryParametersEquals(Class<? extends VdcQueryParametersBase>
clz, String[] names,
+ public QueryParametersEquals(Class<? extends VdcParametersMap> clz,
String[] names,
Object[] values) {
this.clz = clz;
this.names = names;
@@ -303,12 +302,12 @@
*/
@Ignore
protected static class QueryParametersEqualsWithParamNames implements
IArgumentMatcher {
- Class<? extends VdcQueryParametersBase> clz;
+ Class<? extends VdcParametersMap> clz;
String[] names;
Object[] values;
VdcParameter[] queryParamNames;
- public QueryParametersEqualsWithParamNames(Class<? extends
VdcQueryParametersBase> clz, String[] names,
+ public QueryParametersEqualsWithParamNames(Class<? extends
VdcParametersMap> clz, String[] names,
Object[] values, VdcParameter[] queryParamNames) {
this.clz = clz;
this.names = names;
--
To view, visit http://gerrit.ovirt.org/21484
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91ae715c7c0325a706bbaf18f755865307e93d3a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ravi Nori <rn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
