Juan Hernandez has uploaded a new change for review.
Change subject: core: Remove unused LoginUserParameters fields
......................................................................
core: Remove unused LoginUserParameters fields
The os, browser and clientType fields of this parameter class are not
used.
Change-Id: Ibde0806f119ff3d3611ea4d6d690cb398a6f7e26
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginUserParameters.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/LoginValidator.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/userportal/UserPortalLoginModel.java
4 files changed, 4 insertions(+), 29 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/13916/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginUserParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginUserParameters.java
index 68699d7..6024b58 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginUserParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginUserParameters.java
@@ -9,23 +9,13 @@
private String _domain;
- private String _os;
-
- private String _browser;
-
- private String _clientType;
-
private VdcActionType _actionType = VdcActionType.forValue(0);
- public LoginUserParameters(String userName, String userPassword, String
domain, String os, String browser,
- String clientType) {
+ public LoginUserParameters(String userName, String userPassword, String
domain) {
_actionType = VdcActionType.LoginUser;
_userName = userName;
_userPassword = userPassword;
_domain = domain.trim();
- _os = os;
- _browser = browser;
- _clientType = clientType;
}
public LoginUserParameters() {
@@ -46,18 +36,6 @@
public String getDomain() {
return _domain;
- }
-
- public String getOs() {
- return _os;
- }
-
- public String getBrowser() {
- return _browser;
- }
-
- public String getClientType() {
- return _clientType;
}
public VdcActionType getActionType() {
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 18c29d2..4ea5ca3 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
@@ -73,8 +73,7 @@
LoginUserParameters params = new
LoginUserParameters(principal.getUser(),
principal.getSecret(),
- principal.getDomain(),
- null, null, null);
+ principal.getDomain());
params.setActionType(VdcActionType.LoginUser);
sessionHelper.setSessionId(sessionId);
VdcReturnValueBase ret =
backend.Login(sessionHelper.sessionize(params));
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 f65a690..6ee5035 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
@@ -161,7 +161,7 @@
@Override
public VdcReturnValueBase Login(String userName, String password, String
domain) {
- LoginUserParameters params = new LoginUserParameters(userName,
password, domain, null, null, null);
+ LoginUserParameters params = new LoginUserParameters(userName,
password, domain);
params.setSessionId(getSessionId());
params.setActionType(VdcActionType.LoginAdminUser);
VdcReturnValueBase returnValue = getBackend().Login(params);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
index 388d114..8393115 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalLoginModel.java
@@ -197,9 +197,7 @@
Frontend.RunAction(VdcActionType.LoginUser, new
LoginUserParameters((String) getUserName().getEntity(),
(String) getPassword().getEntity(),
- (String) getDomain().getSelectedItem(), "", //$NON-NLS-1$
- "", //$NON-NLS-1$
- ""), //$NON-NLS-1$
+ (String) getDomain().getSelectedItem()),
new IFrontendActionAsyncCallback() {
@Override
public void Executed(FrontendActionAsyncResult result) {
--
To view, visit http://gerrit.ovirt.org/13916
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibde0806f119ff3d3611ea4d6d690cb398a6f7e26
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
