Repository: incubator-unomi Updated Branches: refs/heads/master 84c8ec8a0 -> 8df430d33
UNOMI-165 Minor improvements to shell dev commands Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/397e8627 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/397e8627 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/397e8627 Branch: refs/heads/master Commit: 397e8627b584208629f7f818aa6d59b8f2d03584 Parents: 84c8ec8 Author: Jarek Lipski <[email protected]> Authored: Tue Feb 20 11:22:57 2018 +0100 Committer: Jarek Lipski <[email protected]> Committed: Tue Feb 20 11:22:57 2018 +0100 ---------------------------------------------------------------------- .../unomi/shell/commands/ActionListCommand.java | 15 ++++++--------- .../unomi/shell/commands/ActionViewCommand.java | 2 +- .../unomi/shell/commands/RuleListCommand.java | 9 +++------ .../shell/commands/RuleResetStatsCommand.java | 3 ++- .../unomi/shell/commands/RuleViewcommand.java | 2 +- .../unomi/shell/commands/SegmentListCommand.java | 18 ++++++++++-------- 6 files changed, 23 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/397e8627/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionListCommand.java ---------------------------------------------------------------------- diff --git a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionListCommand.java b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionListCommand.java index fa20217..27fb3c7 100644 --- a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionListCommand.java +++ b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionListCommand.java @@ -32,18 +32,15 @@ import java.util.Collection; @Command(scope = "action", name = "list", description = "This will list all the actions deployed in the Apache Unomi Context Server") public class ActionListCommand extends OsgiCommandSupport{ - DefinitionsService definitionsService; + private DefinitionsService definitionsService; + + @Option(name = "--csv", description = "Output table in CSV format", required = false, multiValued = false) + boolean csv; public void setDefinitionsService(DefinitionsService definitionsService) { this.definitionsService = definitionsService; } - @Option(name = "--no-format", description = "Disable table rendered output", required = false, multiValued = false) - boolean noFormat; - - @Option(name = "--csv", description = "Output table in CSV format", required = false, multiValued = false) - boolean csv; - @Override protected Object doExecute() throws Exception { Collection<ActionType> allActions = definitionsService.getAllActionTypes(); @@ -57,7 +54,7 @@ public class ActionListCommand extends OsgiCommandSupport{ DataTable dataTable = new DataTable(); for (ActionType actionType : allActions) { - ArrayList<Object> rowData = new ArrayList<Object>(); + ArrayList<Comparable> rowData = new ArrayList<>(); rowData.add(actionType.getItemId()); rowData.add(actionType.getMetadata().getName()); rowData.add(StringUtils.join(actionType.getMetadata().getSystemTags(), ",")); @@ -84,7 +81,7 @@ public class ActionListCommand extends OsgiCommandSupport{ row.addContent(rowData); } - shellTable.print(System.out, !noFormat); + shellTable.print(System.out); return null; } } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/397e8627/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionViewCommand.java ---------------------------------------------------------------------- diff --git a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionViewCommand.java b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionViewCommand.java index 6cfad94..3852fc0 100644 --- a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionViewCommand.java +++ b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/ActionViewCommand.java @@ -26,7 +26,7 @@ import org.apache.unomi.persistence.spi.CustomObjectMapper; @Command(scope = "action", name = "view", description = "This will display a single action deployed in the Apache Unomi Context Server") public class ActionViewCommand extends OsgiCommandSupport { - DefinitionsService definitionsService; + private DefinitionsService definitionsService; @Argument(index = 0, name = "actionId", description = "The identifier for the action", required = true, multiValued = false) String actionTypeIdentifier; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/397e8627/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleListCommand.java ---------------------------------------------------------------------- diff --git a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleListCommand.java b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleListCommand.java index e48df18..b41e809 100644 --- a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleListCommand.java +++ b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleListCommand.java @@ -34,10 +34,7 @@ import java.util.Set; @Command(scope = "rule", name = "list", description = "This will list all the rules deployed in the Apache Unomi Context Server") public class RuleListCommand extends OsgiCommandSupport { - RulesService rulesService; - - @Option(name = "--no-format", description = "Disable table rendered output", required = false, multiValued = false) - boolean noFormat; + private RulesService rulesService; @Option(name = "--csv", description = "Output table in CSV format", required = false, multiValued = false) boolean csv; @@ -67,7 +64,7 @@ public class RuleListCommand extends OsgiCommandSupport { DataTable dataTable = new DataTable(); for (Metadata ruleMetadata : ruleMetadatas) { - ArrayList<Comparable> rowData = new ArrayList<Comparable>(); + ArrayList<Comparable> rowData = new ArrayList<>(); String ruleId = ruleMetadata.getId(); rowData.add(ruleMetadata.isEnabled() ? "x" : ""); rowData.add(ruleMetadata.isHidden() ? "x" : ""); @@ -111,7 +108,7 @@ public class RuleListCommand extends OsgiCommandSupport { row.addContent(rowData); } - shellTable.print(System.out, !noFormat); + shellTable.print(System.out); return null; } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/397e8627/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleResetStatsCommand.java ---------------------------------------------------------------------- diff --git a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleResetStatsCommand.java b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleResetStatsCommand.java index 4ee6db0..eb50a15 100644 --- a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleResetStatsCommand.java +++ b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleResetStatsCommand.java @@ -23,7 +23,8 @@ import org.apache.unomi.api.services.RulesService; @Command(scope = "rule", name = "reset-stats", description = "This command will reset the rule statistics") public class RuleResetStatsCommand extends OsgiCommandSupport { - RulesService rulesService; + private RulesService rulesService; + public void setRulesService(RulesService rulesService) { this.rulesService = rulesService; } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/397e8627/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleViewcommand.java ---------------------------------------------------------------------- diff --git a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleViewcommand.java b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleViewcommand.java index 2379230..4f86f5e 100644 --- a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleViewcommand.java +++ b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/RuleViewcommand.java @@ -26,7 +26,7 @@ import org.apache.unomi.persistence.spi.CustomObjectMapper; @Command(scope = "rule", name = "view", description = "This will allows to view a rule in the Apache Unomi Context Server") public class RuleViewcommand extends OsgiCommandSupport { - RulesService rulesService; + private RulesService rulesService; @Argument(index = 0, name = "rule", description = "The identifier for the rule", required = true, multiValued = false) String ruleIdentifier; http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/397e8627/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/SegmentListCommand.java ---------------------------------------------------------------------- diff --git a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/SegmentListCommand.java b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/SegmentListCommand.java index c30360f..c2904b7 100644 --- a/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/SegmentListCommand.java +++ b/tools/shell-dev-commands/src/main/java/org/apache/unomi/shell/commands/SegmentListCommand.java @@ -34,16 +34,13 @@ public class SegmentListCommand extends OsgiCommandSupport { private SegmentService segmentService; + @Option(name = "--csv", description = "Output table in CSV format", required = false, multiValued = false) + boolean csv; + public void setSegmentService(SegmentService segmentService) { this.segmentService = segmentService; } - @Option(name = "--no-format", description = "Disable table rendered output", required = false, multiValued = false) - boolean noFormat; - - @Option(name = "--csv", description = "Output table in CSV format", required = false, multiValued = false) - boolean csv; - @Override protected Object doExecute() throws Exception { PartialList<Metadata> segmentMetadatas = segmentService.getSegmentMetadatas(0, -1, null); @@ -59,7 +56,7 @@ public class SegmentListCommand extends OsgiCommandSupport { DataTable dataTable = new DataTable(); for (Metadata metadata : segmentMetadatas.getList()) { - ArrayList<Object> rowData = new ArrayList<Object>(); + ArrayList<Comparable> rowData = new ArrayList<>(); rowData.add(metadata.isEnabled() ? "x" : ""); rowData.add(metadata.isHidden() ? "x" : ""); rowData.add(metadata.getId()); @@ -69,6 +66,11 @@ public class SegmentListCommand extends OsgiCommandSupport { dataTable.addRow(rowData.toArray(new Comparable[rowData.size()])); } + if (csv) { + System.out.println(dataTable.toCSV(headers)); + return null; + } + ShellTable shellTable = new ShellTable(); for (String header : headers) { shellTable.column(header); @@ -81,7 +83,7 @@ public class SegmentListCommand extends OsgiCommandSupport { Row row = shellTable.addRow(); row.addContent(rowData); } - shellTable.print(System.out, !noFormat); + shellTable.print(System.out); return null; }
