From d5c6e6c69e678a79f9e8cd312e6007ad88026a36 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Mon, 6 Feb 2012 15:44:34 -0600 Subject: Added generics (part 4). This patch brings down the warnings from 3427 to 2917. Ticket #2 --- .../certsrv/dbs/certdb/ICertificateRepository.java | 17 +++++++++-------- .../com/netscape/certsrv/dbs/crldb/ICRLRepository.java | 16 ++++++++++------ .../com/netscape/certsrv/dbs/keydb/IKeyRepository.java | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) (limited to 'pki/base/common/src/com/netscape/certsrv/dbs') diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java index 60f867368..2e9e00f60 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java @@ -30,6 +30,7 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.dbs.ModificationSet; import com.netscape.certsrv.dbs.repository.IRepository; +import com.netscape.cmscore.dbs.CertificateRepository.RenewableCertificateCollection; /** * An interface represents a CMS certificate repository. @@ -205,7 +206,7 @@ public interface ICertificateRepository extends IRepository { * @return a list of certificates * @exception EBaseException failed to search */ - public Enumeration searchCertificates(String filter, int maxSize) + public Enumeration searchCertificates(String filter, int maxSize) throws EBaseException; /** @@ -218,7 +219,7 @@ public interface ICertificateRepository extends IRepository { * @return a list of certificates * @exception EBaseException failed to search */ - public Enumeration searchCertificates(String filter, int maxSize, + public Enumeration searchCertificates(String filter, int maxSize, int timeLimit) throws EBaseException; /** @@ -308,7 +309,7 @@ public interface ICertificateRepository extends IRepository { * @return a list of revoked certificates * @exception EBaseException failed to retrieve */ - public Enumeration getRevokedCertificates(Date asOfDate) + public Enumeration getRevokedCertificates(Date asOfDate) throws EBaseException; /** @@ -318,7 +319,7 @@ public interface ICertificateRepository extends IRepository { * @return a list of revoked certificates * @exception EBaseException failed to search */ - public Enumeration getAllRevokedCertificates() + public Enumeration getAllRevokedCertificates() throws EBaseException; /** @@ -327,7 +328,7 @@ public interface ICertificateRepository extends IRepository { * @return a list of revoked certificates * @exception EBaseException failed to search */ - public Enumeration getAllRevokedNonExpiredCertificates() + public Enumeration getAllRevokedNonExpiredCertificates() throws EBaseException; /** @@ -337,7 +338,7 @@ public interface ICertificateRepository extends IRepository { * @return a list of certificates * @exception EBaseException failed to search */ - public Enumeration findCertificates(String filter) + public Enumeration findCertificates(String filter) throws EBaseException; /** @@ -347,7 +348,7 @@ public interface ICertificateRepository extends IRepository { * @return a list of certificates * @exception EBaseException failed to search */ - public Enumeration findCertRecords(String filter) + public Enumeration findCertRecords(String filter) throws EBaseException; /** @@ -414,7 +415,7 @@ public interface ICertificateRepository extends IRepository { * @return certificates * @exception EBaseException failed to retrieve */ - public Hashtable getRenewableCertificates(String renewalTime) + public Hashtable getRenewableCertificates(String renewalTime) throws EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java index 3fb40b26d..806a2cb19 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java @@ -22,6 +22,8 @@ import java.util.Date; import java.util.Hashtable; import java.util.Vector; +import netscape.security.x509.RevokedCertificate; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.ModificationSet; @@ -109,7 +111,9 @@ public interface ICRLRepository { */ public void updateCRLIssuingPointRecord(String id, byte[] newCRL, Date thisUpdate, Date nextUpdate, BigInteger crlNumber, Long crlSize, - Hashtable revokedCerts, Hashtable unrevokedCerts, Hashtable expiredCerts) + Hashtable revokedCerts, + Hashtable unrevokedCerts, + Hashtable expiredCerts) throws EBaseException; /** @@ -120,7 +124,7 @@ public interface ICRLRepository { * @param unrevokedCerts list of released from hold certificates * @exception EBaseException failed to update issuing point record */ - public void updateRevokedCerts(String id, Hashtable revokedCerts, Hashtable unrevokedCerts) + public void updateRevokedCerts(String id, Hashtable revokedCerts, Hashtable unrevokedCerts) throws EBaseException; /** @@ -130,7 +134,7 @@ public interface ICRLRepository { * @param expiredCerts list of expired certificates * @exception EBaseException failed to update issuing point record */ - public void updateExpiredCerts(String id, Hashtable expiredCerts) + public void updateExpiredCerts(String id, Hashtable expiredCerts) throws EBaseException; /** @@ -144,9 +148,9 @@ public interface ICRLRepository { * @exception EBaseException failed to update issuing point record */ public void updateCRLCache(String id, Long crlSize, - Hashtable revokedCerts, - Hashtable unrevokedCerts, - Hashtable expiredCerts) + Hashtable revokedCerts, + Hashtable unrevokedCerts, + Hashtable expiredCerts) throws EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java index ca1e2c8aa..627844286 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java @@ -97,7 +97,7 @@ public interface IKeyRepository extends IRepository { * @return a list of private key records * @exception EBaseException failed to search keys */ - public Enumeration searchKeys(String filter, int maxSize) + public Enumeration searchKeys(String filter, int maxSize) throws EBaseException; /** @@ -109,7 +109,7 @@ public interface IKeyRepository extends IRepository { * @return a list of private key records * @exception EBaseException failed to search keys */ - public Enumeration searchKeys(String filter, int maxSize, int timeLimt) + public Enumeration searchKeys(String filter, int maxSize, int timeLimt) throws EBaseException; /** -- cgit