From 379ed8a0e133bee650e0acb24f6b743f657a50d0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 16:08:49 +0200 Subject: Last bit of cleanup honest New castor and dependent commons libs --- source/com/c2kernel/lookup/LDAPRoleManager.java | 15 +++++++-------- source/com/c2kernel/lookup/Path.java | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'source/com/c2kernel/lookup') diff --git a/source/com/c2kernel/lookup/LDAPRoleManager.java b/source/com/c2kernel/lookup/LDAPRoleManager.java index 1df2f29..0536d6c 100644 --- a/source/com/c2kernel/lookup/LDAPRoleManager.java +++ b/source/com/c2kernel/lookup/LDAPRoleManager.java @@ -28,8 +28,8 @@ public class LDAPRoleManager { * */ LDAPLookup mLdap; - private String mRolePath; - private String mEntityPath; + private final String mRolePath; + private final String mEntityPath; public LDAPRoleManager(LDAPLookup ldap, String rolePath, String entityPath) { super(); @@ -100,8 +100,7 @@ public class LDAPRoleManager { LDAPSearchConstraints searchCons = new LDAPSearchConstraints(); searchCons.setBatchSize(0); searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER ); - Enumeration roles = mLdap.search(mRolePath,LDAPConnection.SCOPE_SUB,filter,searchCons); - return roles.hasMoreElements(); + return mLdap.search(mRolePath,LDAPConnection.SCOPE_SUB,filter,searchCons).hasMoreElements(); } protected AgentPath[] getAgents(RolePath role) @@ -171,10 +170,10 @@ public class LDAPRoleManager { searchCons.setBatchSize(0); searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER ); String filter = "(&(objectclass=cristalagent)(uid="+agentName+"))"; - Enumeration res = mLdap.search(mEntityPath,LDAPConnection.SCOPE_SUB,filter,searchCons); + Enumeration res = mLdap.search(mEntityPath,LDAPConnection.SCOPE_SUB,filter,searchCons); if (!res.hasMoreElements()) throw new ObjectNotFoundException("Agent not found"); - Path result = (Path)res.nextElement(); + Path result = res.nextElement(); if (result instanceof AgentPath) return (AgentPath)result; else @@ -187,10 +186,10 @@ public class LDAPRoleManager { searchCons.setBatchSize(0); searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER ); String filter = "(&(objectclass=cristalrole)(cn="+roleName+"))"; - Enumeration res = mLdap.search(mRolePath,LDAPConnection.SCOPE_SUB,filter,searchCons); + Enumeration res = mLdap.search(mRolePath,LDAPConnection.SCOPE_SUB,filter,searchCons); if (!res.hasMoreElements()) throw new ObjectNotFoundException("Role not found"); - Path result = (Path)res.nextElement(); + Path result = res.nextElement(); if (result instanceof RolePath) return (RolePath)result; else diff --git a/source/com/c2kernel/lookup/Path.java b/source/com/c2kernel/lookup/Path.java index 4966d1e..16d4f07 100644 --- a/source/com/c2kernel/lookup/Path.java +++ b/source/com/c2kernel/lookup/Path.java @@ -259,7 +259,7 @@ public abstract class Path implements Serializable return mSysKey; } - public Enumeration getChildren() { + public Enumeration getChildren() { String filter = "objectclass=*"; LDAPSearchConstraints searchCons = new LDAPSearchConstraints(); searchCons.setBatchSize(10); @@ -268,9 +268,9 @@ public abstract class Path implements Serializable } public Path find(String name) throws ObjectNotFoundException { - Enumeration e = Gateway.getLDAPLookup().search(this, name); + Enumeration e = Gateway.getLDAPLookup().search(this, name); if (e.hasMoreElements()) { - Path thisPath =(Path)e.nextElement(); + Path thisPath = e.nextElement(); if (e.hasMoreElements()) throw new ObjectNotFoundException("More than one match for "+name, ""); return thisPath; -- cgit v1.2.3