Alissa Bonas has uploaded a new change for review.
Change subject: core: rename find methods to lowercase in DirectorySearcher
......................................................................
core: rename find methods to lowercase in DirectorySearcher
Change-Id: I143b39bb7520e5d43fecc1c2723e0425c6567692
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcher.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapChangeUserPasswordCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdGroupByGroupIdCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserNameCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchGroupsByQueryCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchUserByQueryCommand.java
9 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/05/21405/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcher.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcher.java
index 3ca7a65..bdc27e7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcher.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/DirectorySearcher.java
@@ -37,7 +37,7 @@
this.ldapCredentials = ldapCredentials;
}
- public Object FindOne(LdapQueryData ldapQueryData) {
+ public Object findOne(LdapQueryData ldapQueryData) {
List<?> userObjects = find(ldapQueryData, 1);
if (userObjects == null || userObjects.size() == 0) {
@@ -46,7 +46,7 @@
return userObjects.get(0);
}
- public List<?> FindAll(LdapQueryData ldapQueryData) {
+ public List<?> findAll(LdapQueryData ldapQueryData) {
List<?> returnValue = find(ldapQueryData, 0);
if (returnValue == null) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
index 6255db3..bd250d9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
@@ -41,7 +41,7 @@
queryData.setLdapQueryType(LdapQueryType.getUserByName);
queryData.setFilterParameters(new Object[] { getLoginName() });
}
- Object searchResult = directorySearcher.FindOne(queryData);
+ Object searchResult = directorySearcher.findOne(queryData);
if (searchResult == null) {
log.errorFormat("Failed authenticating user: {0} to domain {1}.
Ldap Query Type is {2}",
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java
index 975bfa5..203020b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapBrokerUtils.java
@@ -217,7 +217,7 @@
DirectorySearcher directorySearcher = new
DirectorySearcher(ldapCredentials);
try {
- List<GroupSearchResult> searchResults = (List<GroupSearchResult>)
directorySearcher.FindAll(queryData);
+ List<GroupSearchResult> searchResults = (List<GroupSearchResult>)
directorySearcher.findAll(queryData);
return searchResults;
} catch (DomainNotConfiguredException ex) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapChangeUserPasswordCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapChangeUserPasswordCommand.java
index bac636a..fb1f257 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapChangeUserPasswordCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapChangeUserPasswordCommand.java
@@ -29,7 +29,7 @@
// directorySearcher.searchScope = SearchControls.SUBTREE_SCOPE;
//
directorySearcher.setFilteredAttributes(UserAttributeMapper.USERS_ATTRIBUTE_FILTER);
/*
- * JTODO: SearchResult objResult = directorySearcher.FindOne();
+ * JTODO: SearchResult objResult = directorySearcher.findOne();
* DirectoryEntry objLoginEntry = (objResult != null) ?
* objResult.GetDirectoryEntry() : null;
*
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdGroupByGroupIdCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdGroupByGroupIdCommand.java
index 5f53c2b..aaebc46 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdGroupByGroupIdCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdGroupByGroupIdCommand.java
@@ -27,7 +27,7 @@
queryData.setLdapQueryType(LdapQueryType.getGroupByGuid);
queryData.setDomain(getDomain());
- Object searchResult = directorySearcher.FindOne(queryData);
+ Object searchResult = directorySearcher.findOne(queryData);
if (searchResult != null) {
GroupSearchResult result = (GroupSearchResult) searchResult;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdCommand.java
index bdec7fa..fee095e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserIdCommand.java
@@ -27,7 +27,7 @@
queryData.setLdapQueryType(LdapQueryType.getUserByGuid);
queryData.setDomain(getDomain());
- Object searchResult = directorySearcher.FindOne(queryData);
+ Object searchResult = directorySearcher.findOne(queryData);
user = populateUserData((LdapUser) searchResult, getDomain());
if (user != null) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserNameCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserNameCommand.java
index 38d8eda..0035404 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserNameCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapGetAdUserByUserNameCommand.java
@@ -21,7 +21,7 @@
queryData.setDomain(getDomain());
queryData.setFilterParameters(new Object[] {
getUserName().split("[@]", -1)[0] });
queryData.setLdapQueryType(LdapQueryType.getUserByName);
- Object searchResult = directorySearcher.FindOne(queryData);
+ Object searchResult = directorySearcher.findOne(queryData);
setReturnValue(populateUserData((LdapUser) searchResult, getDomain()));
// if user is not null then action succeeded
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchGroupsByQueryCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchGroupsByQueryCommand.java
index 4238855..3c404fb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchGroupsByQueryCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchGroupsByQueryCommand.java
@@ -18,7 +18,7 @@
protected void executeQuery(DirectorySearcher directorySearcher) {
java.util.ArrayList<LdapGroup> groupList = new
java.util.ArrayList<LdapGroup>();
- List<GroupSearchResult> searchResults =
(List<GroupSearchResult>)directorySearcher.FindAll(getLdapQueryData());
+ List<GroupSearchResult> searchResults =
(List<GroupSearchResult>)directorySearcher.findAll(getLdapQueryData());
{
for (GroupSearchResult searchResult : searchResults) {
String distinguishedName = searchResult.getDistinguishedName();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchUserByQueryCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchUserByQueryCommand.java
index 54b9815..53a0762 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchUserByQueryCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapSearchUserByQueryCommand.java
@@ -19,7 +19,7 @@
final List<LdapUser> userList = new ArrayList<LdapUser>();
@SuppressWarnings("unchecked")
- final List<LdapUser> usersList = (List<LdapUser>)
directorySearcher.FindAll(getLdapQueryData());
+ final List<LdapUser> usersList = (List<LdapUser>)
directorySearcher.findAll(getLdapQueryData());
for (final LdapUser searchResult : usersList) {
{
LdapUser user = populateUserData(searchResult,
getLdapQueryData().getDomain());
--
To view, visit http://gerrit.ovirt.org/21405
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I143b39bb7520e5d43fecc1c2723e0425c6567692
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
