Repository: camel Updated Branches: refs/heads/master 83c65ef9d -> ba900f721
CAMEL-8044: Camel commands useable for remote JVMs using jolokia Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77164355 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77164355 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77164355 Branch: refs/heads/master Commit: 771643559cba99616c7fa0dc30859640087ded04 Parents: 83c65ef Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 17 10:05:47 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 17 10:05:47 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/commands/EndpointExplainCommand.java | 14 +++++++++++--- .../camel/commands/jolokia/JolokiaCommandsTest.java | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/77164355/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java index 338af0d..f1e4787 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java @@ -85,7 +85,12 @@ public class EndpointExplainCommand extends AbstractContextCommand { @Override public int compare(Map<String, String> o1, Map<String, String> o2) { // sort by kind first (need to -1 as we want path on top), then name - int answer = -1 * o1.get("kind").compareTo(o2.get("kind")); + String kind1 = o1.get("kind"); + String kind2 = o2.get("kind"); + int answer = 0; + if (kind1 != null && kind2 != null) { + answer = -1 * kind1.compareTo(kind2); + } if (answer == 0) { answer = o1.get("name").compareTo(o2.get("name")); } @@ -96,8 +101,11 @@ public class EndpointExplainCommand extends AbstractContextCommand { for (Map<String, String> option : options) { out.print("Option: "); out.println(option.get("name")); - out.print("Kind: "); - out.println(option.get("kind")); + String kind = option.get("kind"); + if (kind != null) { + out.print("Kind: "); + out.println(kind); + } String type = option.get("type"); if (type != null) { out.print("Type: "); http://git-wip-us.apache.org/repos/asf/camel/blob/77164355/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaCommandsTest.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaCommandsTest.java b/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaCommandsTest.java index 42b8630..1308f39 100644 --- a/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaCommandsTest.java +++ b/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaCommandsTest.java @@ -79,7 +79,7 @@ public class JolokiaCommandsTest { throw new IllegalArgumentException("Error connecting to " + url); } - EndpointExplainCommand cmd = new EndpointExplainCommand("camel-1", true, null); + EndpointExplainCommand cmd = new EndpointExplainCommand("myCamel", true, "rest*"); cmd.execute(controller, System.out, System.err); }
