diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-03-24 03:56:03 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-03-28 01:10:32 +0200 |
| commit | b4174fa26cba3e55a642f271bbebe26250348592 (patch) | |
| tree | a651428e75a86e530735371e5f7ecaf51e15de06 /base/java-tools/src/com | |
| parent | 98a767027aa05b9ea7ef7c66553c66a5056f23a2 (diff) | |
| download | pki-b4174fa26cba3e55a642f271bbebe26250348592.tar.gz pki-b4174fa26cba3e55a642f271bbebe26250348592.tar.xz pki-b4174fa26cba3e55a642f271bbebe26250348592.zip | |
Refactored TPS ConfigCLI.
The TPS ConfigCLI and its submodules have been modified to use
lazy initialization to get the PKIClient object.
Diffstat (limited to 'base/java-tools/src/com')
3 files changed, 12 insertions, 5 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigCLI.java index f7b53ed63..d97e9b103 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigCLI.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.tps.config.ConfigClient; import com.netscape.certsrv.tps.config.ConfigData; import com.netscape.cmstools.cli.CLI; @@ -41,12 +42,14 @@ public class ConfigCLI extends CLI { addModule(new ConfigShowCLI(this)); } - public void execute(String[] args) throws Exception { + public ConfigClient getConfigClient() throws Exception { - client = parent.getClient(); + if (configClient != null) return configClient; + + PKIClient client = getClient(); configClient = (ConfigClient)parent.getClient("config"); - super.execute(args); + return configClient; } public static void printConfigData(ConfigData configData) throws IOException { diff --git a/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigModifyCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigModifyCLI.java index c5da94310..06aaf1936 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigModifyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigModifyCLI.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.tps.config.ConfigClient; import com.netscape.certsrv.tps.config.ConfigData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -93,7 +94,8 @@ public class ConfigModifyCLI extends CLI { configData = ConfigData.valueOf(sw.toString()); } - configData = configCLI.configClient.updateConfig(configData); + ConfigClient configClient = configCLI.getConfigClient(); + configData = configClient.updateConfig(configData); MainCLI.printMessage("Updated configuration"); diff --git a/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigShowCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigShowCLI.java index d7f20e80d..627d2fef3 100644 --- a/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/tps/config/ConfigShowCLI.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.tps.config.ConfigClient; import com.netscape.certsrv.tps.config.ConfigData; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -70,7 +71,8 @@ public class ConfigShowCLI extends CLI { String output = cmd.getOptionValue("output"); - ConfigData configData = configCLI.configClient.getConfig(); + ConfigClient configClient = configCLI.getConfigClient(); + ConfigData configData = configClient.getConfig(); if (output == null) { MainCLI.printMessage("Configuration"); |