Camel component docs. Fixed test after adding group into the docs.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ab3a6b1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ab3a6b1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ab3a6b1 Branch: refs/heads/camel-2.16.x Commit: 3ab3a6b1e198234c7d96a5828fc988f6b1706674 Parents: 4dbbb36 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Nov 12 08:04:26 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Nov 12 09:21:04 2015 +0100 ---------------------------------------------------------------------- .../camel/api/management/mbean/CamelOpenMBeanTypes.java | 12 ++++++------ .../apache/camel/management/mbean/ManagedComponent.java | 5 +++-- .../apache/camel/management/mbean/ManagedEndpoint.java | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3ab3a6b1/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java index fc00071..72babc8 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java @@ -83,10 +83,10 @@ public final class CamelOpenMBeanTypes { } public static CompositeType explainComponentCompositeType() throws OpenDataException { - return new CompositeType("components", "Components", new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"}, - new String[]{"Option", "Kind", "Label", "Type", "Java Type", "Deprecated", "Value", "Default Value", "Description"}, + return new CompositeType("components", "Components", new String[]{"option", "kind", "group", "label", "type", "java type", "deprecated", "value", "default value", "description"}, + new String[]{"Option", "Kind", "Group", "Label", "Type", "Java Type", "Deprecated", "Value", "Default Value", "Description"}, new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, - SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING}); + SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING}); } public static TabularType explainDataFormatTabularType() throws OpenDataException { @@ -108,10 +108,10 @@ public final class CamelOpenMBeanTypes { } public static CompositeType explainEndpointsCompositeType() throws OpenDataException { - return new CompositeType("endpoints", "Endpoints", new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"}, - new String[]{"Option", "Kind", "Label", "Type", "Java Type", "Deprecated", "Value", "Default Value", "Description"}, + return new CompositeType("endpoints", "Endpoints", new String[]{"option", "kind", "group", "label", "type", "java type", "deprecated", "value", "default value", "description"}, + new String[]{"Option", "Kind", "Group", "Label", "Type", "Java Type", "Deprecated", "Value", "Default Value", "Description"}, new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, - SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING}); + SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING}); } public static TabularType explainEipTabularType() throws OpenDataException { http://git-wip-us.apache.org/repos/asf/camel/blob/3ab3a6b1/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java index fea76b2..a93841b 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedComponent.java @@ -112,6 +112,7 @@ public class ManagedComponent implements ManagedInstance, ManagedComponentMBean for (Map<String, String> row : rows) { String name = row.get("name"); String kind = row.get("kind"); + String group = row.get("group") != null ? row.get("group") : ""; String label = row.get("label") != null ? row.get("label") : ""; String type = row.get("type"); String javaType = row.get("javaType"); @@ -122,8 +123,8 @@ public class ManagedComponent implements ManagedInstance, ManagedComponentMBean CompositeType ct = CamelOpenMBeanTypes.explainComponentCompositeType(); CompositeData data = new CompositeDataSupport(ct, - new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"}, - new Object[]{name, kind, label, type, javaType, deprecated, value, defaultValue, description}); + new String[]{"option", "kind", "group", "label", "type", "java type", "deprecated", "value", "default value", "description"}, + new Object[]{name, kind, group, label, type, javaType, deprecated, value, defaultValue, description}); answer.put(data); } http://git-wip-us.apache.org/repos/asf/camel/blob/3ab3a6b1/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java index 20c2be7..0e2f8ca 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedEndpoint.java @@ -99,6 +99,7 @@ public class ManagedEndpoint implements ManagedInstance, ManagedEndpointMBean { for (Map<String, String> row : rows) { String name = row.get("name"); String kind = row.get("kind"); + String group = row.get("group") != null ? row.get("group") : ""; String label = row.get("label") != null ? row.get("label") : ""; String type = row.get("type"); String javaType = row.get("javaType"); @@ -109,8 +110,8 @@ public class ManagedEndpoint implements ManagedInstance, ManagedEndpointMBean { CompositeType ct = CamelOpenMBeanTypes.explainEndpointsCompositeType(); CompositeData data = new CompositeDataSupport(ct, - new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"}, - new Object[]{name, kind, label, type, javaType, deprecated, value, defaultValue, description}); + new String[]{"option", "kind", "group", "label", "type", "java type", "deprecated", "value", "default value", "description"}, + new Object[]{name, kind, group, label, type, javaType, deprecated, value, defaultValue, description}); answer.put(data); }
