diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-03-24 03:53:07 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-03-28 01:09:54 +0200 |
| commit | 98a767027aa05b9ea7ef7c66553c66a5056f23a2 (patch) | |
| tree | 7fd3e139af5fc2ca63e085bcc8f7285cfccbbb9b /base/java-tools/src | |
| parent | f44965d97cb8d501797ad574ba4aee42d41634c7 (diff) | |
| download | pki-98a767027aa05b9ea7ef7c66553c66a5056f23a2.tar.gz pki-98a767027aa05b9ea7ef7c66553c66a5056f23a2.tar.xz pki-98a767027aa05b9ea7ef7c66553c66a5056f23a2.zip | |
Refactored TPSCertCLI.
The TPSCertCLI and its submodules have been modified to use lazy
initialization to get the PKIClient object.
Diffstat (limited to 'base/java-tools/src')
3 files changed, 12 insertions, 5 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java index 4fce3bcc3..835a522e1 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertCLI.java @@ -20,6 +20,7 @@ package com.netscape.cmstools.tps.cert; import org.jboss.resteasy.plugins.providers.atom.Link; +import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.tps.cert.TPSCertClient; import com.netscape.certsrv.tps.cert.TPSCertData; import com.netscape.cmstools.cli.CLI; @@ -38,12 +39,14 @@ public class TPSCertCLI extends CLI { addModule(new TPSCertShowCLI(this)); } - public void execute(String[] args) throws Exception { + public TPSCertClient getTPSCertClient() throws Exception { - client = parent.getClient(); + if (certClient != null) return certClient; + + PKIClient client = getClient(); certClient = (TPSCertClient)parent.getClient("cert"); - super.execute(args); + return certClient; } public static void printCert(TPSCertData cert) { diff --git a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java index bea4266c0..a73a211d8 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java @@ -24,6 +24,7 @@ import java.util.Collection; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import com.netscape.certsrv.tps.cert.TPSCertClient; import com.netscape.certsrv.tps.cert.TPSCertCollection; import com.netscape.certsrv.tps.cert.TPSCertData; import com.netscape.cmstools.cli.CLI; @@ -91,7 +92,8 @@ public class TPSCertFindCLI extends CLI { throw new Exception("Invalid value for --size parameter: " + string4, e); } - TPSCertCollection result = certCLI.certClient.findCerts(filter, tokenID, start, size); + TPSCertClient certClient = certCLI.getTPSCertClient(); + TPSCertCollection result = certClient.findCerts(filter, tokenID, start, size); MainCLI.printMessage(result.getTotal() + " entries matched"); if (result.getTotal() == 0) return; diff --git a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertShowCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertShowCLI.java index 16eaaf25b..f21f9f6f8 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertShowCLI.java @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.commons.cli.CommandLine; +import com.netscape.certsrv.tps.cert.TPSCertClient; import com.netscape.certsrv.tps.cert.TPSCertData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -59,7 +60,8 @@ public class TPSCertShowCLI extends CLI { String certID = cmdArgs[0]; - TPSCertData certData = certCLI.certClient.getCert(certID); + TPSCertClient certClient = certCLI.getTPSCertClient(); + TPSCertData certData = certClient.getCert(certID); MainCLI.printMessage("Certificate \"" + certID + "\""); |