diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv')
9 files changed, 22 insertions, 20 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java b/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java index e01d40f8..93dd2502 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java @@ -34,9 +34,9 @@ public class MetaAttributeDef { private String mName; private ObjectIdentifier mOid; - private Class mValueClass; - private static Hashtable mNameToAttrDef = new Hashtable(); - private static Hashtable mOidToAttrDef = new Hashtable(); + private Class<?> mValueClass; + private static Hashtable<String, MetaAttributeDef> mNameToAttrDef = new Hashtable<String, MetaAttributeDef>(); + private static Hashtable<ObjectIdentifier, MetaAttributeDef> mOidToAttrDef = new Hashtable<ObjectIdentifier, MetaAttributeDef>(); private MetaAttributeDef() { } @@ -49,7 +49,7 @@ public class MetaAttributeDef { * @param valueClass attribute value class * @param oid attribute object identifier */ - private MetaAttributeDef(String name, Class valueClass, + private MetaAttributeDef(String name, Class<?> valueClass, ObjectIdentifier oid) { mName = name; mValueClass = valueClass; @@ -72,7 +72,7 @@ public class MetaAttributeDef { * * @return returns Java class for the attribute values */ - public Class getValueClass() { + public Class<?> getValueClass() { return mValueClass; } @@ -98,7 +98,7 @@ public class MetaAttributeDef { * @exception IllegalArgumentException if name or valueClass are null, or * conflicting attribute definition already exists */ - public static MetaAttributeDef register(String name, Class valueClass, + public static MetaAttributeDef register(String name, Class<?> valueClass, ObjectIdentifier oid) { if (name == null) { throw new IllegalArgumentException( @@ -183,7 +183,7 @@ public class MetaAttributeDef { * * @return returns enumeration of the registered attribute names */ - public static Enumeration getAttributeNames() { + public static Enumeration<String> getAttributeNames() { return mNameToAttrDef.keys(); } @@ -193,7 +193,7 @@ public class MetaAttributeDef { * * @return returns enumeration of the attribute object identifiers */ - public static Enumeration getAttributeNameOids() { + public static Enumeration<ObjectIdentifier> getAttributeNameOids() { return mOidToAttrDef.keys(); } } diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java b/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java index 82e0961c..dab45fdb 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java @@ -25,6 +25,7 @@ import java.util.Vector; import netscape.security.x509.CRLExtensions; import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.RevokedCertificate; import netscape.security.x509.X509CRLImpl; import com.netscape.certsrv.base.EBaseException; @@ -295,7 +296,7 @@ public interface ICRLIssuingPoint { * @param end next after last requested CRL entry * @return set of all the revoked certificates or null if there are none. */ - public Set getRevokedCertificates(int start, int end); + public Set<RevokedCertificate> getRevokedCertificates(int start, int end); /** * Returns certificate authority. @@ -373,7 +374,7 @@ public interface ICRLIssuingPoint { * * @return split times from CRL generation in milliseconds */ - public Vector getSplitTimes(); + public Vector<Long> getSplitTimes(); /** * Generates CRL now based on cache or local directory if cache diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java index 6f7a4961..d86a37dd 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java @@ -29,6 +29,7 @@ import netscape.security.x509.X509CertInfo; import org.mozilla.jss.crypto.SignatureAlgorithm; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; @@ -225,7 +226,7 @@ public interface ICertificateAuthority extends ISubsystem { * * @return enumeration of all the CRL issuing points */ - public Enumeration getCRLIssuingPoints(); + public Enumeration<ICRLIssuingPoint> getCRLIssuingPoints(); /** * Retrieves CRL issuing point with the given identifier. @@ -280,7 +281,7 @@ public interface ICertificateAuthority extends ISubsystem { * * @return name enumeration of all request listeners */ - public Enumeration getRequestListenerNames(); + public Enumeration<String> getRequestListenerNames(); /** * Retrieves the request listener for issued certificates. diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java index 7d851b74..173537d6 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java @@ -42,7 +42,7 @@ public interface IDBAttrMapper { * * @return a list of supported attribute names */ - public Enumeration getSupportedLDAPAttributeNames(); + public Enumeration<String> getSupportedLDAPAttributeNames(); /** * Maps object attribute into LDAP attributes. diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java index 4be6c340..ab1ce0a4 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java @@ -39,5 +39,5 @@ public interface IDBObj extends IAttrSet { * * @return a list of serializable attribute names */ - public Enumeration getSerializableAttrNames(); + public Enumeration<String> getSerializableAttrNames(); } diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java index ab90866b..9f15b808 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java @@ -28,7 +28,7 @@ import java.util.Enumeration; * * @version $Revision$, $Date$ */ -public interface IDBSearchResults extends Enumeration { +public interface IDBSearchResults extends Enumeration<Object> { /** * Checks if any element is available. diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java b/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java index 4a5592c0..b737f861 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java @@ -33,7 +33,7 @@ public class ModificationSet { /** * A list of modifications */ - private Vector mods = new Vector(); + private Vector<Modification> mods = new Vector<Modification>(); /** * Constructs modification set. @@ -57,7 +57,7 @@ public class ModificationSet { * * @return a list of Modifications */ - public Enumeration getModifications() { + public Enumeration<Modification> getModifications() { return mods.elements(); } } diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java index 2bc9f57b..5da23945 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java @@ -46,6 +46,6 @@ public interface IKeyRecordList { * @return key records * @exception EBaseException failed to retrieve key records */ - public Enumeration getKeyRecords(int startidx, int endidx) + public Enumeration<IKeyRecord> getKeyRecords(int startidx, int endidx) throws EBaseException; } diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java index 696dc4e1..53a3e37b 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java @@ -74,7 +74,7 @@ public interface IRequestRecord * * @return list of attribute names */ - public Enumeration getAttrNames(); + public Enumeration<String> getAttrNames(); /** * Gets the request attribute value by the name. @@ -105,7 +105,7 @@ public interface IRequestRecord * * @return attribute list */ - public Enumeration getElements(); + public Enumeration<String> getElements(); // IDBObj.getSerializableAttrNames //public Enumeration getSerializableAttrNames(); |