Alissa Bonas has uploaded a new change for review.
Change subject: core: rename Login/Logoff in Backend to lowercase.
......................................................................
core: rename Login/Logoff in Backend to lowercase.
As well as in its interface and all usages.
Change-Id: I6a9be2db6d7c5e0680e2d9e286845b53261e2e9f
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/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.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/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java
7 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/20911/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..7ee8581 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
@@ -578,7 +578,7 @@
* @return user if success, else null // //
*/
@Override
- public VdcReturnValueBase Login(LoginUserParameters parameters) {
+ public VdcReturnValueBase login(LoginUserParameters parameters) {
switch (parameters.getActionType()) {
case LoginUser:
case LoginAdminUser:
@@ -591,7 +591,7 @@
}
@Override
- public VdcReturnValueBase Logoff(LogoutUserParameters parameters) {
+ public VdcReturnValueBase logoff(LogoutUserParameters parameters) {
return RunAction(VdcActionType.LogoutUser, parameters);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
index 8df7f55..e016103 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java
@@ -200,7 +200,7 @@
@Override
protected boolean isUserAuthorizedToRunAction() {
if (log.isDebugEnabled()) {
- log.debugFormat("IsUserAutorizedToRunAction: Login - no permission
check");
+ log.debugFormat("IsUserAutorizedToRunAction: login - no permission
check");
}
return true;
}
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..958f820 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
@@ -30,9 +30,9 @@
VdcQueryReturnValue RunPublicQuery(VdcQueryType actionType,
VdcQueryParametersBase parameters);
- VdcReturnValueBase Login(LoginUserParameters parameters);
+ VdcReturnValueBase login(LoginUserParameters parameters);
- VdcReturnValueBase Logoff(LogoutUserParameters parameters);
+ VdcReturnValueBase logoff(LogoutUserParameters parameters);
// for auto backend
VdcReturnValueBase RunAutoAction(VdcActionType actionType,
VdcActionParametersBase parameters);
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..3102ada 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
@@ -275,7 +275,7 @@
backend.RunAction(task, sp);
} finally {
if (user != null) {
- backend.Logoff(sh.sessionize(new
LogoutUserParameters(user.getId())));
+ backend.logoff(sh.sessionize(new
LogoutUserParameters(user.getId())));
}
sh.clean();
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
index 4816433..ad31553 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.java
@@ -77,7 +77,7 @@
null, null, null);
params.setActionType(VdcActionType.LoginUser);
sessionHelper.setSessionId(sessionId);
- VdcReturnValueBase ret =
backend.Login(sessionHelper.sessionize(params));
+ VdcReturnValueBase ret =
backend.login(sessionHelper.sessionize(params));
if (ret.getCanDoAction() && ret.getSucceeded()) {
return loginSuccess(principal, ret);
@@ -169,7 +169,7 @@
DbUser user = current.get(DbUser.class);
if (user != null) {
if (!persistentSession) {
- backend.Logoff(
+ backend.logoff(
sessionHelper.sessionize(new
LogoutUserParameters(user.getId())));
if (httpSession != null) {
httpSession.invalidate();
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
index f2d1b62..a164863 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/security/auth/LoginValidatorTest.java
@@ -1,12 +1,5 @@
package org.ovirt.engine.api.restapi.security.auth;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqActionParams;
-import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqQueryParams;
-
import java.util.HashMap;
import java.util.Map;
@@ -33,6 +26,13 @@
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.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqActionParams;
+import static org.ovirt.engine.api.restapi.test.util.TestHelper.eqQueryParams;
public class LoginValidatorTest extends Assert {
@@ -125,9 +125,9 @@
VdcReturnValueBase result =
control.createMock(VdcReturnValueBase.class);
Principal principal = new Principal(USER, SECRET, DOMAIN);
expect(
- backend.Login((LoginUserParameters)
eqActionParams(LoginUserParameters.class,
- new String[] { "UserName", "UserPassword", "Domain",
"ActionType", "SessionId" },
- new Object[] { USER, SECRET, DOMAIN,
VdcActionType.LoginUser, session.getSessionId() }))).andReturn(result);
+ backend.login((LoginUserParameters)
eqActionParams(LoginUserParameters.class,
+ new String[]{"UserName", "UserPassword", "Domain",
"ActionType", "SessionId"},
+ new Object[]{USER, SECRET, DOMAIN,
VdcActionType.LoginUser, session.getSessionId()}))).andReturn(result);
expect(result.getCanDoAction()).andReturn(canDo);
expect(result.getSucceeded()).andReturn(success).anyTimes();
@@ -170,9 +170,9 @@
expect(current.get(DbUser.class)).andReturn(user);
expect(user.getId()).andReturn(GUID);
expect(
- backend.Logoff((LogoutUserParameters)
eqActionParams(LogoutUserParameters.class,
- new String[] { "UserId", "SessionId" },
- new Object[] { GUID, session.getSessionId()
}))).andReturn(result);
+ backend.logoff((LogoutUserParameters)
eqActionParams(LogoutUserParameters.class,
+ new String[]{"UserId", "SessionId"},
+ new Object[]{GUID,
session.getSessionId()}))).andReturn(result);
ServerResponse response = control.createMock(ServerResponse.class);
control.replay();
return response;
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..53bf774 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
@@ -157,7 +157,7 @@
public VdcReturnValueBase logOff(DbUser userToLogoff) {
LogoutUserParameters params = new
LogoutUserParameters(userToLogoff.getId());
params.setSessionId(getSessionId());
- VdcReturnValueBase returnValue = getBackend().Logoff(params);
+ VdcReturnValueBase returnValue = getBackend().logoff(params);
return returnValue;
}
@@ -166,7 +166,7 @@
LoginUserParameters params = new LoginUserParameters(userName,
password, domain, null, null, null);
params.setSessionId(getSessionId());
params.setActionType(loginType);
- VdcReturnValueBase returnValue = getBackend().Login(params);
+ VdcReturnValueBase returnValue = getBackend().login(params);
return returnValue;
}
--
To view, visit http://gerrit.ovirt.org/20911
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a9be2db6d7c5e0680e2d9e286845b53261e2e9f
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
