Ravi Nori has uploaded a new change for review.
Change subject: restapi : Remove dependency of VdcActionParametersBase from
core classes
......................................................................
restapi : Remove dependency of VdcActionParametersBase from core classes
Removes the dependency of VdcActionParametersBase class
from the core api classes and used VdcParametersMap instead.
Change-Id: Ifc5034d3b3c906559918192dc6aca963754c52b8
Signed-off-by: Ravi Nori <rn...@redhat.com>
---
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/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/AbstractBackendNetworksResource.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/test/util/TestHelper.java
11 files changed, 80 insertions(+), 78 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/21483/1
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 13cbcb3..41a8eaf 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
@@ -16,13 +16,13 @@
import org.ovirt.engine.api.model.BaseResource;
import org.ovirt.engine.api.model.CreationStatus;
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.businessentities.StoragePool;
import org.ovirt.engine.core.common.interfaces.SearchType;
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;
@@ -33,7 +33,7 @@
super(id, modelType, entityType, subCollections);
}
- protected Response doAction(final VdcActionType task, final
VdcActionParametersBase params, final Action action,
AbstractBackendResource.PollingType pollingType, EntityResolver entityResolver)
{
+ protected <T extends VdcParametersMap> Response doAction(final
VdcActionType task, final T params, final Action action,
AbstractBackendResource.PollingType pollingType, EntityResolver entityResolver)
{
awaitGrace(action);
try {
VdcReturnValueBase actionResult = doAction(task, params);
@@ -68,7 +68,7 @@
}
}
- protected Response doAction(final VdcActionType task, final
VdcActionParametersBase params, final Action action,
AbstractBackendResource.PollingType pollingType) {
+ protected <T extends VdcParametersMap> Response doAction(final
VdcActionType task, final T params, final Action action,
AbstractBackendResource.PollingType pollingType) {
awaitGrace(action);
try {
VdcReturnValueBase actionResult = doAction(task, params);
@@ -101,7 +101,7 @@
* @param entityResolver backend response resolver
* @return
*/
- protected Response doAction(final VdcActionType task, final
VdcActionParametersBase params, final Action action, EntityResolver
entityResolver) {
+ protected <T extends VdcParametersMap> Response doAction(final
VdcActionType task, final T params, final Action action, EntityResolver
entityResolver) {
return doAction(task, params, action, PollingType.VDSM_TASKS,
entityResolver);
}
@@ -115,7 +115,7 @@
* @param action action representation
* @return
*/
- protected Response doAction(final VdcActionType task, final
VdcActionParametersBase params, final Action action) {
+ protected <T extends VdcParametersMap> Response doAction(final
VdcActionType task, final T params, final Action action) {
return doAction(task, params, action, PollingType.VDSM_TASKS);
}
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 4f82d9c..c0df979 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
@@ -14,13 +14,13 @@
import org.ovirt.engine.api.common.util.StatusUtils;
import org.ovirt.engine.api.model.ActionableResource;
import org.ovirt.engine.api.model.BaseResource;
-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.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;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -102,16 +102,16 @@
return getBackendCollection(entityType, query, queryParams);
}
- protected final <T> Response performCreate(VdcActionType task,
- VdcActionParametersBase taskParams,
- IResolver<T, Q> entityResolver,
+ protected final <T extends VdcParametersMap, P> Response
performCreate(VdcActionType task,
+ T taskParams,
+ IResolver<P, Q> entityResolver,
boolean block) {
return performCreate(task, taskParams, entityResolver, block, null);
}
- protected final <T> Response performCreate(VdcActionType task,
- VdcActionParametersBase taskParams,
- IResolver<T, Q> entityResolver,
+ protected final <T extends VdcParametersMap, P> Response
performCreate(VdcActionType task,
+ T taskParams,
+ IResolver<P, Q> entityResolver,
boolean block,
Class<? extends BaseResource> suggestedParentType) {
@@ -122,15 +122,15 @@
return fetchCreatedEntity(entityResolver, block, suggestedParentType,
createResult);
}
- protected final <T> Response performCreate(VdcActionType task,
- VdcActionParametersBase taskParams,
- IResolver<T, Q> entityResolver) {
+ protected final <T extends VdcParametersMap, P> Response
performCreate(VdcActionType task,
+ T taskParams,
+ IResolver<P, Q> entityResolver) {
return performCreate(task, taskParams, entityResolver,
expectBlocking());
}
- protected final <T> Response performCreate(VdcActionType task,
- VdcActionParametersBase taskParams,
- IResolver<T, Q> entityResolver,
+ protected final <T extends VdcParametersMap, P> Response
performCreate(VdcActionType task,
+ T taskParams,
+ IResolver<P, Q> entityResolver,
Class<? extends BaseResource> suggestedParentType) {
return performCreate(task, taskParams, entityResolver,
expectBlocking(), suggestedParentType);
}
@@ -240,7 +240,7 @@
return response;
}
- protected VdcReturnValueBase doCreateEntity(VdcActionType task,
VdcActionParametersBase taskParams) {
+ protected <T extends VdcParametersMap> VdcReturnValueBase
doCreateEntity(VdcActionType task, T taskParams) {
VdcReturnValueBase createResult;
try {
createResult = doAction(task, taskParams);
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 ce6c646..9b27bac 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
@@ -6,13 +6,13 @@
import org.ovirt.engine.api.model.BaseDevices;
import org.ovirt.engine.api.resource.DeviceResource;
import org.ovirt.engine.api.resource.DevicesResource;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
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;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
public abstract class AbstractBackendDevicesResource<D extends BaseDevice, C
extends BaseDevices, Q extends IVdcQueryable>
@@ -97,9 +97,9 @@
protected abstract String[] getRequiredUpdateFields();
- protected abstract VdcActionParametersBase getAddParameters(Q entity, D
device);
+ protected abstract <T extends VdcParametersMap> T getAddParameters(Q
entity, D device);
- protected abstract VdcActionParametersBase getRemoveParameters(String id);
+ protected abstract <T extends VdcParametersMap> T
getRemoveParameters(String id);
protected abstract ParametersProvider<D, Q> getUpdateParametersProvider();
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java
index 35a92df..3f24709 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java
@@ -6,10 +6,10 @@
import org.ovirt.engine.api.model.Network;
import org.ovirt.engine.api.model.Networks;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
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 AbstractBackendNetworksResource extends
AbstractBackendCollectionResource<Network,
org.ovirt.engine.core.common.businessentities.network.Network>
@@ -31,7 +31,7 @@
protected abstract VdcQueryParametersBase getQueryParameters();
- protected abstract VdcActionParametersBase getActionParameters(Network
network, org.ovirt.engine.core.common.businessentities.network.Network entity);
+ protected abstract <T extends VdcParametersMap> T
getActionParameters(Network network,
org.ovirt.engine.core.common.businessentities.network.Network entity);
public Networks list() {
return mapCollection(getBackendCollection(queryType,
getQueryParameters()));
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 cbedaf4..bf0027f 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
@@ -6,12 +6,12 @@
import org.ovirt.engine.api.common.util.MutabilityAssertor;
import org.ovirt.engine.api.model.BaseResource;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
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.logging.Messages;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
public abstract class AbstractBackendSubResource<R extends BaseResource, Q /*
extends IVdcQueryable */> extends
AbstractBackendResource<R, Q> {
@@ -126,6 +126,6 @@
}
protected interface ParametersProvider<R, Q> {
- VdcActionParametersBase getParameters(R model, Q entity);
+ <T extends VdcParametersMap> T getParameters(R model, Q entity);
}
}
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 3102ada..ed34bf5 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
@@ -22,7 +22,6 @@
import org.ovirt.engine.api.restapi.util.ErrorMessageHelper;
import org.ovirt.engine.api.restapi.util.SessionHelper;
import org.ovirt.engine.core.common.action.LogoutUserParameters;
-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.businessentities.DbUser;
@@ -34,6 +33,8 @@
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;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil;
@@ -143,15 +144,15 @@
}
}
- protected Response performAction(VdcActionType task,
VdcActionParametersBase params, Action action) {
+ protected <T extends VdcParametersMap> Response
performAction(VdcActionType task, T params, Action action) {
return performAction(task, params, action, false);
}
- protected Response performAction(VdcActionType task,
VdcActionParametersBase params) {
+ protected <T extends VdcParametersMap> Response
performAction(VdcActionType task, T params) {
return performAction(task, params, (Action) null, false);
}
- protected Response performAction(VdcActionType task,
VdcActionParametersBase params, Action action, boolean getEntityWhenDone) {
+ protected <T extends VdcParametersMap> Response
performAction(VdcActionType task, T params, Action action, boolean
getEntityWhenDone) {
try {
if (isAsync() || expectNonBlocking()) {
getCurrent().get(MetaData.class).set("async", true);
@@ -225,7 +226,7 @@
}
return expectNonBlocking;
}
- protected Response performNonBlockingAction(VdcActionType task,
VdcActionParametersBase params, Action action) {
+ protected <T extends VdcParametersMap> Response
performNonBlockingAction(VdcActionType task, T params, Action action) {
try {
doNonBlockingAction(task, params);
if (action!=null) {
@@ -239,7 +240,7 @@
}
}
- protected <T> T performAction(VdcActionType task, VdcActionParametersBase
params, Class<T> resultType) {
+ protected <T extends VdcParametersMap, P> P performAction(VdcActionType
task, T params, Class<P> resultType) {
try {
return resultType.cast(doAction(task,
params).getActionReturnValue());
} catch (Exception e) {
@@ -247,8 +248,8 @@
}
}
- protected VdcReturnValueBase doAction(VdcActionType task,
- VdcActionParametersBase params)
throws BackendFailureException {
+ protected <T extends VdcParametersMap> VdcReturnValueBase
doAction(VdcActionType task,
+ T params) throws
BackendFailureException {
setJobOrStepId(params);
setCorrelationId(params);
VdcReturnValueBase result = backend.RunAction(task,
sessionize(params));
@@ -261,12 +262,12 @@
return result;
}
- protected void doNonBlockingAction(final VdcActionType task, final
VdcActionParametersBase params) {
+ protected <T extends VdcParametersMap> void doNonBlockingAction(final
VdcActionType task, final T params) {
setCorrelationId(params);
setJobOrStepId(params);
ThreadPoolUtil.execute(new Runnable() {
SessionHelper sh = getSessionHelper();
- VdcActionParametersBase sp = sessionize(params);
+ T sp = sessionize(params);
DbUser user = getCurrent().get(DbUser.class);
@Override
@@ -283,21 +284,21 @@
});
}
- private void setJobOrStepId(VdcActionParametersBase params) {
+ private <T extends VdcParametersMap> void setJobOrStepId(T params) {
if (QueryHelper.hasMatrixParam(uriInfo, JOB_ID_CONSTRAINT)) {
String value = QueryHelper.getMatrixConstraint(uriInfo,
JOB_ID_CONSTRAINT);
- params.setJobId(asGuid(value));
+ params.put(CoreVdcParameters.JOB_ID, asGuid(value));
}
if (QueryHelper.hasMatrixParam(uriInfo, STEP_ID_CONSTRAINT)) {
String value = QueryHelper.getMatrixConstraint(uriInfo,
STEP_ID_CONSTRAINT);
- params.setJobId(asGuid(value));
+ params.put(CoreVdcParameters.JOB_ID, asGuid(value));
}
}
- private void setCorrelationId(VdcActionParametersBase params) {
+ private <T extends VdcParametersMap> void setCorrelationId(T params) {
List<String> correlationIds =
httpHeaders.getRequestHeader(CORRELATION_ID);
if (correlationIds != null && correlationIds.size() > 0) {
- params.setCorrelationId(correlationIds.get(0));
+ params.put(CoreVdcParameters.CORRELATION_ID,
correlationIds.get(0));
}
}
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 10853a4..cb29972 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
@@ -23,9 +23,9 @@
import org.ovirt.engine.api.restapi.resource.validation.ValidatorLocator;
import org.ovirt.engine.api.restapi.util.SessionHelper;
import org.ovirt.engine.api.restapi.utils.MalformedIdException;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
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;
import org.ovirt.engine.core.utils.log.LogFactory;
@@ -101,7 +101,7 @@
return sessionHelper.sessionize(parameters);
}
- protected <P extends VdcActionParametersBase> P sessionize(P parameters) {
+ protected <P extends VdcParametersMap> P sessionize(P parameters) {
return sessionHelper.sessionize(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 1c8403e..a6cf025 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,8 +2,9 @@
import org.ovirt.engine.api.common.invocation.Current;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
+import org.ovirt.engine.core.common.utils.CoreVdcParameters;
+import org.ovirt.engine.core.common.utils.VdcParametersMap;
public class SessionHelper {
@@ -21,8 +22,8 @@
/**
* Setting the sessionId on the parameters
*/
- public <P extends VdcActionParametersBase> P sessionize(P parameters) {
- parameters.setSessionId(getSessionId());
+ public <P extends VdcParametersMap> P sessionize(P parameters) {
+ parameters.put(CoreVdcParameters.SESSION_ID, 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 dd9416d..bd18ac4 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
@@ -2,7 +2,6 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
-import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqActionParams;
import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqQueryParams;
import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqSearchParams;
@@ -33,10 +32,10 @@
import org.ovirt.engine.api.model.Link;
import org.ovirt.engine.api.restapi.logging.MessageBundle;
import org.ovirt.engine.api.restapi.resource.validation.ValidatorLocator;
+import org.ovirt.engine.api.restapi.test.util.TestHelper;
import org.ovirt.engine.api.restapi.types.Mapper;
import org.ovirt.engine.api.restapi.types.MappingLocator;
import org.ovirt.engine.api.restapi.util.SessionHelper;
-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.businessentities.AsyncTaskStatus;
@@ -49,11 +48,12 @@
import
org.ovirt.engine.core.common.queries.GetTasksStatusesByTasksIDsParameters;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
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.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 AbstractBackendBaseTest extends Assert {
@@ -183,19 +183,19 @@
}
protected UriInfo setUpActionExpectationsWithParamNames(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values,
VdcParameter[] queryParamNames, boolean canDo, boolean success) {
return setUpActionExpectationsWithParamNames(task, clz, names, values,
queryParamNames, canDo, success, null, true, CANT_DO);
}
protected UriInfo setUpActionExpectationsWithParamNames(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values, VdcParameter[] queryParamNames,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values, VdcParameter[] queryParamNames,
boolean canDo, boolean success, Object taskReturn, boolean replay,
String errorMessage) {
return setUpActionExpectationsWithParamNames(task, clz, names, values,
queryParamNames, canDo, success, taskReturn, null, null, null, null, null,
replay, errorMessage);
}
protected UriInfo setUpActionExpectationsWithParamNames(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz,
+ Class<? extends VdcParametersMap> clz,
String[] names,
Object[] values,
VdcParameter[] queryParamNames,
@@ -225,7 +225,7 @@
expect(result.getCanDoActionMessages()).andReturn(asList(errorMessage)).anyTimes();
setUpL10nExpectations(asList(errorMessage));
}
- expect(backend.RunAction(eq(task), eqActionParams(clz,
addSession(names), addSession(values), queryParamNames))).andReturn(result);
+ expect(backend.RunAction(eq(task), TestHelper.eqActionParams(clz,
addSession(names), addSession(values), queryParamNames))).andReturn(result);
VdcQueryReturnValue monitorResult =
control.createMock(VdcQueryReturnValue.class);
expect(monitorResult.getSucceeded()).andReturn(success).anyTimes();
@@ -329,43 +329,43 @@
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values,
boolean canDo, boolean success) {
return setUpActionExpectations(task, clz, names, values, canDo,
success, null, true, CANT_DO);
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values,
boolean canDo, boolean success, String errorMessage) {
return setUpActionExpectations(task, clz, names, values, canDo,
success, null, true, errorMessage);
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values,
boolean canDo, boolean success, boolean reply, String
errorMessage) {
return setUpActionExpectations(task, clz, names, values, canDo,
success, null, reply, errorMessage);
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values,
boolean canDo, boolean success, boolean reply) {
return setUpActionExpectations(task, clz, names, values, canDo,
success, null, reply, CANT_DO);
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values,
boolean canDo, boolean success, Object taskReturn, boolean replay)
{
return setUpActionExpectations(task, clz, names, values, canDo,
success, taskReturn, null, replay, CANT_DO);
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values,
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values,
boolean canDo, boolean success, Object taskReturn, boolean replay,
String errorMessage) {
return setUpActionExpectations(task, clz, names, values, canDo,
success, taskReturn, null, replay, errorMessage);
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz,
+ Class<? extends VdcParametersMap> clz,
String[] names,
Object[] values,
boolean canDo,
@@ -390,7 +390,7 @@
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz,
+ Class<? extends VdcParametersMap> clz,
String[] names,
Object[] values,
boolean canDo,
@@ -416,7 +416,7 @@
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz,
+ Class<? extends VdcParametersMap> clz,
String[] names,
Object[] values,
boolean canDo,
@@ -446,7 +446,7 @@
}
protected UriInfo setUpActionExpectations(VdcActionType task,
- Class<? extends VdcActionParametersBase> clz,
+ Class<? extends VdcParametersMap> clz,
String[] names,
Object[] values,
boolean canDo,
@@ -475,7 +475,7 @@
expect(result.getCanDoActionMessages()).andReturn(asList(errorMessage)).anyTimes();
setUpL10nExpectations(asList(errorMessage));
}
- expect(backend.RunAction(eq(task), eqActionParams(clz,
addSession(names), addSession(values)))).andReturn(result);
+ expect(backend.RunAction(eq(task), TestHelper.eqActionParams(clz,
addSession(names), addSession(values)))).andReturn(result);
VdcQueryReturnValue monitorResult =
control.createMock(VdcQueryReturnValue.class);
expect(monitorResult.getSucceeded()).andReturn(success).anyTimes();
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 9929a3d..5f2c59f 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
@@ -19,7 +19,6 @@
import org.junit.Test;
import org.ovirt.engine.api.model.BaseResource;
import org.ovirt.engine.api.model.Fault;
-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.businessentities.AsyncTaskStatus;
@@ -30,6 +29,7 @@
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 AbstractBackendCollectionResourceTest<R extends
BaseResource, Q /* extends IVdcQueryable */, C extends
AbstractBackendCollectionResource<R, Q>>
@@ -198,7 +198,7 @@
}
protected void setUpCreationExpectations(VdcActionType task,
- Class<? extends
VdcActionParametersBase> taskClass,
+ Class<? extends VdcParametersMap>
taskClass,
String[] taskNames,
Object[] taskValues,
boolean canDo,
@@ -226,7 +226,7 @@
}
protected void setUpCreationExpectations(VdcActionType task,
- Class<? extends
VdcActionParametersBase> taskClass,
+ Class<? extends VdcParametersMap>
taskClass,
String[] taskNames,
Object[] taskValues,
boolean canDo,
@@ -264,7 +264,7 @@
control.replay();
}
protected void setUpCreationExpectations(VdcActionType task,
- Class<? extends
VdcActionParametersBase> taskClass,
+ Class<? extends VdcParametersMap>
taskClass,
String[] taskNames,
Object[] taskValues,
boolean canDo,
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 2c70157..f8bdbce 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
@@ -9,21 +9,21 @@
import org.easymock.classextension.EasyMock;
import org.junit.Ignore;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
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
public class TestHelper {
- public static VdcActionParametersBase eqActionParams(
- Class<? extends VdcActionParametersBase> clz, String[] names,
Object[] values) {
+ public static <T extends VdcParametersMap> T eqActionParams(
+ Class<? extends VdcParametersMap> clz, String[] names, Object[]
values) {
EasyMock.reportMatcher(new ActionParametersEquals(clz, names, values));
return null;
}
- public static VdcActionParametersBase eqActionParams(Class<? extends
VdcActionParametersBase> clz,
+ public static <T extends VdcParametersMap> T eqActionParams(Class<?
extends VdcParametersMap> clz,
String[] names, Object[] values, VdcParameter[] queryParamNames) {
EasyMock.reportMatcher(new ActionParametersEqualsWithParamNames(clz,
names, values, queryParamNames));
return null;
@@ -129,11 +129,11 @@
*/
@Ignore
protected static class ActionParametersEquals implements IArgumentMatcher {
- Class<? extends VdcActionParametersBase> clz;
+ Class<? extends VdcParametersMap> clz;
String[] names;
Object[] values;
- public ActionParametersEquals(Class<? extends VdcActionParametersBase>
clz, String[] names,
+ public ActionParametersEquals(Class<? extends VdcParametersMap> clz,
String[] names,
Object[] values) {
this.clz = clz;
this.names = names;
@@ -255,12 +255,12 @@
@Ignore
protected static class ActionParametersEqualsWithParamNames implements
IArgumentMatcher {
- Class<? extends VdcActionParametersBase> clz;
+ Class<? extends VdcParametersMap> clz;
String[] names;
Object[] values;
VdcParameter[] queryParamNames;
- public ActionParametersEqualsWithParamNames(Class<? extends
VdcActionParametersBase> clz, String[] names,
+ public ActionParametersEqualsWithParamNames(Class<? extends
VdcParametersMap> clz, String[] names,
Object[] values, VdcParameter[] queryParamNames) {
this.clz = clz;
this.names = names;
--
To view, visit http://gerrit.ovirt.org/21483
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc5034d3b3c906559918192dc6aca963754c52b8
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
