Refactored AuditCLI.

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

3 files changed, 13 insertions, 6 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
index 531d92020..1e2273e51 100644
--- a/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditCLI.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import org.jboss.resteasy.plugins.providers.atom.Link;
 
+import com.netscape.certsrv.client.PKIClient;
 import com.netscape.certsrv.logging.AuditClient;
 import com.netscape.certsrv.logging.AuditConfig;
 import com.netscape.cmstools.cli.CLI;
@@ -46,12 +47,14 @@ public class AuditCLI extends CLI {
         return "pki-audit";
     }
 
-    public void execute(String[] args) throws Exception {
+    public AuditClient getAuditClient() throws Exception {
 
-        client = parent.getClient();
+        if (auditClient != null) return auditClient;
+
+        PKIClient client = getClient();
         auditClient = (AuditClient)parent.getClient("audit");
 
-        super.execute(args);
+        return auditClient;
     }
 
     public static void printAuditConfig(AuditConfig auditConfig) throws IOException {
diff --git a/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java
index 4dc5d8bdc..5ffb8a34d 100644
--- a/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditModifyCLI.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
+import com.netscape.certsrv.logging.AuditClient;
 import com.netscape.certsrv.logging.AuditConfig;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
@@ -83,6 +84,7 @@ public class AuditModifyCLI extends CLI {
         String input = cmd.getOptionValue("input");
         String output = cmd.getOptionValue("output");
 
+        AuditClient auditClient = auditCLI.getAuditClient();
         AuditConfig auditConfig;
 
         if (action == null) { // modify audit configuration
@@ -103,7 +105,7 @@ public class AuditModifyCLI extends CLI {
                 auditConfig = AuditConfig.valueOf(sw.toString());
             }
 
-            auditConfig = auditCLI.auditClient.updateAuditConfig(auditConfig);
+            auditConfig = auditClient.updateAuditConfig(auditConfig);
 
         } else { // change audit status
 
@@ -111,7 +113,7 @@ public class AuditModifyCLI extends CLI {
                 throw new Exception("Action and input file are mutually exclusive.");
             }
 
-            auditConfig = auditCLI.auditClient.changeAuditStatus(action);
+            auditConfig = auditClient.changeAuditStatus(action);
         }
 
         MainCLI.printMessage("Modified audit configuration");
diff --git a/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java
index c54055961..e6eadba81 100644
--- a/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/logging/AuditShowCLI.java
@@ -25,6 +25,7 @@ import java.util.Arrays;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 
+import com.netscape.certsrv.logging.AuditClient;
 import com.netscape.certsrv.logging.AuditConfig;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
@@ -70,7 +71,8 @@ public class AuditShowCLI extends CLI {
 
         String output = cmd.getOptionValue("output");
 
-        AuditConfig auditConfig = auditCLI.auditClient.getAuditConfig();
+        AuditClient auditClient = auditCLI.getAuditClient();
+        AuditConfig auditConfig = auditClient.getAuditConfig();
 
         if (output == null) {
             MainCLI.printMessage("Audit configuration");