CAMEL-7999: apt plugin should generate component properties also, which currently are assumed as getter/setter pairs as we do not have annotations for those.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/87330715 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87330715 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87330715 Branch: refs/heads/master Commit: 873307151e23bc72ef9124b5894f1eea85c8df99 Parents: 83607d6 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Feb 7 07:28:53 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Feb 7 07:28:53 2015 +0100 ---------------------------------------------------------------------- .../camel/api/management/mbean/ManagedProcessorMBean.java | 3 +++ .../main/java/org/apache/camel/impl/DefaultCamelContext.java | 3 +-- .../org/apache/camel/management/mbean/ManagedProcessor.java | 4 ++++ .../org/apache/camel/management/ManagedSendProcessorTest.java | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/87330715/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 f5c43a1..3fe8fa5 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 @@ -47,6 +47,9 @@ public interface ManagedProcessorMBean extends ManagedPerformanceCounterMBean { @ManagedOperation(description = "Stop Processor") void stop() throws Exception; + @ManagedOperation(description = "Processor information as JSon") + String informationJson(); + @ManagedOperation(description = "Explain how this processor is configured") TabularData explain(boolean allOptions); http://git-wip-us.apache.org/repos/asf/camel/blob/87330715/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index 109a0aa..68afa2f 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -1418,8 +1418,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon } } - // use before componentProperties as we do not want to include component properties when explaining endpoint - json = ObjectHelper.before(json, " \"componentProperties\": {"); + json = ObjectHelper.before(json, " \"properties\": {"); StringBuilder buffer = new StringBuilder(" \"properties\": {"); http://git-wip-us.apache.org/repos/asf/camel/blob/87330715/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 f644c86..7eb0cbb 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 @@ -137,6 +137,10 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag ServiceHelper.stopService(getProcessor()); } + public String informationJson() { + return context.explainEipJson(id, true); + } + public TabularData explain(boolean allOptions) { try { String json = context.explainEipJson(id, allOptions); http://git-wip-us.apache.org/repos/asf/camel/blob/87330715/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java index d9bba8e..eed43c6 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java @@ -73,6 +73,12 @@ public class ManagedSendProcessorTest extends ManagementTestSupport { data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{true}, new String[]{"boolean"}); assertNotNull(data); assertEquals(5, data.size()); + + String json = (String) mbeanServer.invoke(on, "informationJson", null, null); + assertNotNull(json); + assertTrue(json.contains("\"description\": \"Sends the message to an endpoint\"")); + assertTrue(json.contains(" \"uri\": { \"kind\": \"attribute\", \"required\": \"false\", \"type\": \"string\", \"javaType\": \"java.lang.String\"," + + " \"deprecated\": \"false\", \"value\": \"mock:result\"")); } @Override
