diff options
Diffstat (limited to 'base/common/src/com/netscape/certsrv/key')
3 files changed, 50 insertions, 4 deletions
diff --git a/base/common/src/com/netscape/certsrv/key/KeyClient.java b/base/common/src/com/netscape/certsrv/key/KeyClient.java index 280b10c49..1a5dd50aa 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyClient.java +++ b/base/common/src/com/netscape/certsrv/key/KeyClient.java @@ -71,9 +71,9 @@ public class KeyClient extends Client { maxTime); } - public KeyRequestInfo createRequest(ResourceMessage data) { + public KeyRequestResponse createRequest(ResourceMessage data) { @SuppressWarnings("unchecked") - ClientResponse<KeyRequestInfo> response = (ClientResponse<KeyRequestInfo>) keyRequestClient.createRequest(data); + ClientResponse<KeyRequestResponse> response = (ClientResponse<KeyRequestResponse>) keyRequestClient.createRequest(data); return response.getEntity(); } diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java index 81cca7b41..e6e6c2e70 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java +++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java @@ -50,13 +50,13 @@ public interface KeyRequestResource { @QueryParam("maxTime") Integer maxTime); @POST - @ClientResponseType(entityType=KeyRequestInfo.class) + @ClientResponseType(entityType=KeyRequestResponse.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) public Response createRequest(MultivaluedMap<String, String> form); @POST - @ClientResponseType(entityType=KeyRequestInfo.class) + @ClientResponseType(entityType=KeyRequestResponse.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public Response createRequest(ResourceMessage data); diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResponse.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResponse.java new file mode 100644 index 000000000..1d21b4cec --- /dev/null +++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResponse.java @@ -0,0 +1,46 @@ +// --- BEGIN COPYRIGHT BLOCK --- +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// (C) 2014 Red Hat, Inc. +// All rights reserved. +// --- END COPYRIGHT BLOCK --- + +package com.netscape.certsrv.key; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "KeyRequestResponse") +public class KeyRequestResponse { + KeyRequestInfo requestInfo; + KeyData keyData; + + @XmlElement(name="RequestInfo") + public KeyRequestInfo getRequestInfo() { + return requestInfo; + } + + public void setRequestInfo(KeyRequestInfo requestInfo) { + this.requestInfo = requestInfo; + } + + @XmlElement(name="KeyData") + public KeyData getKeyData() { + return keyData; + } + + public void setKeyData(KeyData keyData) { + this.keyData = keyData; + } +} |