diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv')
21 files changed, 40 insertions, 39 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java index 9d7ee46f..ace09a8c 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java @@ -67,12 +67,12 @@ public interface IEmailFormProcessor { * @return mail content */ public String getEmailContent(String form, - Hashtable tok2vals); + Hashtable<String, Object> tok2vals); /** * takes a vector of strings and concatenate them */ - public String formContent(Vector vec); + public String formContent(Vector<String> vec); /** * logs an entry in the log file. diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java b/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java index c5375cae..b537fbbd 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java @@ -65,7 +65,7 @@ public interface IMailNotification { * sets the recipients' email addresses * @param addresses a list of email addresses of the recipients */ - public void setTo(Vector addresses); + public void setTo(Vector<String> addresses); /** * sets the recipient's email address diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java b/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java index 2a9a87e3..22cfc232 100644 --- a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java +++ b/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.IAttrSet; * * @version $Revision$, $Date$ */ -public class AttrSetCollection extends Hashtable { +public class AttrSetCollection extends Hashtable<String, IAttrSet> { /** * diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java b/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java index d177f87b..36cc7cb3 100644 --- a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java +++ b/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java @@ -70,7 +70,7 @@ public class Pattern { */ public String substitute(AttrSetCollection attrSetCollection) { String temp = mS; - Enumeration keys = attrSetCollection.keys(); + Enumeration<String> keys = attrSetCollection.keys(); while (keys.hasMoreElements()) { String key = (String) keys.nextElement(); diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java index 0d44be08..953bb41e 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java @@ -56,7 +56,7 @@ public interface IGeneralNameConfig { * @return a vector of general names * @exception EBaseException failed to form general name */ - public Vector formGeneralNames(Object value) + public Vector<GeneralName> formGeneralNames(Object value) throws EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java index 834d462e..09f2415a 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java @@ -73,7 +73,7 @@ public interface IPolicyProcessor extends ISubsystem, * about policy implementations. Currently only the * the implementation id is expected. */ - Enumeration getPolicyImplsInfo(); + Enumeration<String> getPolicyImplsInfo(); /** * Returns the rule implementations registered with this processor. @@ -81,7 +81,7 @@ public interface IPolicyProcessor extends ISubsystem, * @return An Enumeration of uninitialized IPolicyRule * objects. */ - Enumeration getPolicyImpls(); + Enumeration<IPolicyRule> getPolicyImpls(); /** * Returns an implementation identified by a given id. @@ -98,7 +98,7 @@ public interface IPolicyProcessor extends ISubsystem, * @return A vector of name/value pairs in the form of * name=value. */ - Vector getPolicyImplConfig(String id); + Vector<String> getPolicyImplConfig(String id); /** * Deletes a policy implementation identified by an impl id. @@ -129,14 +129,14 @@ public interface IPolicyProcessor extends ISubsystem, * @return An Enumeration of Strings describing the information * about policy rule instances. */ - Enumeration getPolicyInstancesInfo(); + Enumeration<String> getPolicyInstancesInfo(); /** * Returns policy instances registered with this processor. * * @return An Enumeration of policy instances. */ - Enumeration getPolicyInstances(); + Enumeration<IPolicyRule> getPolicyInstances(); /** * Returns instance configuration for a given instance id. @@ -145,7 +145,7 @@ public interface IPolicyProcessor extends ISubsystem, * @return A vector of name/value pairs in the form of * name=value. */ - Vector getPolicyInstanceConfig(String id); + Vector<String> getPolicyInstanceConfig(String id); /** * Returns instance configuration for a given instance id. @@ -172,7 +172,7 @@ public interface IPolicyProcessor extends ISubsystem, * @param ht a Hashtable of config params. * @exception EBaseException is thrown if an error occurs in addition. */ - void addPolicyInstance(String id, Hashtable ht) + void addPolicyInstance(String id, Hashtable<String, String> ht) throws EBaseException; /** @@ -183,7 +183,7 @@ public interface IPolicyProcessor extends ISubsystem, * @param ht a Hashtable of config params. * @exception EBaseException is thrown if an error occurs in addition. */ - void modifyPolicyInstance(String id, Hashtable ht) + void modifyPolicyInstance(String id, Hashtable<String, String> ht) throws EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java index d80a0d0c..0babd48a 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java @@ -110,7 +110,7 @@ public interface IPolicyRule * @return nvPairs A Vector of name/value pairs. Each name/value * pair is constructed as a String in name=value format. */ - public Vector getInstanceParams(); + public Vector<String> getInstanceParams(); /** * Return default parameters for a policy implementation. @@ -118,7 +118,7 @@ public interface IPolicyRule * @return nvPairs A Vector of name/value pairs. Each name/value * pair is constructed as a String in name=value. */ - public Vector getDefaultParams(); + public Vector<String> getDefaultParams(); public void setError(IRequest req, String format, Object[] params); diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java index ea12f4b1..dd5a36bc 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java @@ -90,7 +90,7 @@ public interface IPolicySet { * * @return An enumeration of rules. */ - Enumeration getRules(); + Enumeration<IPolicyRule> getRules(); /** * Apply policy rules on a request. This call may modify diff --git a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java index fae38c69..75f134c2 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.base.IConfigStore; public class CertInfoProfile { - private Vector mDefaults = new Vector(); + private Vector<ICertInfoPolicyDefault> mDefaults = new Vector<ICertInfoPolicyDefault>(); private String mName = null; private String mID = null; private String mDescription = null; @@ -96,7 +96,7 @@ public class CertInfoProfile public void populate(X509CertInfo info) { - Enumeration e1 = mDefaults.elements(); + Enumeration<ICertInfoPolicyDefault> e1 = mDefaults.elements(); while (e1.hasMoreElements()) { ICertInfoPolicyDefault def = (ICertInfoPolicyDefault)e1.nextElement(); diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java index 01805492..092b10fd 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java @@ -109,7 +109,7 @@ public interface IPolicyDefault extends IConfigTemplate { * @return a list of property names. The values are * of type java.lang.String */ - public Enumeration getValueNames(); + public Enumeration<String> getValueNames(); /** * Retrieves the descriptor of the given property diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java index c006db67..cc6975cd 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java @@ -26,6 +26,7 @@ import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cms.profile.common.ProfilePolicy; /** * This interface represents a profile. A profile contains @@ -137,7 +138,7 @@ public interface IProfile { * * @return input policy id list */ - public Enumeration getProfileInputIds(); + public Enumeration<String> getProfileInputIds(); /** * Retrieves input policy by id. @@ -152,7 +153,7 @@ public interface IProfile { * * @return output policy id list */ - public Enumeration getProfileOutputIds(); + public Enumeration<String> getProfileOutputIds(); /** * Retrieves output policy by id. @@ -243,7 +244,7 @@ public interface IProfile { * * @return a list of policy set id */ - public Enumeration getProfilePolicySetIds(); + public Enumeration<String> getProfilePolicySetIds(); /** * Creates a profile policy. @@ -325,7 +326,7 @@ public interface IProfile { * @param setId set id * @return a list of policy id */ - public Enumeration getProfilePolicyIds(String setId); + public Enumeration<String> getProfilePolicyIds(String setId); /** * Retrieves a default set id for the given request. @@ -343,7 +344,7 @@ public interface IProfile { * @param setId set id * @return a list of policies */ - public Enumeration getProfilePolicies(String setId); + public Enumeration<ProfilePolicy> getProfilePolicies(String setId); /** * Creates one or more requests. Normally, only one request will diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java index 195078f7..476002e2 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java @@ -89,7 +89,7 @@ public interface IProfileAuthenticator extends IAuthManager { * * @return a list of property names */ - public Enumeration getValueNames(); + public Enumeration<String> getValueNames(); /** * Checks if the value of the given property should be diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java index 6d861579..35453e7d 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java @@ -83,7 +83,7 @@ public interface IProfileInput extends IConfigTemplate { * * @return a list of property names */ - public Enumeration getValueNames(); + public Enumeration<String> getValueNames(); /** * Retrieves the descriptor of the given value diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java index b4654f40..6dbfea51 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java @@ -83,7 +83,7 @@ public interface IProfileOutput extends IConfigTemplate { * * @return a list of property names */ - public Enumeration getValueNames(); + public Enumeration<String> getValueNames(); /** * Retrieves the descriptor of the given value diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java index 795a19c0..6f2fef37 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java @@ -124,7 +124,7 @@ public interface IProfileSubsystem extends ISubsystem { * * @return a list of profile ids */ - public Enumeration getProfileIds(); + public Enumeration<String> getProfileIds(); /** * Checks if owner id should be enforced during profile approval. diff --git a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java b/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java index f435db50..e40c98fa 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java +++ b/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java @@ -41,7 +41,7 @@ public interface IConfigTemplate { * * @return parameter names */ - public Enumeration getConfigNames(); + public Enumeration<String> getConfigNames(); /** * Returns the descriptors of configuration parameter. diff --git a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java b/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java index 360477fe..f308a3e7 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java +++ b/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java @@ -26,7 +26,7 @@ import java.util.Hashtable; */ public class PropertySet { - private Hashtable mProperties = new Hashtable(); + private Hashtable<String, IDescriptor> mProperties = new Hashtable<String, IDescriptor>(); public PropertySet() { @@ -37,7 +37,7 @@ public class PropertySet { mProperties.put(name, desc); } - public Enumeration getNames() + public Enumeration<String> getNames() { return mProperties.keys(); } diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java index 62fe529f..3ab3a084 100644 --- a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java @@ -168,5 +168,5 @@ public interface IRegistrationAuthority extends ISubsystem { * * @return name enumeration of all request listeners */ - public Enumeration getRequestListenerNames(); + public Enumeration<String> getRequestListenerNames(); } diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java b/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java index 0497562b..7631f3ea 100644 --- a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java +++ b/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java @@ -49,7 +49,7 @@ public interface IPluginRegistry extends ISubsystem { * * @return a list of String-based names */ - public Enumeration getTypeNames(); + public Enumeration<String> getTypeNames(); /** * Returns a list of plugin identifiers of the given type. @@ -57,7 +57,7 @@ public interface IPluginRegistry extends ISubsystem { * @param type plugin type * @return a list of plugin IDs */ - public Enumeration getIds(String type); + public Enumeration<String> getIds(String type); /** * Retrieves the plugin information. diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java index c509e296..477a14c6 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -643,7 +643,7 @@ public interface IRequest { * @param key The extdata key * @return A Vector of strings, or null on error. */ - public Vector getExtDataInStringVector(String key); + public Vector<String> getExtDataInStringVector(String key); /** * Gets boolean value for given type or default value diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java index e575c58b..ff6f7be6 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java @@ -58,7 +58,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { * @return list of users * @exception EUsrGrpException thrown when any internal error occurs */ - public Enumeration listUsers(String filter) throws EUsrGrpException; + public Enumeration<IUser> listUsers(String filter) throws EUsrGrpException; /** * Adds the given user to the internal database @@ -107,7 +107,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { * @param filter the search filter * @return a list of groups that match the given search filter */ - public Enumeration findGroups(String filter); + public Enumeration<IGroup> findGroups(String filter); /** * Find a group for the given name @@ -125,7 +125,7 @@ public interface IUGSubsystem extends ISubsystem, IUsrGrp { * its description. * @exception EUsrGrpException thrown when failed to list groups */ - public Enumeration listGroups(String filter) throws EUsrGrpException; + public Enumeration<IGroup> listGroups(String filter) throws EUsrGrpException; /** * Retrieves a group from LDAP for the given group name |