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/02/13 12:48:15 UTC
[5/8] camel git commit: CAMEL-7999: apt plugin supports labels per
component and endpoint options
CAMEL-7999: apt plugin supports labels per component and endpoint options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1ee6ed3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1ee6ed3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1ee6ed3
Branch: refs/heads/master
Commit: a1ee6ed385864714afdf5dd0d2ecd6daa10e496a
Parents: c4c7daf
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 13 10:54:13 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 13 12:48:33 2015 +0100
----------------------------------------------------------------------
.../management/mbean/CamelOpenMBeanTypes.java | 18 ++---
.../apache/camel/impl/DefaultCamelContext.java | 71 +++++++++++++-------
.../management/mbean/ManagedComponent.java | 5 +-
.../camel/management/mbean/ManagedEndpoint.java | 5 +-
.../management/mbean/ManagedProcessor.java | 5 +-
5 files changed, 63 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ee6ed3/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 5ebdb1c..2f87a3a 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
@@ -72,9 +72,9 @@ public final class CamelOpenMBeanTypes {
}
public static CompositeType explainComponentCompositeType() throws OpenDataException {
- return new CompositeType("components", "Components", new String[]{"option", "kind", "type", "java type", "deprecated", "value", "default value", "description"},
- new String[]{"Option", "Kind", "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});
+ 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"},
+ new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}
public static TabularType explainEndpointTabularType() throws OpenDataException {
@@ -83,9 +83,9 @@ public final class CamelOpenMBeanTypes {
}
public static CompositeType explainEndpointsCompositeType() throws OpenDataException {
- return new CompositeType("endpoints", "Endpoints", new String[]{"option", "kind", "type", "java type", "deprecated", "value", "default value", "description"},
- new String[]{"Option", "Kind", "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});
+ 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"},
+ new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}
public static TabularType explainEipTabularType() throws OpenDataException {
@@ -94,9 +94,9 @@ public final class CamelOpenMBeanTypes {
}
public static CompositeType explainEipsCompositeType() throws OpenDataException {
- return new CompositeType("eips", "EIPs", new String[]{"option", "kind", "type", "java type", "deprecated", "value", "default value", "description"},
- new String[]{"Option", "Kind", "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});
+ return new CompositeType("eips", "EIPs", 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"},
+ new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}
public static TabularType listComponentsTabularType() throws OpenDataException {
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ee6ed3/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 68afa2f..d36b8e6 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
@@ -1394,6 +1394,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
for (Map<String, String> row : rows) {
String name = row.get("name");
String kind = row.get("kind");
+ String label = row.get("label");
String required = row.get("required");
String value = row.get("value");
String defaultValue = row.get("defaultValue");
@@ -1413,7 +1414,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (includeAllOptions || o != null) {
// add as selected row
if (!selected.containsKey(name)) {
- selected.put(name, new String[]{name, kind, required, type, javaType, deprecated, value, defaultValue, description});
+ selected.put(name, new String[]{name, kind, label, required, type, javaType, deprecated, value, defaultValue, description});
}
}
}
@@ -1433,13 +1434,14 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
String name = row[0];
String kind = row[1];
- String required = row[2];
- String type = row[3];
- String javaType = row[4];
- String deprecated = row[5];
- String value = row[6];
- String defaultValue = row[7];
- String description = row[8];
+ String label = row[2];
+ String required = row[3];
+ String type = row[4];
+ String javaType = row[5];
+ String deprecated = row[6];
+ String value = row[7];
+ String defaultValue = row[8];
+ String description = row[9];
// add json of the option
buffer.append(doubleQuote(name)).append(": { ");
@@ -1447,6 +1449,9 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (kind != null) {
csb.append("\"kind\": \"" + kind + "\"");
}
+ if (label != null) {
+ csb.append("\"label\": \"" + label + "\"");
+ }
if (required != null) {
csb.append("\"required\": \"" + required + "\"");
}
@@ -1522,6 +1527,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// find type and description from the json schema
String type = null;
String kind = null;
+ String label = null;
String required = null;
String javaType = null;
String deprecated = null;
@@ -1531,6 +1537,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (name.equals(row.get("name"))) {
type = row.get("type");
kind = row.get("kind");
+ label = row.get("label");
required = row.get("required");
javaType = row.get("javaType");
deprecated = row.get("deprecated");
@@ -1541,13 +1548,14 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
// add as selected row
- selected.put(name, new String[]{name, kind, required, type, javaType, deprecated, value, defaultValue, description});
+ selected.put(name, new String[]{name, kind, label, required, type, javaType, deprecated, value, defaultValue, description});
}
// include other rows
for (Map<String, String> row : rows) {
String name = row.get("name");
String kind = row.get("kind");
+ String label = row.get("label");
String required = row.get("required");
String value = row.get("value");
String defaultValue = row.get("defaultValue");
@@ -1561,7 +1569,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (includeAllOptions) {
// add as selected row
if (!selected.containsKey(name)) {
- selected.put(name, new String[]{name, kind, required, type, javaType, deprecated, value, defaultValue, description});
+ selected.put(name, new String[]{name, kind, label, required, type, javaType, deprecated, value, defaultValue, description});
}
}
}
@@ -1581,13 +1589,14 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
String name = row[0];
String kind = row[1];
- String required = row[2];
- String type = row[3];
- String javaType = row[4];
- String deprecated = row[5];
- String value = row[6];
- String defaultValue = row[7];
- String description = row[8];
+ String label = row[2];
+ String required = row[3];
+ String type = row[4];
+ String javaType = row[5];
+ String deprecated = row[6];
+ String value = row[7];
+ String defaultValue = row[8];
+ String description = row[9];
// add json of the option
buffer.append(doubleQuote(name)).append(": { ");
@@ -1595,6 +1604,9 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (kind != null) {
csb.append("\"kind\": \"" + kind + "\"");
}
+ if (label != null) {
+ csb.append("\"label\": \"" + label + "\"");
+ }
if (required != null) {
csb.append("\"required\": \"" + required + "\"");
}
@@ -1667,6 +1679,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
// find type and description from the json schema
String type = null;
String kind = null;
+ String label = null;
String required = null;
String javaType = null;
String deprecated = null;
@@ -1676,6 +1689,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (name.equals(row.get("name"))) {
type = row.get("type");
kind = row.get("kind");
+ label = row.get("label");
required = row.get("required");
javaType = row.get("javaType");
deprecated = row.get("deprecated");
@@ -1686,13 +1700,14 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
// add as selected row
- selected.put(name, new String[]{name, kind, required, type, javaType, deprecated, value, defaultValue, description});
+ selected.put(name, new String[]{name, kind, label, required, type, javaType, deprecated, value, defaultValue, description});
}
// include other rows
for (Map<String, String> row : rows) {
String name = row.get("name");
String kind = row.get("kind");
+ String label = row.get("label");
String required = row.get("required");
String value = row.get("value");
String defaultValue = row.get("defaultValue");
@@ -1712,7 +1727,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (includeAllOptions || "path".equals(kind)) {
// add as selected row
if (!selected.containsKey(name)) {
- selected.put(name, new String[]{name, kind, required, type, javaType, deprecated, value, defaultValue, description});
+ selected.put(name, new String[]{name, kind, label, required, type, javaType, deprecated, value, defaultValue, description});
}
}
}
@@ -1732,13 +1747,14 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
String name = row[0];
String kind = row[1];
- String required = row[2];
- String type = row[3];
- String javaType = row[4];
- String deprecated = row[5];
- String value = row[6];
- String defaultValue = row[7];
- String description = row[8];
+ String label = row[2];
+ String required = row[3];
+ String type = row[4];
+ String javaType = row[5];
+ String deprecated = row[6];
+ String value = row[7];
+ String defaultValue = row[8];
+ String description = row[9];
// add json of the option
buffer.append(doubleQuote(name)).append(": { ");
@@ -1746,6 +1762,9 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (kind != null) {
csb.append("\"kind\": \"" + kind + "\"");
}
+ if (label != null) {
+ csb.append("\"label\": \"" + label + "\"");
+ }
if (required != null) {
csb.append("\"required\": \"" + required + "\"");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ee6ed3/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 b9405af..fea76b2 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 label = row.get("label") != null ? row.get("label") : "";
String type = row.get("type");
String javaType = row.get("javaType");
String deprecated = row.get("deprecated") != null ? row.get("deprecated") : "";
@@ -121,8 +122,8 @@ public class ManagedComponent implements ManagedInstance, ManagedComponentMBean
CompositeType ct = CamelOpenMBeanTypes.explainComponentCompositeType();
CompositeData data = new CompositeDataSupport(ct,
- new String[]{"option", "kind", "type", "java type", "deprecated", "value", "default value", "description"},
- new Object[]{name, kind, type, javaType, deprecated, value, defaultValue, description});
+ new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"},
+ new Object[]{name, kind, label, type, javaType, deprecated, value, defaultValue, description});
answer.put(data);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ee6ed3/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 000794a..20c2be7 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 label = row.get("label") != null ? row.get("label") : "";
String type = row.get("type");
String javaType = row.get("javaType");
String deprecated = row.get("deprecated") != null ? row.get("deprecated") : "";
@@ -108,8 +109,8 @@ public class ManagedEndpoint implements ManagedInstance, ManagedEndpointMBean {
CompositeType ct = CamelOpenMBeanTypes.explainEndpointsCompositeType();
CompositeData data = new CompositeDataSupport(ct,
- new String[]{"option", "kind", "type", "java type", "deprecated", "value", "default value", "description"},
- new Object[]{name, kind, type, javaType, deprecated, value, defaultValue, description});
+ new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"},
+ new Object[]{name, kind, label, type, javaType, deprecated, value, defaultValue, description});
answer.put(data);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1ee6ed3/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 7eb0cbb..39a7dc1 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
@@ -151,6 +151,7 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
for (Map<String, String> row : rows) {
String name = row.get("name");
String kind = row.get("kind");
+ String label = row.get("label") != null ? row.get("label") : "";
String type = row.get("type");
String javaType = row.get("javaType");
String deprecated = row.get("deprecated") != null ? row.get("deprecated") : "";
@@ -160,8 +161,8 @@ public class ManagedProcessor extends ManagedPerformanceCounter implements Manag
CompositeType ct = CamelOpenMBeanTypes.explainEipsCompositeType();
CompositeData data = new CompositeDataSupport(ct,
- new String[]{"option", "kind", "type", "java type", "deprecated", "value", "default value", "description"},
- new Object[]{name, kind, type, javaType, deprecated, value, defaultValue, description});
+ new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"},
+ new Object[]{name, kind, label, type, javaType, deprecated, value, defaultValue, description});
answer.put(data);
}