diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/key/model')
4 files changed, 23 insertions, 23 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java index f479c6f0d..c34c1752f 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java @@ -48,7 +48,7 @@ public class KeyDAO { private IKeyRepository repo; private IKeyRecoveryAuthority kra; private IRequestQueue queue; - + public KeyDAO() { kra = ( IKeyRecoveryAuthority ) CMS.getSubsystem( "kra" ); repo = kra.getKeyRepository(); @@ -57,7 +57,7 @@ public class KeyDAO { /** * Returns list of keys meeting specified search filter. * Currently, vlv searches are not used for keys. - * + * * @param filter * @param maxResults * @param maxTime @@ -65,29 +65,29 @@ public class KeyDAO { * @return * @throws EBaseException */ - public KeyDataInfos listKeys(String filter, int maxResults, int maxTime, UriInfo uriInfo) + public KeyDataInfos listKeys(String filter, int maxResults, int maxTime, UriInfo uriInfo) throws EBaseException { List <KeyDataInfo> list = new ArrayList<KeyDataInfo>(); Enumeration<IKeyRecord> e = null; - - e = repo.searchKeys(filter, maxResults, maxTime); + + e = repo.searchKeys(filter, maxResults, maxTime); if (e == null) { throw new EBaseException("search results are null"); } - + while (e.hasMoreElements()) { IKeyRecord rec = e.nextElement(); if (rec != null) { list.add(createKeyDataInfo(rec, uriInfo)); } } - + KeyDataInfos ret = new KeyDataInfos(); ret.setKeyInfos(list); - + return ret; } - + public KeyData getKey(KeyId keyId, RecoveryRequestData data) throws EBaseException { KeyData keyData; @@ -105,7 +105,7 @@ public class KeyDAO { // get wrapped key IKeyRecord rec = repo.readKeyRecord(keyId.toBigInteger()); if (rec == null) { - return null; + return null; } Hashtable<String, Object> requestParams = kra.getVolatileRequest( @@ -182,10 +182,10 @@ public class KeyDAO { kra.destroyVolatileRequest(request.getRequestId()); queue.markAsServiced(request); - + return keyData; } - + public KeyDataInfo createKeyDataInfo(IKeyRecord rec, UriInfo uriInfo) throws EBaseException { KeyDataInfo ret = new KeyDataInfo(); @@ -198,5 +198,5 @@ public class KeyDAO { return ret; } - + } diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java index 4f303e27d..2ff2b5d0c 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key.model; @@ -35,7 +35,7 @@ import javax.xml.bind.annotation.XmlElement; public class KeyData { @XmlElement String wrappedPrivateData; - + @XmlElement String nonceData; @@ -56,7 +56,7 @@ public class KeyData { public void setWrappedPrivateData(String wrappedPrivateData) { this.wrappedPrivateData = wrappedPrivateData; } - + /** * @return the nonceData */ diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java index 88b31b4d1..6fd9649fb 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfo.java @@ -16,11 +16,11 @@ // All rights reserved. // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.key.model; - + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -35,13 +35,13 @@ import com.netscape.certsrv.dbs.keydb.KeyId; @XmlRootElement(name="SecurityDataInfo") @XmlAccessorType(XmlAccessType.FIELD) public class KeyDataInfo { - + @XmlElement protected String keyURL; @XmlElement protected String clientID; - + public KeyDataInfo() { // required for JAXB (defaults) } diff --git a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java index b01184708..79e5add95 100644 --- a/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java +++ b/base/common/src/com/netscape/cms/servlet/key/model/KeyDataInfos.java @@ -28,10 +28,10 @@ import com.netscape.cms.servlet.base.model.Link; @XmlRootElement(name = "SecurityDataInfos") public class KeyDataInfos { - + protected Collection<KeyDataInfo> keyInfos; protected List<Link> links; - + /** * @return the keyInfos */ @@ -58,7 +58,7 @@ public class KeyDataInfos { public void setLinks(List<Link> links) { this.links = links; } - + @XmlTransient public String getNext() { if (links == null) { |