Refactored KRAConnectorCLI for CA.

The KRAConnectorCLI for CA and its submodules have been modified
to use lazy initialization to get the PKIClient object.

4 files changed, 19 insertions, 9 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorAddCLI.java b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorAddCLI.java
index 1cf7546ab..7c61d9036 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorAddCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorAddCLI.java
@@ -27,6 +27,7 @@ import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
 import com.netscape.certsrv.system.ConnectorNotFoundException;
+import com.netscape.certsrv.system.KRAConnectorClient;
 import com.netscape.certsrv.system.KRAConnectorInfo;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
@@ -83,11 +84,13 @@ public class KRAConnectorAddCLI extends CLI {
         String kraPort = cmd.getOptionValue("port");
         String inputFile = cmd.getOptionValue("input-file");
 
+        KRAConnectorClient kraConnectorClient = kraConnectorCLI.getKRAConnectorClient();
+
         //check if connector exists
         boolean connectorExists = true;
         try {
             @SuppressWarnings("unused")
-            KRAConnectorInfo info = kraConnectorCLI.kraConnectorClient.getConnectorInfo();
+            KRAConnectorInfo info = kraConnectorClient.getConnectorInfo();
         } catch (ConnectorNotFoundException e) {
             connectorExists = false;
         }
@@ -102,7 +105,7 @@ public class KRAConnectorAddCLI extends CLI {
             Unmarshaller unmarshaller = context.createUnmarshaller();
             KRAConnectorInfo info = (KRAConnectorInfo) unmarshaller.unmarshal(fis);
 
-            kraConnectorCLI.kraConnectorClient.addConnector(info);
+            kraConnectorClient.addConnector(info);
             MainCLI.printMessage("Added KRA connector");
 
         } else {
@@ -110,7 +113,7 @@ public class KRAConnectorAddCLI extends CLI {
                 throw new Exception("Cannot add new host to existing connector.  " +
                         "No connector currently exists");
             }
-            kraConnectorCLI.kraConnectorClient.addHost(kraHost, kraPort);
+            kraConnectorClient.addHost(kraHost, kraPort);
             MainCLI.printMessage("Added KRA host \"" + kraHost + ":" + kraPort + "\"");
         }
     }
diff --git a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorCLI.java b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorCLI.java
index 872d4b9d6..4fb5b6ca1 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorCLI.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cmstools.system;
 
+import com.netscape.certsrv.client.PKIClient;
 import com.netscape.certsrv.system.KRAConnectorClient;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
@@ -45,9 +46,11 @@ public class KRAConnectorCLI extends CLI {
         }
     }
 
-    public void execute(String[] args) throws Exception {
+    public KRAConnectorClient getKRAConnectorClient() throws Exception {
 
-        client = parent.getClient();
+        if (kraConnectorClient != null) return kraConnectorClient;
+
+        PKIClient client = getClient();
 
         // determine the subsystem
         String subsystem = client.getSubsystem();
@@ -56,6 +59,6 @@ public class KRAConnectorCLI extends CLI {
         // create new KRA connector client
         kraConnectorClient = new KRAConnectorClient(client, subsystem);
 
-        super.execute(args);
+        return kraConnectorClient;
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorRemoveCLI.java
index 37383a62a..6a566c436 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorRemoveCLI.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
+import com.netscape.certsrv.system.KRAConnectorClient;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -71,7 +72,8 @@ public class KRAConnectorRemoveCLI extends CLI {
         String kraHost = cmd.getOptionValue("host");
         String kraPort = cmd.getOptionValue("port");
 
-        kraConnectorCLI.kraConnectorClient.removeConnector(kraHost, kraPort);
+        KRAConnectorClient kraConnectorClient = kraConnectorCLI.getKRAConnectorClient();
+        kraConnectorClient.removeConnector(kraHost, kraPort);
 
         MainCLI.printMessage("Removed KRA host \"" + kraHost + ":" + kraPort + "\"");
     }
diff --git a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorShowCLI.java b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorShowCLI.java
index c5aa3262c..119fc9292 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/KRAConnectorShowCLI.java
@@ -2,6 +2,7 @@ package com.netscape.cmstools.system;
 
 import java.util.Arrays;
 
+import com.netscape.certsrv.system.KRAConnectorClient;
 import com.netscape.certsrv.system.KRAConnectorInfo;
 import com.netscape.cmstools.cli.CLI;
 
@@ -18,14 +19,15 @@ public class KRAConnectorShowCLI extends CLI {
         formatter.printHelp(getFullName() + " [OPTIONS...]", options);
     }
 
-    public void execute(String[] args) {
+    public void execute(String[] args) throws Exception {
         // Always check for "--help" prior to parsing
         if (Arrays.asList(args).contains("--help")) {
             printHelp();
             return;
         }
 
-        KRAConnectorInfo info = kraConnectorCLI.kraConnectorClient.getConnectorInfo();
+        KRAConnectorClient kraConnectorClient = kraConnectorCLI.getKRAConnectorClient();
+        KRAConnectorInfo info = kraConnectorClient.getConnectorInfo();
 
         // Print the KRA Connector Information.