From e68dd1da3715d0b9d39bc6393a84732f15b7b7cd Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Fri, 21 Feb 2014 00:54:26 -0500 Subject: reame client_id to client_key_id --- .../com/netscape/certsrv/key/KeyArchivalRequest.java | 18 +++++++++--------- .../src/com/netscape/certsrv/key/KeyClient.java | 20 ++++++++++---------- .../common/src/com/netscape/certsrv/key/KeyInfo.java | 14 +++++++------- .../com/netscape/certsrv/key/KeyRequestResource.java | 2 +- .../src/com/netscape/certsrv/key/KeyResource.java | 6 +++--- .../certsrv/key/SymKeyGenerationRequest.java | 18 +++++++++--------- 6 files changed, 39 insertions(+), 39 deletions(-) (limited to 'base/common/src/com/netscape/certsrv/key') diff --git a/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java b/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java index ba87e1b8b..3c7628af9 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java +++ b/base/common/src/com/netscape/certsrv/key/KeyArchivalRequest.java @@ -36,7 +36,7 @@ import com.netscape.certsrv.base.ResourceMessage; @XmlAccessorType(XmlAccessType.FIELD) public class KeyArchivalRequest extends ResourceMessage { - private static final String CLIENT_ID = "clientID"; + private static final String CLIENT_KEY_ID = "clientKeyID"; private static final String DATA_TYPE = "dataType"; private static final String WRAPPED_PRIVATE_DATA = "wrappedPrivateData"; private static final String KEY_ALGORITHM = "keyAlgorithm"; @@ -48,7 +48,7 @@ public class KeyArchivalRequest extends ResourceMessage { } public KeyArchivalRequest(MultivaluedMap form) { - attributes.put(CLIENT_ID, form.getFirst(CLIENT_ID)); + attributes.put(CLIENT_KEY_ID, form.getFirst(CLIENT_KEY_ID)); attributes.put(DATA_TYPE, form.getFirst(DATA_TYPE)); attributes.put(WRAPPED_PRIVATE_DATA, form.getFirst(WRAPPED_PRIVATE_DATA)); attributes.put(KEY_ALGORITHM, form.getFirst(KEY_ALGORITHM)); @@ -62,17 +62,17 @@ public class KeyArchivalRequest extends ResourceMessage { } /** - * @return the clientId + * @return the clientKeyID */ - public String getClientId() { - return attributes.get(CLIENT_ID); + public String getClientKeyId() { + return attributes.get(CLIENT_KEY_ID); } /** - * @param clientId the clientId to set + * @param clientKeyId the clientKeyId to set */ - public void setClientId(String clientId) { - attributes.put(CLIENT_ID, clientId); + public void setClientKeyId(String clientKeyId) { + attributes.put(CLIENT_KEY_ID, clientKeyId); } /** @@ -150,7 +150,7 @@ public class KeyArchivalRequest extends ResourceMessage { public static void main(String args[]) throws Exception { KeyArchivalRequest before = new KeyArchivalRequest(); - before.setClientId("vek 12345"); + before.setClientKeyId("vek 12345"); before.setDataType(KeyRequestResource.SYMMETRIC_KEY_TYPE); before.setWrappedPrivateData("XXXXABCDEFXXX"); before.setKeyAlgorithm(KeyRequestResource.AES_ALGORITHM); diff --git a/base/common/src/com/netscape/certsrv/key/KeyClient.java b/base/common/src/com/netscape/certsrv/key/KeyClient.java index cb5d59772..3c27dbb6c 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyClient.java +++ b/base/common/src/com/netscape/certsrv/key/KeyClient.java @@ -47,14 +47,14 @@ public class KeyClient extends Client { keyRequestClient = createProxy(KeyRequestResource.class); } - public KeyInfoCollection findKeys(String clientID, String status, Integer maxSize, Integer maxTime, + public KeyInfoCollection findKeys(String clientKeyID, String status, Integer maxSize, Integer maxTime, Integer start, Integer size) { - Response response = keyClient.listKeys(clientID, status, maxSize, maxTime, start, size); + Response response = keyClient.listKeys(clientKeyID, status, maxSize, maxTime, start, size); return client.getEntity(response, KeyInfoCollection.class); } - public KeyInfo getActiveKeyInfo(String clientID) { - Response response = keyClient.getActiveKeyInfo(clientID); + public KeyInfo getActiveKeyInfo(String clientKeyID) { + Response response = keyClient.getActiveKeyInfo(clientKeyID); return client.getEntity(response, KeyInfo.class); } @@ -97,7 +97,7 @@ public class KeyClient extends Client { public KeyRequestInfoCollection findRequests( String requestState, String requestType, - String clientID, + String clientKeyID, RequestId start, Integer pageSize, Integer maxResults, @@ -105,7 +105,7 @@ public class KeyClient extends Client { Response response = keyRequestClient.listRequests( requestState, requestType, - clientID, + clientKeyID, start, pageSize, maxResults, @@ -118,12 +118,12 @@ public class KeyClient extends Client { return client.getEntity(response, KeyRequestInfo.class); } - public KeyRequestResponse archiveSecurityData(byte[] encoded, String clientId, String dataType, String algorithm, int strength) { + public KeyRequestResponse archiveSecurityData(byte[] encoded, String clientKeyId, String dataType, String algorithm, int strength) { // create archival request KeyArchivalRequest data = new KeyArchivalRequest(); String req1 = Utils.base64encode(encoded); data.setWrappedPrivateData(req1); - data.setClientId(clientId); + data.setClientKeyId(clientKeyId); data.setDataType(dataType); data.setKeyAlgorithm(algorithm); data.setKeySize(strength); @@ -158,9 +158,9 @@ public class KeyClient extends Client { return createRequest(data); } - public KeyRequestResponse generateKey(String clientId, String keyAlgorithm, int keySize, List usages) { + public KeyRequestResponse generateKey(String clientKeyId, String keyAlgorithm, int keySize, List usages) { SymKeyGenerationRequest data = new SymKeyGenerationRequest(); - data.setClientId(clientId); + data.setClientKeyId(clientKeyId); data.setKeyAlgorithm(keyAlgorithm); data.setKeySize(new Integer(keySize)); data.setUsages(usages); diff --git a/base/common/src/com/netscape/certsrv/key/KeyInfo.java b/base/common/src/com/netscape/certsrv/key/KeyInfo.java index a4f4e62f3..10da545d8 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyInfo.java +++ b/base/common/src/com/netscape/certsrv/key/KeyInfo.java @@ -40,7 +40,7 @@ public class KeyInfo { protected String keyURL; @XmlElement - protected String clientID; + protected String clientKeyID; @XmlElement protected String status; @@ -81,17 +81,17 @@ public class KeyInfo { } /** - * @return the clientID + * @return the clientKeyID */ - public String getClientID() { - return clientID; + public String getClientKeyID() { + return clientKeyID; } /** - * @param clientID the clientID to set + * @param clientKeyID the clientKeyID to set */ - public void setClientID(String clientID) { - this.clientID = clientID; + public void setClientKeyID(String clientKeyID) { + this.clientKeyID = clientKeyID; } public String getStatus() { diff --git a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java index 867136bc1..f5a652872 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java +++ b/base/common/src/com/netscape/certsrv/key/KeyRequestResource.java @@ -44,7 +44,7 @@ public interface KeyRequestResource { @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public Response listRequests(@QueryParam("requestState") String requestState, @QueryParam("requestType") String requestType, - @QueryParam("clientID") String clientID, + @QueryParam("clientKeyID") String clientKeyID, @QueryParam("start") RequestId start, @QueryParam("pageSize") Integer pageSize, @QueryParam("maxResults") Integer maxResults, diff --git a/base/common/src/com/netscape/certsrv/key/KeyResource.java b/base/common/src/com/netscape/certsrv/key/KeyResource.java index 5b5bf7a74..4b1281a4f 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyResource.java +++ b/base/common/src/com/netscape/certsrv/key/KeyResource.java @@ -26,7 +26,7 @@ public interface KeyResource { @GET @ClientResponseType(entityType=KeyInfoCollection.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public Response listKeys(@QueryParam("clientID") String clientID, + public Response listKeys(@QueryParam("clientKeyID") String clientKeyID, @QueryParam("status") String status, @QueryParam("maxResults") Integer maxResults, @QueryParam("maxTime") Integer maxTime, @@ -34,10 +34,10 @@ public interface KeyResource { @QueryParam("size") Integer size); @GET - @Path("active/{clientID}") + @Path("active/{clientKeyID}") @ClientResponseType(entityType=KeyInfo.class) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - public Response getActiveKeyInfo(@PathParam("clientID") String clientID); + public Response getActiveKeyInfo(@PathParam("clientKeyID") String clientKeyID); @GET @Path("{id}") diff --git a/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java b/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java index 7510b8c78..01326442f 100644 --- a/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java +++ b/base/common/src/com/netscape/certsrv/key/SymKeyGenerationRequest.java @@ -21,7 +21,7 @@ import com.netscape.certsrv.base.ResourceMessage; @XmlAccessorType(XmlAccessType.FIELD) public class SymKeyGenerationRequest extends ResourceMessage { - private static final String CLIENT_ID = "clientID"; + private static final String CLIENT_KEY_ID = "clientKeyID"; private static final String KEY_SIZE = "keySize"; private static final String KEY_ALGORITHM = "keyAlgorithm"; private static final String KEY_USAGE = "keyUsage"; @@ -61,7 +61,7 @@ public class SymKeyGenerationRequest extends ResourceMessage { } public SymKeyGenerationRequest(MultivaluedMap form) { - attributes.put(CLIENT_ID, form.getFirst(CLIENT_ID)); + attributes.put(CLIENT_KEY_ID, form.getFirst(CLIENT_KEY_ID)); attributes.put(KEY_SIZE, form.getFirst(KEY_SIZE)); attributes.put(KEY_ALGORITHM, form.getFirst(KEY_ALGORITHM)); attributes.put(KEY_USAGE, form.getFirst(KEY_USAGE)); @@ -79,17 +79,17 @@ public class SymKeyGenerationRequest extends ResourceMessage { } /** - * @return the clientId + * @return the clientKeyId */ - public String getClientId() { - return attributes.get(CLIENT_ID); + public String getClientKeyId() { + return attributes.get(CLIENT_KEY_ID); } /** - * @param clientId the clientId to set + * @param clientKeyId the clientKeyId to set */ - public void setClientId(String clientId) { - attributes.put(CLIENT_ID, clientId); + public void setClientKeyId(String clientKeyId) { + attributes.put(CLIENT_KEY_ID, clientKeyId); } /** @@ -139,7 +139,7 @@ public class SymKeyGenerationRequest extends ResourceMessage { public static void main(String args[]) throws Exception { SymKeyGenerationRequest before = new SymKeyGenerationRequest(); - before.setClientId("vek 12345"); + before.setClientKeyId("vek 12345"); before.setKeyAlgorithm(KeyRequestResource.AES_ALGORITHM); before.setKeySize(128); before.addUsage(SymKeyGenerationRequest.DECRYPT_USAGE); -- cgit