diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 14:49:11 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:03:25 -0500 |
commit | 7c7b9d023cd466c1771068badc020dab36beb553 (patch) | |
tree | 178877eb83e25336be7577953945fbdb0b9e1a15 /base/common/src/com/netscape/cms/servlet/request | |
parent | da1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff) | |
download | pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz pki-7c7b9d023cd466c1771068badc020dab36beb553.zip |
Removed whitespaces from Java code.
Whitespaces in Java code have been removed with the following command:
find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \;
Ticket #134
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/request')
13 files changed, 97 insertions, 97 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java index d8fc68a69..b2043238b 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -62,7 +62,7 @@ import com.netscape.cms.servlet.common.RawJS; /** * Output a 'pretty print' of a certificate request - * + * * @version $Revision$, $Date$ */ public class CertReqParser extends ReqParser { @@ -82,7 +82,7 @@ public class CertReqParser extends ReqParser { /** * Constructs a certificate request parser. - * + * * @param details return detailed information (this can be time consuming) */ public CertReqParser(boolean details) { @@ -142,7 +142,7 @@ public class CertReqParser extends ReqParser { // show all http parameters stored in request. if (name.equalsIgnoreCase(IRequest.HTTP_PARAMS)) { Hashtable<String, String> http_params = req.getExtDataInHashtable(name); - // show certType specially + // show certType specially String certType = http_params.get(IRequest.CERT_TYPE); if (certType != null) { @@ -290,12 +290,12 @@ public class CertReqParser extends ReqParser { } if (name.equalsIgnoreCase(IRequest.CERT_INFO)) { - // Get the certificate info from the request + // Get the certificate info from the request X509CertInfo[] certInfo = req.getExtDataInCertInfoArray(IRequest.CERT_INFO); if (certInfo != null && certInfo[0] != null) { - // Get the subject name if any set. + // Get the subject name if any set. CertificateSubjectName subjectName = null; String signatureAlgorithm = null; String signatureAlgorithmName = null; @@ -410,7 +410,7 @@ public class CertReqParser extends ReqParser { } - // Get the public key + // Get the public key CertificateX509Key certKey = null; try { @@ -436,7 +436,7 @@ public class CertReqParser extends ReqParser { pp.toHexString(key.getKey(), 0, 16)); } - // Get the validity period + // Get the validity period CertificateValidity validity = null; try { @@ -444,7 +444,7 @@ public class CertReqParser extends ReqParser { (CertificateValidity) certInfo[0].get(X509CertInfo.VALIDITY); if (validity != null) { - long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - + long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - ((Date) validity.get(CertificateValidity.NOT_BEFORE)).getTime()) / 1000; arg.addLongValue("validityLength", validityLength); } @@ -694,7 +694,7 @@ public class CertReqParser extends ReqParser { // show all http parameters stored in request. if (name.equalsIgnoreCase(IRequest.HTTP_PARAMS)) { Hashtable<String, String> http_params = req.getExtDataInHashtable(name); - // show certType specially + // show certType specially String certType = http_params.get(IRequest.CERT_TYPE); if (certType != null) { @@ -818,7 +818,7 @@ public class CertReqParser extends ReqParser { } if (name.equalsIgnoreCase(IRequest.CERT_INFO)) { - // Get the certificate info from the request + // Get the certificate info from the request RevokedCertImpl revokedCert[] = req.getExtDataInRevokedCertArray(IRequest.CERT_INFO); if (mDetails && revokedCert != null) { diff --git a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java index b65c90fca..43b6d8901 100644 --- a/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java +++ b/base/common/src/com/netscape/cms/servlet/request/CheckRequest.java @@ -83,7 +83,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Check the status of a certificate request - * + * * @version $Revision$, $Date$ */ public class CheckRequest extends CMSServlet { @@ -123,7 +123,7 @@ public class CheckRequest extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "requestStatus.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class CheckRequest extends CMSServlet { * the 'queryPending' parameter. * <li>http.param queryPending query formatted as a CMC request * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -329,7 +329,7 @@ public class CheckRequest extends CMSServlet { String type = r.getRequestType(); Integer result = r.getExtDataInInteger(IRequest.RESULT); - /* if (type.equals(IRequest.ENROLLMENT_REQUEST) && (r.get("profile") != null) && status.equals(RequestStatus.COMPLETE)) { + /* if (type.equals(IRequest.ENROLLMENT_REQUEST) && (r.get("profile") != null) && status.equals(RequestStatus.COMPLETE)) { X509CertImpl cert = (X509CertImpl) r.get(IEnrollProfile.REQUEST_ISSUED_CERT); IArgBlock rarg = CMS.createArgBlock(); diff --git a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java index f90e97b70..7731efcb4 100644 --- a/base/common/src/com/netscape/cms/servlet/request/IReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/IReqParser.java @@ -29,7 +29,7 @@ import com.netscape.cms.servlet.common.CMSTemplateParams; * converts Java request object into name value * pairs and vice versa. * <P> - * + * * @version $Revision$, $Date$ */ public interface IReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java index b7ddc16d4..6c863733f 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyReqParser.java @@ -30,7 +30,7 @@ import com.netscape.cms.servlet.key.KeyRecordParser; /** * Output a 'pretty print' of a Key Archival request - * + * * @version $Revision$, $Date$ */ public class KeyReqParser extends ReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java index 82b1efa07..0ea06f983 100644 --- a/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/request/KeyRequestsResourceService.java @@ -15,7 +15,7 @@ // (C) 2011 Red Hat, Inc. // All rights reserved. // --- END COPYRIGHT BLOCK --- - + package com.netscape.cms.servlet.request; import javax.ws.rs.WebApplicationException; @@ -41,16 +41,16 @@ public class KeyRequestsResourceService extends CMSResourceService implements Ke public KeyRequestInfos listRequests(String requestState, String requestType, String clientID, RequestId start, int pageSize, int maxResults, int maxTime) { // auth and authz - + // get ldap filter String filter = createSearchFilter(requestState, requestType, clientID); CMS.debug("listRequests: filter is " + filter); - + // get start marker if (start == null) { start = new RequestId(KeyRequestsResource.DEFAULT_START); } - + KeyRequestDAO reqDAO = new KeyRequestDAO(); KeyRequestInfos requests; try { @@ -66,31 +66,31 @@ public class KeyRequestsResourceService extends CMSResourceService implements Ke private String createSearchFilter(String requestState, String requestType, String clientID) { String filter = ""; int matches = 0; - + if ((requestState == null) && (requestType == null) && (clientID == null)) { filter = "(requeststate=*)"; return filter; } - + if (requestState != null) { filter += "(requeststate=" + LDAPUtil.escape(requestState) + ")"; matches ++; } - + if (requestType != null) { filter += "(requesttype=" + LDAPUtil.escape(requestType) + ")"; matches ++; } - + if (clientID != null) { filter += "(clientID=" + LDAPUtil.escape(clientID) + ")"; matches ++; } - + if (matches > 1) { filter = "(&" + filter + ")"; } - + return filter; } } diff --git a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java index 9c173d832..bf8decd69 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/ProcessReq.java @@ -52,7 +52,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Display Generic Request detail to the user. - * + * * @version $Revision$, $Date$ */ public class ProcessReq extends CMSServlet { @@ -94,7 +94,7 @@ public class ProcessReq extends CMSServlet { * <LI><B>CertReqParser.DETAIL_PARSER</B> - Show certificate detail * <LI><B>KeyReqParser.PARSER</B> - Show key archival detail * </UL> - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -113,7 +113,7 @@ public class ProcessReq extends CMSServlet { mParser = KeyReqParser.PARSER; } - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); @@ -127,7 +127,7 @@ public class ProcessReq extends CMSServlet { * <li>http.param seqNum * <li>http.param doAssign reassign request. Value can be reassignToMe reassignToNobody * </ul> - * + * * @param cmsReq the object holding the request and response information */ public void process(CMSRequest cmsReq) throws EBaseException { @@ -261,7 +261,7 @@ public class ProcessReq extends CMSServlet { } } - // add authority names to know what privileges can be requested. + // add authority names to know what privileges can be requested. if (CMS.getSubsystem("kra") != null) header.addStringValue("localkra", "yes"); if (CMS.getSubsystem("ca") != null) @@ -272,8 +272,8 @@ public class ProcessReq extends CMSServlet { // DONT NEED TO DO THIS FOR DRM if (mAuthority instanceof ICertAuthority) { // Check/set signing algorithms dynamically. - // In RA mSigningAlgorithms could be null at startup if CA is not - // up and set later when CA comes back up. + // In RA mSigningAlgorithms could be null at startup if CA is not + // up and set later when CA comes back up. // Once it's set assumed that it won't change. String[] allAlgorithms = mSigningAlgorithms; diff --git a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java index f6ae634f4..f18fabc6a 100644 --- a/base/common/src/com/netscape/cms/servlet/request/QueryReq.java +++ b/base/common/src/com/netscape/cms/servlet/request/QueryReq.java @@ -47,7 +47,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Show paged list of requests matching search criteria - * + * * @version $Revision$, $Date$ */ public class QueryReq extends CMSServlet { @@ -118,7 +118,7 @@ public class QueryReq extends CMSServlet { /** * initialize the servlet. This servlet uses the template file * "queryReq.template" to process the response. - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { @@ -143,7 +143,7 @@ public class QueryReq extends CMSServlet { mParser = KeyReqParser.PARSER; } - // override success and error templates to null - + // override success and error templates to null - // handle templates locally. mTemplates.remove(CMSRequest.SUCCESS); mTemplates.remove(CMSRequest.ERROR); @@ -222,7 +222,7 @@ public class QueryReq extends CMSServlet { * <li>http.param totalCount total number of records in set of pages * <li>http.param direction "up", "down", "begin", or "end" * </ul> - * + * * @param cmsReq the object holding the request and response information */ @@ -254,7 +254,7 @@ public class QueryReq extends CMSServlet { Locale[] locale = new Locale[1]; try { - // if get a EBaseException we just throw it. + // if get a EBaseException we just throw it. form = getTemplate(mFormPath, req, locale); } catch (IOException e) { log(ILogger.LL_FAILURE, @@ -265,9 +265,9 @@ public class QueryReq extends CMSServlet { /** * WARNING: - * + * * PLEASE DO NOT TOUCH THE FILTER HERE. ALL FILTERS ARE INDEXED. - * + * **/ String filter = null; String reqState = req.getParameter("reqState"); @@ -353,7 +353,7 @@ public class QueryReq extends CMSServlet { /** * Perform search based on direction button pressed - * + * * @param filter ldap filter indicating which VLV to search through. This can be * 'all requests', 'pending', etc * @param count the number of requests to show per page @@ -382,7 +382,7 @@ public class QueryReq extends CMSServlet { } /** - * + * * @param locale * @param filter the types of requests to return - this must match the VLV index * @param count maximum number of records to return @@ -411,7 +411,7 @@ public class QueryReq extends CMSServlet { boolean jumptoend = false; if (marker.toString().equals("-1")) { marker = BigInteger.ZERO; // I think this is inconsequential - jumptoend = true; // override to '99' during search + jumptoend = true; // override to '99' during search } RequestId id = new RequestId(marker); @@ -487,7 +487,7 @@ public class QueryReq extends CMSServlet { /** * If the vector contains the marker element at the end, remove it. - * + * * @param v The vector to trim * @param marker the marker to look for. */ @@ -502,7 +502,7 @@ public class QueryReq extends CMSServlet { /** * Sometimes the list comes back from LDAP in reverse order. This function makes * sure the results are in 'forward' order. - * + * * @param list * @return */ @@ -527,7 +527,7 @@ public class QueryReq extends CMSServlet { /** * If the requests are in backwards order, reverse the list - * + * * @param list * @return */ diff --git a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java index 230ddb433..4a6a79072 100644 --- a/base/common/src/com/netscape/cms/servlet/request/ReqParser.java +++ b/base/common/src/com/netscape/cms/servlet/request/ReqParser.java @@ -29,7 +29,7 @@ import com.netscape.cms.servlet.common.CMSTemplateParams; /** * A class representing a request parser. * <P> - * + * * @version $Revision$, $Date$ */ public class ReqParser implements IReqParser { diff --git a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java index 08d5805b6..b9fa461fd 100644 --- a/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java +++ b/base/common/src/com/netscape/cms/servlet/request/SearchReqs.java @@ -49,7 +49,7 @@ import com.netscape.cms.servlet.common.ECMSGWException; /** * Search for certificates matching complex query filter - * + * * @version $Revision$, $Date$ */ public class SearchReqs extends CMSServlet { @@ -90,7 +90,7 @@ public class SearchReqs extends CMSServlet { /** * initialize the servlet. This servlet uses queryReq.template * to render the response - * + * * @param sc servlet configuration, read from the web.xml file */ public void init(ServletConfig sc) throws ServletException { diff --git a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java index 8a25c6684..bcc51bf96 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/ArchivalRequestData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.request.model; @@ -42,21 +42,21 @@ public class ArchivalRequestData { @XmlElement protected String clientId; - + @XmlElement protected String transWrappedSessionKey; - + @XmlElement protected String dataType; - + @XmlElement protected String wrappedPrivateData; - + public ArchivalRequestData() { // required for JAXB (defaults) } - - public ArchivalRequestData(MultivaluedMap<String, String> form) { + + public ArchivalRequestData(MultivaluedMap<String, String> form) { clientId = form.getFirst(CLIENT_ID); transWrappedSessionKey = form.getFirst(TRANS_WRAPPED_SESSION_KEY); dataType = form.getFirst(DATA_TYPE); @@ -118,6 +118,6 @@ public class ArchivalRequestData { public void setWrappedPrivateData(String wrappedPrivateData) { this.wrappedPrivateData = wrappedPrivateData; } - + } diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java index d1f1a27bd..aaea45398 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java @@ -53,20 +53,20 @@ public class KeyRequestDAO { private IKeyRecoveryAuthority kra; private static String REQUEST_ARCHIVE_OPTIONS = IEnrollProfile.REQUEST_ARCHIVE_OPTIONS; - + private String[] vlvFilters = { "(requeststate=*)", "(requesttype=enrollment)", "(requesttype=recovery)", "(requeststate=canceled)", "(&(requeststate=canceled)(requesttype=enrollment))", - "(&(requeststate=canceled)(requesttype=recovery))", - "(requeststate=rejected)", + "(&(requeststate=canceled)(requesttype=recovery))", + "(requeststate=rejected)", "(&(requeststate=rejected)(requesttype=enrollment))", "(&(requeststate=rejected)(requesttype=recovery))", "(requeststate=complete)", "(&(requeststate=complete)(requesttype=enrollment))", "(&(requeststate=complete)(requesttype=recovery))" }; - + public static final String ATTR_SERIALNO = "serialNumber"; public KeyRequestDAO() { @@ -75,12 +75,12 @@ public class KeyRequestDAO { } /** - * Finds list of requests matching the specified search filter. - * - * If the filter corresponds to a VLV search, then that search is executed and the pageSize + * Finds list of requests matching the specified search filter. + * + * If the filter corresponds to a VLV search, then that search is executed and the pageSize * and start parameters are used. Otherwise, the maxResults and maxTime parameters are * used in the regularly indexed search. - * + * * @param filter - ldap search filter * @param start - start position for VLV search * @param pageSize - page size for VLV search @@ -96,16 +96,16 @@ public class KeyRequestDAO { List <Link> links = new ArrayList<Link>(); int totalSize = 0; int current = 0; - + if (isVLVSearch(filter)) { IRequestVirtualList vlvlist = queue.getPagedRequestsByFilter(start, false, filter, pageSize +1 , "requestId"); totalSize = vlvlist.getSize(); current = vlvlist.getCurrentIndex(); - + int numRecords = (totalSize > (current + pageSize)) ? pageSize : totalSize - current; - + for (int i=0; i < numRecords; i++) { IRequest request = vlvlist.getElementAt(i); list.add(createKeyRequestInfo(request, uriInfo)); @@ -127,7 +127,7 @@ public class KeyRequestDAO { } } } - + // builder for vlv links MultivaluedMap<String, String> params = uriInfo.getQueryParameters(); UriBuilder builder = uriInfo.getAbsolutePathBuilder(); @@ -139,7 +139,7 @@ public class KeyRequestDAO { } builder.queryParam("start", "{start}"); builder.queryParam("pageSize", "{pageSize}"); - + // next link if (totalSize > current + pageSize) { int next = current + pageSize + 1; @@ -147,7 +147,7 @@ public class KeyRequestDAO { Link nextLink = new Link("next", nextUri.toString(), "application/xml"); links.add(nextLink); } - + // previous link if (current >0) { int previous = current - pageSize; @@ -155,18 +155,18 @@ public class KeyRequestDAO { Link previousLink = new Link("previous", previousUri.toString(), "application/xml"); links.add(previousLink); } - + KeyRequestInfos ret = new KeyRequestInfos(); ret.setRequests(list); ret.setLinks(links); return ret; } - + /** * Gets info for a specific request * @param id * @return info for specific request - * @throws EBaseException + * @throws EBaseException */ public KeyRequestInfo getRequest(RequestId id, UriInfo uriInfo) throws EBaseException { IRequest request = queue.findRequest(id); @@ -180,7 +180,7 @@ public class KeyRequestDAO { * Submits an archival request and processes it. * @param data * @return info for the request submitted. - * @throws EBaseException + * @throws EBaseException */ public KeyRequestInfo submitRequest(ArchivalRequestData data, UriInfo uriInfo) throws EBaseException { String clientId = data.getClientId(); @@ -209,9 +209,9 @@ public class KeyRequestDAO { * Submits a key recovery request. * @param data * @return info on the recovery request created - * @throws EBaseException + * @throws EBaseException */ - public KeyRequestInfo submitRequest(RecoveryRequestData data, UriInfo uriInfo) throws EBaseException { + public KeyRequestInfo submitRequest(RecoveryRequestData data, UriInfo uriInfo) throws EBaseException { // set data using request.setExtData(field, data) @@ -256,42 +256,42 @@ public class KeyRequestDAO { request.setRequestStatus(RequestStatus.APPROVED); queue.updateRequest(request); } - + public void rejectRequest(RequestId id) throws EBaseException { IRequest request = queue.findRequest(id); request.setRequestStatus(RequestStatus.CANCELED); queue.updateRequest(request); } - + public void cancelRequest(RequestId id) throws EBaseException { IRequest request = queue.findRequest(id); request.setRequestStatus(RequestStatus.REJECTED); queue.updateRequest(request); } - + public KeyRequestInfo createKeyRequestInfo(IRequest request, UriInfo uriInfo) { KeyRequestInfo ret = new KeyRequestInfo(); - + ret.setRequestType(request.getRequestType()); ret.setRequestStatus(request.getRequestStatus().toString()); - + Path keyRequestPath = KeyRequestResource.class.getAnnotation(Path.class); RequestId rid = request.getRequestId(); UriBuilder reqBuilder = uriInfo.getBaseUriBuilder(); reqBuilder.path(keyRequestPath.value() + "/" + rid); ret.setRequestURL(reqBuilder.build().toString()); - + Path keyPath = KeyResource.class.getAnnotation(Path.class); String kid = request.getExtDataInString("keyrecord"); UriBuilder keyBuilder = uriInfo.getBaseUriBuilder(); keyBuilder.path(keyPath.value() + "/" + kid); ret.setKeyURL(keyBuilder.build().toString()); - + return ret; } - + private boolean isVLVSearch(String filter) { for (int i=0; i < vlvFilters.length; i++) { if (vlvFilters[i].equalsIgnoreCase(filter)) { diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java index f07c302dd..fd3be8044 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java @@ -32,20 +32,20 @@ public class KeyRequestInfo { @XmlElement protected String requestType; - + @XmlElement protected String requestStatus; - + @XmlElement protected String requestURL; - + @XmlElement protected String keyURL; - + public KeyRequestInfo(){ // required to be here for JAXB (defaults) } - + /** * @return the requestType */ diff --git a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java index 80ec6d127..335414792 100644 --- a/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java +++ b/base/common/src/com/netscape/cms/servlet/request/model/RecoveryRequestData.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- /** - * + * */ package com.netscape.cms.servlet.request.model; @@ -40,7 +40,7 @@ import com.netscape.certsrv.request.RequestIdAdapter; @XmlRootElement(name="SecurityDataRecoveryRequest") @XmlAccessorType(XmlAccessType.FIELD) public class RecoveryRequestData { - + private static final String KEY_ID = "keyId"; private static final String REQUEST_ID = "requestId"; private static final String TRANS_WRAPPED_SESSION_KEY = "transWrappedSessionKey"; @@ -50,24 +50,24 @@ public class RecoveryRequestData { @XmlElement @XmlJavaTypeAdapter(KeyIdAdapter.class) protected KeyId keyId; - + @XmlElement @XmlJavaTypeAdapter(RequestIdAdapter.class) protected RequestId requestId; - + @XmlElement protected String transWrappedSessionKey; - + @XmlElement protected String sessionWrappedPassphrase; - + @XmlElement protected String nonceData; public RecoveryRequestData() { // required for JAXB (defaults) } - + public RecoveryRequestData(MultivaluedMap<String, String> form) { if (form.containsKey(KEY_ID)) { keyId = new KeyId(form.getFirst(KEY_ID)); |