Alissa Bonas has uploaded a new change for review.
Change subject: rename RunAction method to lowercase in Backend
......................................................................
rename RunAction method to lowercase in Backend
Change-Id: I0b6d5f171ee038b5364b646b034a8457c5e40962
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.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/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
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
9 files changed, 19 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/20908/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
index 44f10c6..b21a8d4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
@@ -345,7 +345,7 @@
}
@Override
- public VdcReturnValueBase RunAction(VdcActionType actionType,
VdcActionParametersBase parameters) {
+ public VdcReturnValueBase runAction(VdcActionType actionType,
VdcActionParametersBase parameters) {
VdcReturnValueBase returnValue = notAllowToRunAction(actionType);
if (returnValue != null) {
return returnValue;
@@ -592,7 +592,7 @@
@Override
public VdcReturnValueBase Logoff(LogoutUserParameters parameters) {
- return RunAction(VdcActionType.LogoutUser, parameters);
+ return runAction(VdcActionType.LogoutUser, parameters);
}
@Override
@@ -620,7 +620,7 @@
@Override
public VdcReturnValueBase RunAutoAction(VdcActionType actionType,
VdcActionParametersBase parameters) {
- return RunAction(actionType, parameters);
+ return runAction(actionType, parameters);
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
index 866e3f1..b13be15 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
@@ -10,7 +10,7 @@
import org.ovirt.engine.core.common.queries.VdcQueryType;
public interface BackendLocal {
- VdcReturnValueBase RunAction(VdcActionType actionType,
VdcActionParametersBase parameters);
+ VdcReturnValueBase runAction(VdcActionType actionType,
VdcActionParametersBase parameters);
VDSBrokerFrontend getResourceManager();
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 603d18a..e55f02d 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
@@ -251,7 +251,7 @@
VdcActionParametersBase params)
throws BackendFailureException {
setJobOrStepId(params);
setCorrelationId(params);
- VdcReturnValueBase result = backend.RunAction(task,
sessionize(params));
+ VdcReturnValueBase result = backend.runAction(task,
sessionize(params));
if (result != null && !result.getCanDoAction()) {
backendFailure(result.getCanDoActionMessages());
} else if (result != null && !result.getSucceeded()) {
@@ -272,7 +272,7 @@
@Override
public void run() {
try {
- backend.RunAction(task, sp);
+ backend.runAction(task, sp);
} finally {
if (user != null) {
backend.Logoff(sh.sessionize(new
LogoutUserParameters(user.getId())));
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 f7a8714..4415296 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
@@ -390,7 +390,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), 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 0af5283..9b9b43a 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
@@ -1,15 +1,8 @@
package org.ovirt.engine.api.restapi.resource;
-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;
-
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
-
import javax.ws.rs.Path;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MultivaluedMap;
@@ -31,6 +24,12 @@
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
+
+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;
public abstract class AbstractBackendCollectionResourceTest<R extends
BaseResource, Q /* extends IVdcQueryable */, C extends
AbstractBackendCollectionResource<R, Q>>
extends AbstractBackendResourceTest<R, Q> {
@@ -264,7 +263,7 @@
addSession(new String[]{}),
addSession(new
Object[]{})))).andReturn(monitorResult);
}
- expect(backend.RunAction(eq(task), eqActionParams(taskClass,
addSession(taskNames), addSession(taskValues))))
+ expect(backend.runAction(eq(task), eqActionParams(taskClass,
addSession(taskNames), addSession(taskValues))))
.andReturn(taskResult);
if (canDo && success && query != null) {
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
index a62121a..6dde729 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/GWTRPCCommunicationProvider.java
@@ -204,7 +204,7 @@
}
/**
- * Call the back-end using either RunAction or RunMultiple actions based
on the fact that the map being
+ * Call the back-end using either runAction or RunMultiple actions based
on the fact that the map being
* passed is keyed on the {@code VdcActionType} this allows us to
determine if there are one or more actions
* pending per action type.
* When the action completes call back the appropriate callback methods
with the appropriate results.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
index 7c68e99..d53d612 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
@@ -118,7 +118,7 @@
@Override
public VdcReturnValueBase RunAction(VdcActionType actionType,
VdcActionParametersBase params) {
- log.debug("Server: RunAction invoked!"); //$NON-NLS-1$
+ log.debug("Server: runAction invoked!"); //$NON-NLS-1$
debugAction(actionType, params);
params.setSessionId(getSessionId());
@@ -128,7 +128,7 @@
return rValue;
}
- return getBackend().RunAction(actionType, params);
+ return getBackend().runAction(actionType, params);
}
@Override
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
index 08843e7..3144cd6 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddClusterRM.java
@@ -174,7 +174,7 @@
// cluster.setMigrateOnError(m.getMigrateOnErrorOption());
//
// VdcReturnValueBase returnValue =
- // Frontend.RunAction(VdcActionType.AddVdsGroup, new
VdsGroupOperationParameters(cluster));
+ // Frontend.runAction(VdcActionType.AddVdsGroup, new
VdsGroupOperationParameters(cluster));
//
// if (returnValue != null && returnValue.getSucceeded())
// {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
index 502a594..c0defb7 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ChangeHostClusterRM.java
@@ -80,7 +80,7 @@
// if (!model.getDontChangeHostCluster()) {
// VDS host = (VDS) getModel().getSelectedItem();
// VdcReturnValueBase returnValue =
- // Frontend.RunAction(VdcActionType.ChangeVDSCluster,
+ // Frontend.runAction(VdcActionType.ChangeVDSCluster,
// new ChangeVDSClusterParameters(getData().getClusterId(),
host.getvds_id()));
//
// if (returnValue != null && returnValue.getSucceeded()) {
--
To view, visit http://gerrit.ovirt.org/20908
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b6d5f171ee038b5364b646b034a8457c5e40962
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
