diff options
author | Adam Young <ayoung@redhat.com> | 2011-11-17 09:12:56 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-12-22 16:39:30 -0500 |
commit | be9ed32e9a4435e15ea60f61d0ea39a1917f0afd (patch) | |
tree | 3f13c0c4cbd879bece1fa5ec733ae0975a65c629 /pki/base/common | |
parent | fe6dab2ac277f8a0dde930c3c7cb015c727e14b6 (diff) | |
download | pki-be9ed32e9a4435e15ea60f61d0ea39a1917f0afd.tar.gz pki-be9ed32e9a4435e15ea60f61d0ea39a1917f0afd.tar.xz pki-be9ed32e9a4435e15ea60f61d0ea39a1917f0afd.zip |
Type safety for ACLs
Diffstat (limited to 'pki/base/common')
3 files changed, 18 insertions, 17 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java b/pki/base/common/src/com/netscape/certsrv/acls/ACL.java index 5c0c55c61..4200b94ad 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACL.java @@ -38,11 +38,12 @@ import java.util.Vector; public class ACL implements IACL, java.io.Serializable { /** - * - */ + * + */ private static final long serialVersionUID = -1867465948611161868L; - protected Vector mEntries = new Vector(); // ACL entries - protected Vector mRights = null; // possible rights entries + + protected Vector<ACLEntry> mEntries = new Vector<ACLEntry>(); // ACL entries + protected Vector<String> mRights = null; // possible rights entries protected String mResourceACLs = null; // exact resourceACLs string on ldap server protected String mName = null; // resource name protected String mDescription = null; // resource description @@ -66,12 +67,12 @@ public class ACL implements IACL, java.io.Serializable { * Allow administrators to read and modify log * configuration" */ - public ACL(String name, Vector rights, String resourceACLs) { + public ACL(String name, Vector<String> rights, String resourceACLs) { setName(name); if (rights != null) { mRights = rights; } else { - mRights = new Vector(); + mRights = new Vector<String>(); } mResourceACLs = resourceACLs; @@ -133,7 +134,7 @@ public class ACL implements IACL, java.io.Serializable { * Returns ACL entries. * @return enumeration for the <code>ACLEntry</code> vector */ - public Enumeration entries() { + public Enumeration<ACLEntry> entries() { return mEntries.elements(); } @@ -145,7 +146,7 @@ public class ACL implements IACL, java.io.Serializable { */ public String toString() { String entries = ""; - Enumeration e = entries(); + Enumeration<ACLEntry> e = entries(); for (; e.hasMoreElements();) { ACLEntry entry = (ACLEntry) e.nextElement(); @@ -178,7 +179,7 @@ public class ACL implements IACL, java.io.Serializable { * Returns rights entries. * @return enumeration of rights defined for this ACL */ - public Enumeration rights() { + public Enumeration<String> rights() { return mRights.elements(); } } diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java b/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java index 208361286..d689493b8 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java @@ -29,12 +29,12 @@ import java.util.StringTokenizer; * @version $Revision$, $Date$ */ public class ACLEntry implements IACLEntry, java.io.Serializable { - /** - * - */ + * + */ private static final long serialVersionUID = 422656406529200393L; - protected Hashtable mPerms = new Hashtable(); + + protected Hashtable<String, String> mPerms = new Hashtable<String, String>(); protected String mExpressions = null; protected boolean mNegative = false; protected String mACLEntryString = null; @@ -103,7 +103,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { * this entry. * @return a list of permissions for this ACL entry */ - public Enumeration permissions() { + public Enumeration<String> permissions() { return mPerms.elements(); } @@ -216,7 +216,7 @@ public class ACLEntry implements IACLEntry, java.io.Serializable { } else { entry += "allow ("; } - Enumeration e = permissions(); + Enumeration<String> e = permissions(); for (; e.hasMoreElements();) { String p = (String) e.nextElement(); diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java b/pki/base/common/src/com/netscape/certsrv/acls/IACL.java index 892bd490a..d336fc260 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/IACL.java @@ -48,13 +48,13 @@ public interface IACL { * Returns a list of access rights of the current ACL. * @return a list of access rights */ - public Enumeration rights(); + public Enumeration<String> rights(); /** * Returns a list of entries of the current ACL. * @return a list of entries */ - public Enumeration entries(); + public Enumeration<ACLEntry> entries(); /** * Verifies if permission is granted. |