Alissa Bonas has uploaded a new change for review. Change subject: core: rename method RunAdAction to lowercase in LdapBroker ......................................................................
core: rename method RunAdAction to lowercase in LdapBroker Rename method and its usages to lowercase. Solves a findbug warning. Change-Id: I2369a54c7db1bf0d32681d295839fb900debc57a Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeUserPasswordCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBroker.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdListCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java 12 files changed, 22 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/21889/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java index fa662a6..14d1350 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUserCommand.java @@ -34,7 +34,7 @@ addCustomValue("NewUserName", getParameters().getUser().getLoginName()); userId = getParameters().getUser().getId(); domain = getParameters().getUser().getDomain(); - LdapUser adUser = (LdapUser) LdapFactory.getInstance(domain).RunAdAction(AdActionType.GetAdUserByUserId, + LdapUser adUser = (LdapUser) LdapFactory.getInstance(domain).runAdAction(AdActionType.GetAdUserByUserId, new LdapSearchByIdParameters(domain, userId)).getReturnValue(); if (adUser == null) { addCanDoActionMessage(VdcBllMessages.USER_MUST_EXIST_IN_DIRECTORY); @@ -47,7 +47,7 @@ addCustomValue("NewUserName", getParameters().getAdUser().getUserName()); userId = getParameters().getAdUser().getUserId(); domain = getParameters().getAdUser().getDomainControler(); - LdapUser adUser = (LdapUser) LdapFactory.getInstance(domain).RunAdAction(AdActionType.GetAdUserByUserId, + LdapUser adUser = (LdapUser) LdapFactory.getInstance(domain).runAdAction(AdActionType.GetAdUserByUserId, new LdapSearchByIdParameters(domain, userId)).getReturnValue(); if (adUser == null) { addCanDoActionMessage(VdcBllMessages.USER_MUST_EXIST_IN_DIRECTORY); @@ -59,8 +59,8 @@ userId = getParameters().getAdGroup().getid(); domain = getParameters().getAdGroup().getdomain(); LdapGroup adGroup = - (LdapGroup) LdapFactory.getInstance(domain).RunAdAction(AdActionType.GetAdGroupByGroupId, - new LdapSearchByIdParameters(domain, userId)).getReturnValue(); + (LdapGroup) LdapFactory.getInstance(domain).runAdAction(AdActionType.GetAdGroupByGroupId, + new LdapSearchByIdParameters(domain, userId)).getReturnValue(); if (adGroup == null) { addCanDoActionMessage(VdcBllMessages.USER_MUST_EXIST_IN_DIRECTORY); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeUserPasswordCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeUserPasswordCommand.java index 675ed53..b5e88c9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeUserPasswordCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeUserPasswordCommand.java @@ -29,7 +29,7 @@ protected void executeCommand() { setSucceeded(LdapFactory .getInstance(getParameters().getDomain()) - .RunAdAction( + .runAdAction( AdActionType.ChangeUserPassword, new LdapChangeUserPasswordParameters(getParameters().getDomain(), getUserName(), getParameters() .getUserPassword(), getParameters().getNewPassword())).getSucceeded()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java index a9d188d..d96a2f6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java @@ -182,11 +182,11 @@ String domain = entry.getKey(); List<LdapUser> adUsers = (List<LdapUser>) LdapFactory.getInstance(domain) - .RunAdAction( + .runAdAction( AdActionType.GetAdUserByUserIdList, - new LdapSearchByUserIdListParameters(domain, - new ArrayList<Guid>(entry.getValue().keySet()), - false)) + new LdapSearchByUserIdListParameters(domain, + new ArrayList<Guid>(entry.getValue().keySet()), + false)) .getReturnValue(); HashSet<Guid> updatedUsers = new HashSet<Guid>(); if (adUsers == null) { @@ -271,7 +271,7 @@ LdapGroup groupFromAD = (LdapGroup) LdapFactory .getInstance(group.getdomain()) - .RunAdAction(AdActionType.GetAdGroupByGroupId, + .runAdAction(AdActionType.GetAdGroupByGroupId, new LdapSearchByIdParameters(group.getdomain(), group.getid())) .getReturnValue(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java index 8546a4b..cd36dd3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDirectoryUserByIdQuery.java @@ -19,9 +19,9 @@ String domain = getParameters().getDomain(); Guid id = getParameters().getId(); LdapBroker broker = LdapFactory.getInstance(domain); - LdapUser user = (LdapUser) broker.RunAdAction( - AdActionType.GetAdUserByUserId, - new LdapSearchByIdParameters(domain, id) + LdapUser user = (LdapUser) broker.runAdAction( + AdActionType.GetAdUserByUserId, + new LdapSearchByIdParameters(domain, id) ).getReturnValue(); getQueryReturnValue().setReturnValue(user); } 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 e016103..716a0ed 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 @@ -62,7 +62,7 @@ // local user Object tempVar = null; Object execResult = - adFactory.RunAdAction( + adFactory.runAdAction( AdActionType.GetAdUserByUserName, new LdapSearchByUserNameParameters(getParameters().getSessionId(), getDomain(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java index 01e0aa4..bd58b4b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginUserCommand.java @@ -28,7 +28,7 @@ log.error("No LdapBrokerImpl can be retrieved."); return new UserAuthenticationResult(VdcBllMessages.USER_FAILED_TO_AUTHENTICATION_WRONG_AUTHENTICATION_METHOD); } - LdapReturnValueBase adReturnValue = adFactory.RunAdAction(AdActionType.AuthenticateUser, + LdapReturnValueBase adReturnValue = adFactory.runAdAction(AdActionType.AuthenticateUser, new LdapUserPasswordBaseParameters(loginDomain, getParameters().getUserName(), getUserPassword())); UserAuthenticationResult authResult = (UserAuthenticationResult) adReturnValue.getReturnValue(); return authResult; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java index a18187f..c744402 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java @@ -195,7 +195,7 @@ ldapQueryData.setFilterParameters(new Object[] { data.getQueryForAdBroker() }); LdapReturnValueBase returnValue = - getLdapFactory(data.getDomain()).RunAdAction(adActionType, + getLdapFactory(data.getDomain()).runAdAction(adActionType, new LdapSearchByQueryParameters(data.getDomain(), ldapQueryData)); getQueryReturnValue().setSucceeded(returnValue.getSucceeded()); getQueryReturnValue().setExceptionString(returnValue.getExceptionString()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java index bbbb9ed..b84a379 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UserCommandBase.java @@ -60,7 +60,7 @@ if (dbUser == null) { LdapUser adUser = (LdapUser) LdapFactory .getInstance(domain) - .RunAdAction(AdActionType.GetAdUserByUserId, + .runAdAction(AdActionType.GetAdUserByUserId, new LdapSearchByIdParameters(sessionId, domain, id)) .getReturnValue(); if (adUser == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBroker.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBroker.java index c11ca97..f868933 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBroker.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBroker.java @@ -1,5 +1,5 @@ package org.ovirt.engine.core.bll.adbroker; public interface LdapBroker { - LdapReturnValueBase RunAdAction(AdActionType actionType, LdapBrokerBaseParameters parameters); + LdapReturnValueBase runAdAction(AdActionType actionType, LdapBrokerBaseParameters parameters); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerBase.java index d6becaf..ca0be21 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerBase.java @@ -12,8 +12,8 @@ protected abstract String getBrokerType(); - public LdapReturnValueBase RunAdAction(AdActionType actionType, LdapBrokerBaseParameters parameters) { - log.debug("RunAdAction Entry, actionType=" + actionType.toString()); + public LdapReturnValueBase runAdAction(AdActionType actionType, LdapBrokerBaseParameters parameters) { + log.debug("runAdAction Entry, actionType=" + actionType.toString()); BrokerCommandBase command = CreateCommand(actionType, parameters); return command.execute(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdListCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdListCommand.java index ca43fe8..296891a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdListCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdListCommand.java @@ -40,7 +40,7 @@ for (LdapQueryData queryData : queries) { java.util.ArrayList<LdapUser> tempUsers = (java.util.ArrayList<LdapUser>) LdapFactory .getInstance(getDomain()) - .RunAdAction(AdActionType.SearchUserByQuery, + .runAdAction(AdActionType.SearchUserByQuery, new LdapSearchByQueryParameters(getParameters().getSessionId(), getDomain(), queryData)) .getReturnValue(); if (tempUsers != null) { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java index e679b72..f531180 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java @@ -90,7 +90,7 @@ LdapReturnValueBase ldapRerunValue = new LdapReturnValueBase(); ldapRerunValue.setSucceeded(true); ldapRerunValue.setReturnValue(Collections.singletonList(result)); - when(ldapFactoryMock.RunAdAction(eq(getAdActionType()), + when(ldapFactoryMock.runAdAction(eq(getAdActionType()), argThat(new LdapParametersMatcher()))). thenReturn(ldapRerunValue); -- To view, visit http://gerrit.ovirt.org/21889 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2369a54c7db1bf0d32681d295839fb900debc57a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
