Repository: camel Updated Branches: refs/heads/camel-2.15.x aedefc868 -> 9300f50e1 refs/heads/master ea79c61a0 -> 043db9005
Fixed jolokia camel commands for a few route commands. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/043db900 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/043db900 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/043db900 Branch: refs/heads/master Commit: 043db90053aca306f7115a1691acf397999b8570 Parents: ea79c61 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Sep 19 12:07:20 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Sep 19 12:07:20 2015 +0200 ---------------------------------------------------------------------- .../jolokia/DefaultJolokiaCamelController.java | 42 +++++++++-------- .../commands/jolokia/JolokiaCommandsTest.java | 49 ++++++++++++++++++-- .../commands/jolokia/JolokiaRemoteTest.java | 42 ++++++++--------- 3 files changed, 89 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/043db900/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 daf7ad6..7608f6b 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 @@ -452,7 +452,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple } @Override - public String getRouteModelAsXml(String camelContextName, String routeId) throws Exception { + public String getRouteModelAsXml(String routeId, String camelContextName) throws Exception { if (jolokia == null) { throw new IllegalStateException("Need to connect to remote jolokia first"); } @@ -472,7 +472,7 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple } @Override - public String getRouteStatsAsXml(String camelContextName, String routeId, boolean fullStats, boolean includeProcessors) throws Exception { + public String getRouteStatsAsXml(String routeId, String camelContextName, boolean fullStats, boolean includeProcessors) throws Exception { if (jolokia == null) { throw new IllegalStateException("Need to connect to remote jolokia first"); } @@ -611,24 +611,26 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple J4pExecResponse response = jolokia.execute(new J4pExecRequest(on, "listRestServices()")); if (response != null) { JSONObject data = response.getValue(); - for (Object obj : data.values()) { - JSONObject data2 = (JSONObject) obj; - JSONObject service = (JSONObject) data2.values().iterator().next(); - - Map<String, String> row = new LinkedHashMap<String, String>(); - row.put("basePath", asString(service.get("basePath"))); - row.put("baseUrl", asString(service.get("baseUrl"))); - row.put("consumes", asString(service.get("consumes"))); - row.put("description", asString(service.get("description"))); - row.put("inType", asString(service.get("inType"))); - row.put("method", asString(service.get("method"))); - row.put("outType", asString(service.get("outType"))); - row.put("produces", asString(service.get("produces"))); - row.put("routeId", asString(service.get("routeId"))); - row.put("state", asString(service.get("state"))); - row.put("uriTemplate", asString(service.get("uriTemplate"))); - row.put("url", asString(service.get("url"))); - answer.add(row); + if (data != null) { + for (Object obj : data.values()) { + JSONObject data2 = (JSONObject) obj; + JSONObject service = (JSONObject) data2.values().iterator().next(); + + Map<String, String> row = new LinkedHashMap<String, String>(); + row.put("basePath", asString(service.get("basePath"))); + row.put("baseUrl", asString(service.get("baseUrl"))); + row.put("consumes", asString(service.get("consumes"))); + row.put("description", asString(service.get("description"))); + row.put("inType", asString(service.get("inType"))); + row.put("method", asString(service.get("method"))); + row.put("outType", asString(service.get("outType"))); + row.put("produces", asString(service.get("produces"))); + row.put("routeId", asString(service.get("routeId"))); + row.put("state", asString(service.get("state"))); + row.put("uriTemplate", asString(service.get("uriTemplate"))); + row.put("url", asString(service.get("url"))); + answer.add(row); + } } } http://git-wip-us.apache.org/repos/asf/camel/blob/043db900/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 cd94979..ab4f8b9 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 @@ -21,6 +21,9 @@ import org.apache.camel.commands.ContextListCommand; import org.apache.camel.commands.EipExplainCommand; import org.apache.camel.commands.EndpointExplainCommand; import org.apache.camel.commands.EndpointListCommand; +import org.apache.camel.commands.RouteInfoCommand; +import org.apache.camel.commands.RouteListCommand; +import org.apache.camel.commands.RouteShowCommand; import org.junit.Ignore; import org.junit.Test; @@ -53,7 +56,7 @@ public class JolokiaCommandsTest { throw new IllegalArgumentException("Error connecting to " + url); } - ContextInfoCommand cmd = new ContextInfoCommand("myCamel", true); + ContextInfoCommand cmd = new ContextInfoCommand("camel-1", true); cmd.setStringEscape(new NoopStringEscape()); cmd.execute(controller, System.out, System.err); } @@ -80,7 +83,7 @@ public class JolokiaCommandsTest { throw new IllegalArgumentException("Error connecting to " + url); } - EndpointExplainCommand cmd = new EndpointExplainCommand("myCamel", true, "rest*"); + EndpointExplainCommand cmd = new EndpointExplainCommand("camel-1", true, "rest*"); cmd.execute(controller, System.out, System.err); } @@ -93,7 +96,47 @@ public class JolokiaCommandsTest { throw new IllegalArgumentException("Error connecting to " + url); } - EipExplainCommand cmd = new EipExplainCommand("myCamel", "transform", true); + EipExplainCommand cmd = new EipExplainCommand("camel-1", "transform", true); + cmd.execute(controller, System.out, System.err); + } + + @Test + public void testRouteList() throws Exception { + controller = new DefaultJolokiaCamelController(); + controller.connect(url, null, null); + + if (!controller.ping()) { + throw new IllegalArgumentException("Error connecting to " + url); + } + + RouteListCommand cmd = new RouteListCommand("camel-1"); + cmd.execute(controller, System.out, System.err); + } + + @Test + public void testRouteInfo() throws Exception { + controller = new DefaultJolokiaCamelController(); + controller.connect(url, null, null); + + if (!controller.ping()) { + throw new IllegalArgumentException("Error connecting to " + url); + } + + RouteInfoCommand cmd = new RouteInfoCommand("route1", "camel-1"); + cmd.setStringEscape(new NoopStringEscape()); + cmd.execute(controller, System.out, System.err); + } + + @Test + public void testRouteShow() throws Exception { + controller = new DefaultJolokiaCamelController(); + controller.connect(url, null, null); + + if (!controller.ping()) { + throw new IllegalArgumentException("Error connecting to " + url); + } + + RouteShowCommand cmd = new RouteShowCommand("route1", "camel-1"); cmd.execute(controller, System.out, System.err); } http://git-wip-us.apache.org/repos/asf/camel/blob/043db900/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java b/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java index 758b823..5165008 100644 --- a/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java +++ b/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java @@ -52,7 +52,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - Map<String, Object> data = controller.getCamelContextInformation("myCamel"); + Map<String, Object> data = controller.getCamelContextInformation("camel-1"); System.out.println(data); } @@ -61,7 +61,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - String data = controller.getCamelContextStatsAsXml("myCamel", true, false); + String data = controller.getCamelContextStatsAsXml("camel-1", true, false); System.out.println(data); } @@ -70,14 +70,14 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - controller.suspendContext("myCamel"); - Map<String, Object> data = controller.getCamelContextInformation("myCamel"); + controller.suspendContext("camel-1"); + Map<String, Object> data = controller.getCamelContextInformation("camel-1"); System.out.println(data); Thread.sleep(500); - controller.resumeContext("myCamel"); - data = controller.getCamelContextInformation("myCamel"); + controller.resumeContext("camel-1"); + data = controller.getCamelContextInformation("camel-1"); System.out.println(data); } @@ -95,7 +95,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - List<Map<String, String>> data = controller.getRoutes("myCamel"); + List<Map<String, String>> data = controller.getRoutes("camel-1"); System.out.println(data); } @@ -113,7 +113,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - controller.resetRouteStats("myCamel"); + controller.resetRouteStats("camel-1"); } @Test @@ -121,14 +121,14 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - controller.suspendRoute("myCamel", "route2"); - List<Map<String, String>> data = controller.getRoutes("myCamel", "route2"); + controller.suspendRoute("camel-1", "route1"); + List<Map<String, String>> data = controller.getRoutes("camel-1", "route1"); System.out.println(data); Thread.sleep(500); - controller.resumeRoute("myCamel", "route2"); - data = controller.getRoutes("myCamel", "route2"); + controller.resumeRoute("camel-1", "route1"); + data = controller.getRoutes("camel-1", "route1"); System.out.println(data); } @@ -137,7 +137,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - String data = controller.getRouteModelAsXml("myCamel", "route2"); + String data = controller.getRouteModelAsXml("camel-1", "route1"); System.out.println(data); } @@ -146,7 +146,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - String data = controller.getRouteStatsAsXml("myCamel", "route2", true, true); + String data = controller.getRouteStatsAsXml("camel-1", "route1", true, true); System.out.println(data); } @@ -155,7 +155,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - String data = controller.getRestModelAsXml("myCamel"); + String data = controller.getRestModelAsXml("camel-1"); System.out.println(data); } @@ -164,7 +164,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - List<Map<String, String>> data = controller.getEndpoints("myCamel"); + List<Map<String, String>> data = controller.getEndpoints("camel-1"); System.out.println(data); } @@ -173,7 +173,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - List<Map<String, String>> data = controller.getRestServices("myCamel"); + List<Map<String, String>> data = controller.getRestServices("camel-1"); System.out.println(data); } @@ -182,7 +182,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - String data = controller.explainEndpointAsJSon("myCamel", "log:foo", true); + String data = controller.explainEndpointAsJSon("camel-1", "log:foo", true); System.out.println(data); } @@ -191,7 +191,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - String data = controller.explainEipAsJSon("myCamel", "transform", true); + String data = controller.explainEipAsJSon("camel-1", "transform", true); System.out.println(data); } @@ -200,7 +200,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - List<Map<String, String>> data = controller.listComponents("myCamel"); + List<Map<String, String>> data = controller.listComponents("camel-1"); System.out.println(data); } @@ -209,7 +209,7 @@ public class JolokiaRemoteTest { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); - List<Map<String, Object>> data = controller.browseInflightExchanges("myCamel", 500, false); + List<Map<String, Object>> data = controller.browseInflightExchanges("camel-1", 500, false); System.out.println(data); }
