Refactored client framework.

A new Client class was added as a base for all client classes. The
SubsystemClient was added as a base for all subsystem clients. It also
provides methods to authenticate against the subsystem. The DRMClient
has been renamed to KRAClient to match the actual subsystem name.

Ticket #701

1 files changed, 9 insertions, 10 deletions

diff --git a/base/common/src/com/netscape/certsrv/user/UserClient.java b/base/common/src/com/netscape/certsrv/user/UserClient.java
index 5f1ebd5b8..0c51821fe 100644
--- a/base/common/src/com/netscape/certsrv/user/UserClient.java
+++ b/base/common/src/com/netscape/certsrv/user/UserClient.java
@@ -21,32 +21,31 @@ import java.net.URISyntaxException;
 
 import org.jboss.resteasy.client.ClientResponse;
 
-import com.netscape.certsrv.client.ClientConfig;
+import com.netscape.certsrv.client.Client;
 import com.netscape.certsrv.client.PKIClient;
 
 /**
  * @author Endi S. Dewata
  */
-public class UserClient {
+public class UserClient extends Client {
 
-    public PKIClient client;
     public UserResource userClient;
     public UserCertResource userCertClient;
     public UserMembershipResource userMembershipClient;
 
-    public UserClient(ClientConfig config) throws URISyntaxException {
-        this(new PKIClient(config));
+    public UserClient(PKIClient client) throws URISyntaxException {
+        this(client, client.getSubsystem());
     }
 
-    public UserClient(PKIClient client) throws URISyntaxException {
-        this.client = client;
+    public UserClient(PKIClient client, String subsystem) throws URISyntaxException {
+        super(client, subsystem, "user");
         init();
     }
 
     public void init() throws URISyntaxException {
-        userClient = client.createProxy(UserResource.class);
-        userCertClient = client.createProxy(UserCertResource.class);
-        userMembershipClient = client.createProxy(UserMembershipResource.class);
+        userClient = createProxy(UserResource.class);
+        userCertClient = createProxy(UserCertResource.class);
+        userMembershipClient = createProxy(UserMembershipResource.class);
     }
 
     public UserCollection findUsers(String filter, Integer start, Integer size) {