From 3c933d160f2db29ee8bdbdb7016ab96cd9667519 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Fri, 27 Sep 2013 14:30:45 -0400 Subject: Changes to TPSConnectorService based on review --- .../cmstools/system/TPSConnectorAddCLI.java | 27 ++++++++++++++++++---- .../netscape/cmstools/system/TPSConnectorCLI.java | 2 +- .../cmstools/system/TPSConnectorFindCLI.java | 24 +++++++++++++++---- .../cmstools/system/TPSConnectorRemoveCLI.java | 24 +++++++++++++++---- 4 files changed, 63 insertions(+), 14 deletions(-) (limited to 'base/java-tools/src/com') diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java index c9e1df985..7a5f19412 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorAddCLI.java @@ -17,6 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools.system; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -27,22 +30,36 @@ public class TPSConnectorAddCLI extends CLI { public TPSConnectorCLI tpsConnectorCLI; public TPSConnectorAddCLI(TPSConnectorCLI tpsConnectorCLI) { - super("add", "Add TPS Connector to TKS", tpsConnectorCLI); + super("add", "Add TPS connector to TKS", tpsConnectorCLI); this.tpsConnectorCLI = tpsConnectorCLI; } public void printHelp() { - formatter.printHelp(getFullName() + " ", options); + formatter.printHelp(getFullName() + " [OPTIONS...]", options); } public void execute(String[] args) throws Exception { - if (args.length != 2) { + Option option = new Option(null, "host", true, "TPS host"); + option.setArgName("host"); + options.addOption(option); + + option = new Option(null, "port", true, "TPS port"); + option.setArgName("port"); + options.addOption(option); + + CommandLine cmd = null; + + try { + cmd = parser.parse(options, args); + + } catch (Exception e) { + System.err.println("Error: " + e.getMessage()); printHelp(); System.exit(1); } - String tpsHost = args[0]; - String tpsPort = args[1]; + String tpsHost = cmd.getOptionValue("host"); + String tpsPort = cmd.getOptionValue("port"); tpsConnectorCLI.tpsConnectorClient.createConnector(tpsHost, tpsPort); diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java index 7a87c3428..609c08379 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorCLI.java @@ -33,7 +33,7 @@ public class TPSConnectorCLI extends CLI { public TPSConnectorClient tpsConnectorClient; public TPSConnectorCLI(CLI parent) { - super("tpsconnector", "TPS Connector management commands", parent); + super("tpsconnector", "TPS connector management commands", parent); addModule(new TPSConnectorAddCLI(this)); addModule(new TPSConnectorFindCLI(this)); diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java index 0a42b7d3f..4caab729f 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java @@ -22,9 +22,11 @@ import java.util.Collection; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; +import com.netscape.certsrv.base.ResourceNotFoundException; import com.netscape.certsrv.system.TPSConnectorCollection; import com.netscape.certsrv.system.TPSConnectorData; import com.netscape.cmstools.cli.CLI; +import com.netscape.cmstools.cli.MainCLI; /** * @author Ade Lee @@ -65,14 +67,26 @@ public class TPSConnectorFindCLI extends CLI { String tpsPort = cmd.getOptionValue("port"); if (tpsHost != null) { - if (tpsPort == null) tpsPort = "443"; - TPSConnectorData data = tpsConnectorCLI.tpsConnectorClient.getConnector( - tpsHost, tpsPort); - TPSConnectorCLI.printConnectorInfo(data); + if (tpsPort == null) + tpsPort = "443"; + try { + TPSConnectorData data = tpsConnectorCLI.tpsConnectorClient.getConnector( + tpsHost, tpsPort); + TPSConnectorCLI.printConnectorInfo(data); + } catch (ResourceNotFoundException e) { + System.out.println(" TPS connector not found."); + return; + } } else { TPSConnectorCollection result = tpsConnectorCLI.tpsConnectorClient.listConnectors(); Collection conns = result.getEntries(); + if (conns.isEmpty()) { + System.out.println(" No TPS connectors found."); + return; + } + + MainCLI.printMessage(conns.size() + " TPS connector(s) matched"); boolean first = true; for (TPSConnectorData data: conns) { if (first) { @@ -83,6 +97,8 @@ public class TPSConnectorFindCLI extends CLI { TPSConnectorCLI.printConnectorInfo(data); } + + MainCLI.printMessage("Number of entries returned " + conns.size()); } } } diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java index f721fe28f..875e5958e 100644 --- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorRemoveCLI.java @@ -17,6 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools.system; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Option; + import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -32,18 +35,31 @@ public class TPSConnectorRemoveCLI extends CLI { } public void printHelp() { - formatter.printHelp(getFullName() + " ", options); + formatter.printHelp(getFullName() + " [OPTIONS...]", options); } public void execute(String[] args) throws Exception { + Option option = new Option(null, "host", true, "TPS host"); + option.setArgName("host"); + options.addOption(option); + + option = new Option(null, "port", true, "TPS port"); + option.setArgName("port"); + options.addOption(option); + + CommandLine cmd = null; + + try { + cmd = parser.parse(options, args); - if (args.length != 2) { + } catch (Exception e) { + System.err.println("Error: " + e.getMessage()); printHelp(); System.exit(1); } - String tpsHost = args[0]; - String tpsPort = args[1]; + String tpsHost = cmd.getOptionValue("host"); + String tpsPort = cmd.getOptionValue("port"); tpsConnectorCLI.tpsConnectorClient.deleteConnector(tpsHost, tpsPort); -- cgit