diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv')
10 files changed, 30 insertions, 34 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java b/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java index 4e8b0205..28e36da6 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IAttrSet.java @@ -68,5 +68,5 @@ public interface IAttrSet extends Serializable { * * @return an enumeration of the attribute names. */ - public Enumeration getElements(); + public Enumeration<?> getElements(); } diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java index 3902d443..ced3886c 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java @@ -35,5 +35,5 @@ public interface ISecurityDomainSessionTable { public long getBeginTime(String sessionId); public int getSize(); public long getTimeToLive(); - public Enumeration getSessionIds(); + public Enumeration<String> getSessionIds(); } diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java index fb8628ba..03adb700 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java @@ -42,7 +42,7 @@ public interface ISourceConfigStore extends Serializable { * @param name The property name * @return property value */ - public Object get(String name); + public String get(String name); /** * Retrieves a property. @@ -51,7 +51,7 @@ public interface ISourceConfigStore extends Serializable { * @param name The property name * @param value The property value */ - public void put(String name, Object value); + public String put(String name, String value); /** * Returns an enumeration of the config store's keys. @@ -61,7 +61,7 @@ public interface ISourceConfigStore extends Serializable { * @see java.util.Hashtable#elements * @see java.util.Enumeration */ - public Enumeration keys(); + public Enumeration<String> keys(); /** * Reads a config store from an input stream. diff --git a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java index 16324fb9..8e186fc4 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java @@ -38,7 +38,7 @@ import java.util.ResourceBundle; */ public class MessageFormatter { - private static final Class[] toStringSignature = { Locale.class }; + private static final Class<?>[] toStringSignature = { Locale.class }; /** * Retrieves the localized string. diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java index 1922e74c..65e40174 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java @@ -39,7 +39,7 @@ public class MetaInfo implements IAttrSet { public static final String REQUEST_ID = "requestId"; public static final String IN_LDAP_PUBLISH_DIR = "inLdapPublishDir"; - private Hashtable content = new Hashtable(); + private Hashtable<String, Object> content = new Hashtable<String, Object>(); /** * Constructs a meta information. @@ -59,7 +59,7 @@ public class MetaInfo implements IAttrSet { sb.append("[\n"); sb.append(" Meta information:\n"); - Enumeration enum1 = content.keys(); + Enumeration<String> enum1 = content.keys(); while (enum1.hasMoreElements()) { String key = (String) enum1.nextElement(); @@ -111,7 +111,7 @@ public class MetaInfo implements IAttrSet { * * @return an enumeration of the attribute names. */ - public Enumeration getElements() { + public Enumeration<String> getElements() { return content.keys(); } } diff --git a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java index 470ba654..fde20933 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java +++ b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java @@ -28,25 +28,21 @@ import java.util.Vector; * * @version $Revision$, $Date$ */ -public class Nonces implements IAuthInfo { +public class Nonces { - private Hashtable mNonces = new Hashtable(); - private Vector mNonceList = new Vector(); + private Hashtable<Long, X509Certificate> mNonces = new Hashtable<Long, X509Certificate>(); + private Vector<Long> mNonceList = new Vector<Long>(); private int mNonceLimit; /** * Constructs nonces. */ public Nonces() { - mNonceLimit = 100; - Vector mNonceList = new Vector(); - Hashtable mNonces = new Hashtable(); + this(100); } public Nonces(int limit) { mNonceLimit = limit; - Vector mNonceList = new Vector(); - Hashtable mNonces = new Hashtable(); } public long addNonce(long nonce, X509Certificate cert) { diff --git a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java index 29c390ac..151c2420 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java +++ b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java @@ -32,7 +32,7 @@ import java.util.Hashtable; * * @version $Revision$, $Date$ */ -public class SessionContext extends Hashtable implements IAuthInfo { +public class SessionContext extends Hashtable<Object,Object> { /** * @@ -84,7 +84,7 @@ public class SessionContext extends Hashtable implements IAuthInfo { */ public static final String IPADDRESS = "ipAddress"; - private static Hashtable mContexts = new Hashtable(); + private static Hashtable<Thread, SessionContext> mContexts = new Hashtable<Thread, SessionContext>(); /** * Constructs a session context. diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java index 678ccfee..651de782 100644 --- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java +++ b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java @@ -32,11 +32,11 @@ import java.util.Vector; */ public class NameValuePairs { - private Vector mPairs = new Vector(); + private Vector<NameValuePair> mPairs = new Vector<NameValuePair>(); // an index to speed up searching // The key is the name. The element is the NameValuePair. - private Hashtable index = new Hashtable(); + private Hashtable<String, NameValuePair> index = new Hashtable<String, NameValuePair>(); /** * Constructs name value pairs. @@ -122,8 +122,8 @@ public class NameValuePairs { * * @return a list of names */ - public Enumeration getNames() { - Vector v = new Vector(); + public Enumeration<String> getNames() { + Vector<String> v = new Vector<String>(); int size = mPairs.size(); for (int i = 0; i < size; i++) { @@ -183,7 +183,7 @@ public class NameValuePairs { * * @return name value objects */ - public Enumeration elements() { + public Enumeration<NameValuePair> elements() { return mPairs.elements(); } } diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index 3d327486..65ddeac9 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -37,9 +37,9 @@ import com.netscape.certsrv.publish.IPublisherProcessor; * @version $Revision$, $Date$ */ public class ARequestNotifier implements IRequestNotifier { - private Hashtable mListeners = new Hashtable(); - private Vector mNotifierThreads = new Vector(); - private Vector mRequests = new Vector(); + private Hashtable<String, IRequestListener> mListeners = new Hashtable<String, IRequestListener>(); + private Vector<Thread> mNotifierThreads = new Vector<Thread>(); + private Vector<String> mRequests = new Vector<String>(); private int mMaxRequests = 100; private boolean mSearchForRequests = false; private int mMaxThreads = 1; @@ -141,7 +141,7 @@ public class ARequestNotifier implements IRequestNotifier { * * @return enumeration of listener names */ - public Enumeration getListenerNames() { + public Enumeration<String> getListenerNames() { return mListeners.keys(); } @@ -169,7 +169,7 @@ public class ARequestNotifier implements IRequestNotifier { * * @return enumeration of listeners */ - public Enumeration getListeners() { + public Enumeration<IRequestListener> getListeners() { return mListeners.elements(); } @@ -327,7 +327,7 @@ public class ARequestNotifier implements IRequestNotifier { if (mIsPublishingQueueEnabled) { addToNotify(r); } else if (mMaxThreads == 0) { - Enumeration listeners = mListeners.elements(); + Enumeration<IRequestListener> listeners = mListeners.elements(); if (listeners != null && r != null) { while (listeners.hasMoreElements()) { IRequestListener l = (IRequestListener) listeners.nextElement(); @@ -485,7 +485,7 @@ public class ARequestNotifier implements IRequestNotifier { */ class RunListeners implements Runnable { IRequest mRequest = null; - Enumeration mListeners = null; + Enumeration<IRequestListener> mListeners = null; IRequestNotifier mRequestNotifier = null; /** @@ -494,7 +494,7 @@ class RunListeners implements Runnable { * @param r request * @param listeners list of listeners */ - public RunListeners(IRequest r, Enumeration listeners) { + public RunListeners(IRequest r, Enumeration<IRequestListener> listeners) { mRequest = r; mListeners = listeners; } diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java index 01527b67..ba06c626 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java @@ -62,7 +62,7 @@ public interface IRequestNotifier extends INotify { * * @return enumeration of listener names */ - public Enumeration getListenerNames(); + public Enumeration<String> getListenerNames(); /** * Gets listener from the list of registered listeners. @@ -77,7 +77,7 @@ public interface IRequestNotifier extends INotify { * * @return enumeration of listeners */ - public Enumeration getListeners(); + public Enumeration<IRequestListener> getListeners(); /** * Gets request from publishing queue. |