You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/08/05 15:16:50 UTC
[2/2] camel git commit: Polished karaf command
Polished karaf command
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/06db3cd2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/06db3cd2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/06db3cd2
Branch: refs/heads/master
Commit: 06db3cd24626287cfddaff4dd5c11df419a4500a
Parents: 887a21e
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 5 15:23:49 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 5 15:24:18 2015 +0200
----------------------------------------------------------------------
.../commands/AbstractLocalCamelController.java | 17 +++++++++++++++++
.../jolokia/DefaultJolokiaCamelController.java | 16 ++++++++++++++++
2 files changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/06db3cd2/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index 4fa7da0..8061b7c 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -457,6 +457,23 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll
answer.add(row);
}
}
+
+ // sort the list
+ Collections.sort(answer, new Comparator<Map<String, String>>() {
+ @Override
+ public int compare(Map<String, String> endpoint1, Map<String, String> endpoint2) {
+ String route1 = endpoint1.get("routeId");
+ String route2 = endpoint2.get("routeId");
+ int num = route1.compareTo(route2);
+ if (num == 0) {
+ String uri1 = endpoint1.get("uri");
+ String uri2 = endpoint2.get("uri");
+ num = uri1.compareTo(uri2);
+ }
+ return num;
+ }
+
+ });
}
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/06db3cd2/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
index bcf37e2..eb08b71 100644
--- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
+++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java
@@ -571,6 +571,22 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple
answer.add(row);
}
}
+
+ // sort the list
+ Collections.sort(answer, new Comparator<Map<String, String>>() {
+ @Override
+ public int compare(Map<String, String> endpoint1, Map<String, String> endpoint2) {
+ String route1 = endpoint1.get("routeId");
+ String route2 = endpoint2.get("routeId");
+ int num = route1.compareTo(route2);
+ if (num == 0) {
+ String uri1 = endpoint1.get("uri");
+ String uri2 = endpoint2.get("uri");
+ num = uri1.compareTo(uri2);
+ }
+ return num;
+ }
+ });
}
return answer;