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/07/22 08:15:02 UTC

camel git commit: CAMEL-8526: Add more EIP as specialized mbeans

Repository: camel
Updated Branches:
  refs/heads/master dfa458a2e -> fbe97105b


CAMEL-8526: Add more EIP as specialized mbeans


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fbe97105
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbe97105
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbe97105

Branch: refs/heads/master
Commit: fbe97105bb4e6e597fafd6dc80e7842206d74a05
Parents: dfa458a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 22 08:11:41 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 22 08:11:41 2015 +0200

----------------------------------------------------------------------
 .../camel/api/management/mbean/ManagedProcessorMBean.java   | 3 +++
 .../org/apache/camel/management/mbean/ManagedProcessor.java | 6 ++++++
 .../org/apache/camel/management/ManagedSplitterTest.java    | 9 +++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/fbe97105/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
index 3fe8fa5..bacb515 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedProcessorMBean.java
@@ -53,4 +53,7 @@ public interface ManagedProcessorMBean extends ManagedPerformanceCounterMBean {
     @ManagedOperation(description = "Explain how this processor is configured")
     TabularData explain(boolean allOptions);
 
+    @ManagedOperation(description = "Dumps the processor as XML")
+    String dumpProcessorAsXml() throws Exception;
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/fbe97105/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
index 39a7dc1..e1d9ef3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedProcessor.java
@@ -34,6 +34,7 @@ import org.apache.camel.api.management.ManagedInstance;
 import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.api.management.mbean.CamelOpenMBeanTypes;
 import org.apache.camel.api.management.mbean.ManagedProcessorMBean;
+import org.apache.camel.model.ModelHelper;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.util.JsonSchemaHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -171,4 +172,9 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
             throw ObjectHelper.wrapRuntimeCamelException(e);
         }
     }
+
+    @Override
+    public String dumpProcessorAsXml() throws Exception {
+        return ModelHelper.dumpModelAsXml(context, definition);
+    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/fbe97105/camel-core/src/test/java/org/apache/camel/management/ManagedSplitterTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedSplitterTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedSplitterTest.java
index 1f90754..bafff6d 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedSplitterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedSplitterTest.java
@@ -59,7 +59,12 @@ public class ManagedSplitterTest extends ManagementTestSupport {
         assertEquals(ServiceStatus.Started.name(), state);
 
         String uri = (String) mbeanServer.getAttribute(on, "Expression");
-        assertEquals("tokenize(body, ,)", uri);
+        assertEquals("Simple: ${body}", uri);
+
+        String xml = (String) mbeanServer.invoke(on, "dumpProcessorAsXml", null, null);
+        assertTrue(xml.contains("<split"));
+        assertTrue(xml.contains("</split>"));
+        assertTrue(xml.contains("<simple>${body}</simple>"));
 
         TabularData data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{false}, new String[]{"boolean"});
         assertNotNull(data);
@@ -80,7 +85,7 @@ public class ManagedSplitterTest extends ManagementTestSupport {
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .split(body().tokenize(",")).id("mysend")
+                    .split(simple("${body}")).id("mysend")
                         .to("mock:foo");
             }
         };