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 --- .../src/com/netscape/cms/client/user/UserCLI.java | 4 +- .../com/netscape/cms/client/user/UserClient.java | 89 ++++++++++++++++++++++ .../netscape/cms/client/user/UserRestClient.java | 89 ---------------------- 3 files changed, 91 insertions(+), 91 deletions(-) create mode 100644 base/common/src/com/netscape/cms/client/user/UserClient.java delete mode 100644 base/common/src/com/netscape/cms/client/user/UserRestClient.java (limited to 'base/common/src/com/netscape/cms/client/user') diff --git a/base/common/src/com/netscape/cms/client/user/UserCLI.java b/base/common/src/com/netscape/cms/client/user/UserCLI.java index a5104135b..cc9bc8aa5 100644 --- a/base/common/src/com/netscape/cms/client/user/UserCLI.java +++ b/base/common/src/com/netscape/cms/client/user/UserCLI.java @@ -34,7 +34,7 @@ import com.netscape.cms.client.cli.MainCLI; public class UserCLI extends CLI { public MainCLI parent; - public UserRestClient client; + public UserClient client; public UserCLI(MainCLI parent) { super("user", "User management commands"); @@ -75,7 +75,7 @@ public class UserCLI extends CLI { public void execute(String[] args) throws Exception { - client = new UserRestClient(parent.config); + client = new UserClient(parent.config); client.setVerbose(verbose); if (args.length == 0) { diff --git a/base/common/src/com/netscape/cms/client/user/UserClient.java b/base/common/src/com/netscape/cms/client/user/UserClient.java new file mode 100644 index 000000000..ea2991ac8 --- /dev/null +++ b/base/common/src/com/netscape/cms/client/user/UserClient.java @@ -0,0 +1,89 @@ +//--- 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.client.user; + +import java.net.URISyntaxException; + +import org.jboss.resteasy.client.ClientResponse; + +import com.netscape.certsrv.user.UserCertCollection; +import com.netscape.certsrv.user.UserCertData; +import com.netscape.certsrv.user.UserCertResource; +import com.netscape.certsrv.user.UserCollection; +import com.netscape.certsrv.user.UserData; +import com.netscape.certsrv.user.UserResource; +import com.netscape.cms.client.cli.ClientConfig; +import com.netscape.cms.servlet.csadmin.PKIClient; + +/** + * @author Endi S. Dewata + */ +public class UserClient extends PKIClient { + + public UserResource userClient; + public UserCertResource userCertClient; + + public UserClient(ClientConfig config) throws URISyntaxException { + super(config); + + userClient = createProxy(UserResource.class); + userCertClient = createProxy(UserCertResource.class); + } + + public UserCollection findUsers(String filter, Integer start, Integer size) { + return userClient.findUsers(filter, start, size); + } + + public UserData getUser(String userID) { + return userClient.getUser(userID); + } + + public UserData addUser(UserData userData) { + @SuppressWarnings("unchecked") + ClientResponse response = (ClientResponse)userClient.addUser(userData); + return getEntity(response); + } + + public UserData modifyUser(String userID, UserData userData) { + @SuppressWarnings("unchecked") + ClientResponse response = (ClientResponse)userClient.modifyUser(userID, userData); + return getEntity(response); + } + + public void removeUser(String userID) { + userClient.removeUser(userID); + } + + public UserCertCollection findUserCerts(String userID, Integer start, Integer size) { + return userCertClient.findUserCerts(userID, start, size); + } + + public UserCertData getUserCert(String userID, String certID) { + return userCertClient.getUserCert(userID, certID); + } + + public UserCertData addUserCert(String userID, UserCertData userCertData) { + @SuppressWarnings("unchecked") + ClientResponse response = (ClientResponse)userCertClient.addUserCert(userID, userCertData); + return getEntity(response); + } + + public void removeUserCert(String userID, String certID) { + userCertClient.removeUserCert(userID, certID); + } +} diff --git a/base/common/src/com/netscape/cms/client/user/UserRestClient.java b/base/common/src/com/netscape/cms/client/user/UserRestClient.java deleted file mode 100644 index 54c1e3fa1..000000000 --- a/base/common/src/com/netscape/cms/client/user/UserRestClient.java +++ /dev/null @@ -1,89 +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.client.user; - -import java.net.URISyntaxException; - -import org.jboss.resteasy.client.ClientResponse; - -import com.netscape.certsrv.user.UserCertCollection; -import com.netscape.certsrv.user.UserCertData; -import com.netscape.certsrv.user.UserCertResource; -import com.netscape.certsrv.user.UserCollection; -import com.netscape.certsrv.user.UserData; -import com.netscape.certsrv.user.UserResource; -import com.netscape.cms.client.cli.ClientConfig; -import com.netscape.cms.servlet.csadmin.CMSRestClient; - -/** - * @author Endi S. Dewata - */ -public class UserRestClient extends CMSRestClient { - - public UserResource userClient; - public UserCertResource userCertClient; - - public UserRestClient(ClientConfig config) throws URISyntaxException { - super(config); - - userClient = createProxy(UserResource.class); - userCertClient = createProxy(UserCertResource.class); - } - - public UserCollection findUsers(String filter, Integer start, Integer size) { - return userClient.findUsers(filter, start, size); - } - - public UserData getUser(String userID) { - return userClient.getUser(userID); - } - - public UserData addUser(UserData userData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)userClient.addUser(userData); - return getEntity(response); - } - - public UserData modifyUser(String userID, UserData userData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)userClient.modifyUser(userID, userData); - return getEntity(response); - } - - public void removeUser(String userID) { - userClient.removeUser(userID); - } - - public UserCertCollection findUserCerts(String userID, Integer start, Integer size) { - return userCertClient.findUserCerts(userID, start, size); - } - - public UserCertData getUserCert(String userID, String certID) { - return userCertClient.getUserCert(userID, certID); - } - - public UserCertData addUserCert(String userID, UserCertData userCertData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)userCertClient.addUserCert(userID, userCertData); - return getEntity(response); - } - - public void removeUserCert(String userID, String certID) { - userCertClient.removeUserCert(userID, certID); - } -} -- cgit