From 56768d1bd274228a391ac8a4272ab9ccf5ac3e51 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Sat, 11 Aug 2012 04:53:30 -0500 Subject: Cleaned up REST client class names. The REST client classes have been renamed for better clarity and consistency. Ticket #259 --- .../com/netscape/cms/servlet/test/CAClient.java | 141 +++++++++++++++++++++ .../netscape/cms/servlet/test/CARestClient.java | 141 --------------------- .../src/com/netscape/cms/servlet/test/CATest.java | 10 +- 3 files changed, 146 insertions(+), 146 deletions(-) create mode 100644 base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java delete mode 100644 base/ca/functional/src/com/netscape/cms/servlet/test/CARestClient.java (limited to 'base/ca/functional') diff --git a/base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java b/base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java new file mode 100644 index 000000000..cc6aa19d5 --- /dev/null +++ b/base/ca/functional/src/com/netscape/cms/servlet/test/CAClient.java @@ -0,0 +1,141 @@ +//--- 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) 2012 Red Hat, Inc. +//All rights reserved. +//--- END COPYRIGHT BLOCK --- +package com.netscape.cms.servlet.test; + +import java.net.URISyntaxException; +import java.util.Collection; + +import com.netscape.certsrv.dbs.certdb.CertId; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.servlet.cert.CertResource; +import com.netscape.cms.servlet.cert.model.CertDataInfos; +import com.netscape.cms.servlet.cert.model.CertSearchData; +import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.csadmin.PKIClient; +import com.netscape.cms.servlet.profile.ProfileResource; +import com.netscape.cms.servlet.profile.model.ProfileData; +import com.netscape.cms.servlet.profile.model.ProfileDataInfos; +import com.netscape.cms.servlet.request.CertRequestResource; +import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData; +import com.netscape.cms.servlet.request.model.CertRequestInfo; +import com.netscape.cms.servlet.request.model.CertRequestInfos; +import com.netscape.cms.servlet.request.model.EnrollmentRequestData; + +public class CAClient extends PKIClient { + + private CertResource certClient; + private CertRequestResource certRequestClient; + private ProfileResource profileClient; + + public CAClient(ClientConfig config) throws URISyntaxException { + super(config); + + certRequestClient = createProxy(CertRequestResource.class); + certClient = createProxy(CertResource.class); + profileClient = createProxy(ProfileResource.class); + } + + public Collection listRequests(String requestState, String requestType) { + CertRequestInfos infos = null; + Collection list = null; + infos = certRequestClient.listRequests( + requestState, requestType, new RequestId(0), 100, 100, 10); + list = infos.getRequests(); + + return list; + } + + public CertDataInfos listCerts(String status) { + return certClient.listCerts(status, 100, 10); + } + + public CertDataInfos searchCerts(CertSearchData data) { + return certClient.searchCerts(data, 100, 10); + } + + public ProfileDataInfos listProfiles() { + return profileClient.listProfiles(); + } + + public ProfileData getProfile(String id) { + + if (id == null) { + return null; + } + + return profileClient.retrieveProfile(id); + } + + public CertificateData getCertData(CertId id) { + + if (id == null) { + return null; + } + + return certClient.getCert(id); + + } + + public CertRequestInfos enrollCertificate(EnrollmentRequestData data) { + if (data == null) { + return null; + } + + return certRequestClient.enrollCert(data); + } + + public CertRequestInfo getRequest(RequestId id) { + if (id == null) { + return null; + } + return certRequestClient.getRequestInfo(id); + } + + public AgentEnrollmentRequestData reviewRequest(RequestId id) { + if (id == null) { + return null; + } + return certRequestClient.reviewRequest(id); + } + + public void approveRequest(RequestId id, AgentEnrollmentRequestData data) { + certRequestClient.approveRequest(id, data); + } + + public void rejectRequest(RequestId id, AgentEnrollmentRequestData data) { + certRequestClient.rejectRequest(id, data); + } + + public void cancelRequest(RequestId id, AgentEnrollmentRequestData data) { + certRequestClient.cancelRequest(id, data); + } + + public void updateRequest(RequestId id, AgentEnrollmentRequestData data) { + certRequestClient.updateRequest(id, data); + } + + public void validateRequest(RequestId id, AgentEnrollmentRequestData data) { + certRequestClient.validateRequest(id, data); + } + + public void unassignRequest(RequestId id, AgentEnrollmentRequestData data) { + certRequestClient.unassignRequest(id, data); + } + +} diff --git a/base/ca/functional/src/com/netscape/cms/servlet/test/CARestClient.java b/base/ca/functional/src/com/netscape/cms/servlet/test/CARestClient.java deleted file mode 100644 index 24ce21277..000000000 --- a/base/ca/functional/src/com/netscape/cms/servlet/test/CARestClient.java +++ /dev/null @@ -1,141 +0,0 @@ -//--- 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) 2012 Red Hat, Inc. -//All rights reserved. -//--- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.test; - -import java.net.URISyntaxException; -import java.util.Collection; - -import com.netscape.certsrv.dbs.certdb.CertId; -import com.netscape.certsrv.request.RequestId; -import com.netscape.cms.client.cli.ClientConfig; -import com.netscape.cms.servlet.cert.CertResource; -import com.netscape.cms.servlet.cert.model.CertDataInfos; -import com.netscape.cms.servlet.cert.model.CertSearchData; -import com.netscape.cms.servlet.cert.model.CertificateData; -import com.netscape.cms.servlet.csadmin.CMSRestClient; -import com.netscape.cms.servlet.profile.ProfileResource; -import com.netscape.cms.servlet.profile.model.ProfileData; -import com.netscape.cms.servlet.profile.model.ProfileDataInfos; -import com.netscape.cms.servlet.request.CertRequestResource; -import com.netscape.cms.servlet.request.model.AgentEnrollmentRequestData; -import com.netscape.cms.servlet.request.model.CertRequestInfo; -import com.netscape.cms.servlet.request.model.CertRequestInfos; -import com.netscape.cms.servlet.request.model.EnrollmentRequestData; - -public class CARestClient extends CMSRestClient { - - private CertResource certClient; - private CertRequestResource certRequestClient; - private ProfileResource profileClient; - - public CARestClient(ClientConfig config) throws URISyntaxException { - super(config); - - certRequestClient = createProxy(CertRequestResource.class); - certClient = createProxy(CertResource.class); - profileClient = createProxy(ProfileResource.class); - } - - public Collection listRequests(String requestState, String requestType) { - CertRequestInfos infos = null; - Collection list = null; - infos = certRequestClient.listRequests( - requestState, requestType, new RequestId(0), 100, 100, 10); - list = infos.getRequests(); - - return list; - } - - public CertDataInfos listCerts(String status) { - return certClient.listCerts(status, 100, 10); - } - - public CertDataInfos searchCerts(CertSearchData data) { - return certClient.searchCerts(data, 100, 10); - } - - public ProfileDataInfos listProfiles() { - return profileClient.listProfiles(); - } - - public ProfileData getProfile(String id) { - - if (id == null) { - return null; - } - - return profileClient.retrieveProfile(id); - } - - public CertificateData getCertData(CertId id) { - - if (id == null) { - return null; - } - - return certClient.getCert(id); - - } - - public CertRequestInfos enrollCertificate(EnrollmentRequestData data) { - if (data == null) { - return null; - } - - return certRequestClient.enrollCert(data); - } - - public CertRequestInfo getRequest(RequestId id) { - if (id == null) { - return null; - } - return certRequestClient.getRequestInfo(id); - } - - public AgentEnrollmentRequestData reviewRequest(RequestId id) { - if (id == null) { - return null; - } - return certRequestClient.reviewRequest(id); - } - - public void approveRequest(RequestId id, AgentEnrollmentRequestData data) { - certRequestClient.approveRequest(id, data); - } - - public void rejectRequest(RequestId id, AgentEnrollmentRequestData data) { - certRequestClient.rejectRequest(id, data); - } - - public void cancelRequest(RequestId id, AgentEnrollmentRequestData data) { - certRequestClient.cancelRequest(id, data); - } - - public void updateRequest(RequestId id, AgentEnrollmentRequestData data) { - certRequestClient.updateRequest(id, data); - } - - public void validateRequest(RequestId id, AgentEnrollmentRequestData data) { - certRequestClient.validateRequest(id, data); - } - - public void unassignRequest(RequestId id, AgentEnrollmentRequestData data) { - certRequestClient.unassignRequest(id, data); - } - -} diff --git a/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java b/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java index 8fa4b9bb4..185f01f24 100644 --- a/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java +++ b/base/ca/functional/src/com/netscape/cms/servlet/test/CATest.java @@ -148,13 +148,13 @@ public class CATest { log("Exception in logging into token:" + e.toString()); } - CARestClient client; + CAClient client; try { ClientConfig config = new ClientConfig(); config.setServerURI(protocol + "://" + host + ":" + port + "/ca"); config.setCertNickname(clientCertNickname); - client = new CARestClient(config); + client = new CAClient(config); } catch (Exception e) { e.printStackTrace(); return; @@ -275,7 +275,7 @@ public class CATest { } - private static void enrollAndApproveCertRequest(CARestClient client, EnrollmentRequestData data) { + private static void enrollAndApproveCertRequest(CAClient client, EnrollmentRequestData data) { CertRequestInfos reqInfo = null; try { reqInfo = client.enrollCertificate(data); @@ -295,7 +295,7 @@ public class CATest { } } - private static void enrollCertRequest(CARestClient client, EnrollmentRequestData data) { + private static void enrollCertRequest(CAClient client, EnrollmentRequestData data) { CertRequestInfos reqInfo = null; try { reqInfo = client.enrollCertificate(data); @@ -560,7 +560,7 @@ public class CATest { private static void usage(Options options) { HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp("CARestClient Test:", options); + formatter.printHelp("CAClient Test:", options); System.exit(1); } -- cgit