Repository: camel Updated Branches: refs/heads/master 44e600c1c -> 75c62f2d2
CAMEL-8195: Add javadoc to model classes so we have EIP documentation out of the box Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/75c62f2d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/75c62f2d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/75c62f2d Branch: refs/heads/master Commit: 75c62f2d25699561d96320aeb4052f9d1e2f57a1 Parents: 44e600c Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jan 20 11:33:59 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jan 20 11:40:22 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/model/LoadBalanceDefinition.java | 7 +++++++ .../java/org/apache/camel/model/MarshalDefinition.java | 3 +++ .../apache/camel/model/config/PropertiesDefinition.java | 6 ++++-- .../java/org/apache/camel/util/JsonSchemaHelper.java | 11 ++++++++++- .../apache/camel/maven/packaging/JSonSchemaHelper.java | 11 ++++++++++- 5 files changed, 34 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/75c62f2d/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java index 84453b4..b6eea94 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java @@ -102,6 +102,10 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini return ref; } + /** + * To use a custom load balancer. + * This option is deprecated, use the custom load balancer type instead. + */ public void setRef(String ref) { this.ref = ref; } @@ -110,6 +114,9 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini return loadBalancerType; } + /** + * The load balancer to be used + */ public void setLoadBalancerType(LoadBalancerDefinition loadbalancer) { if (loadBalancerType != null) { throw new IllegalArgumentException("Loadbalancer already configured to: " + loadBalancerType + ". Cannot set it to: " + loadbalancer); http://git-wip-us.apache.org/repos/asf/camel/blob/75c62f2d/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java index d0269d6..65ce360 100644 --- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java @@ -156,6 +156,9 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> { return dataFormatType; } + /** + * The data format to be used + */ public void setDataFormatType(DataFormatDefinition dataFormatType) { this.dataFormatType = dataFormatType; } http://git-wip-us.apache.org/repos/asf/camel/blob/75c62f2d/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java b/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java index 628ef12..8600d7d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java @@ -19,7 +19,6 @@ package org.apache.camel.model.config; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -39,7 +38,10 @@ public class PropertiesDefinition { public PropertiesDefinition() { } - + + /** + * A series of properties as key value pairs + */ public void setProperties(List<PropertyDefinition> properties) { this.properties = properties; } http://git-wip-us.apache.org/repos/asf/camel/blob/75c62f2d/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java index 3ab566b..9f56d66 100644 --- a/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/JsonSchemaHelper.java @@ -30,7 +30,7 @@ import java.util.regex.Pattern; */ public final class JsonSchemaHelper { - private static final Pattern PATTERN = Pattern.compile("\"(.+?)\""); + private static final Pattern PATTERN = Pattern.compile("\"(.+?)\"|\\[(.+)\\]"); private JsonSchemaHelper() { } @@ -158,6 +158,15 @@ public final class JsonSchemaHelper { key = matcher.group(1); } else { String value = matcher.group(1); + if (value == null) { + value = matcher.group(2); + // its an enum so strip out " and trim spaces after comma + value = value.replaceAll("\"", ""); + value = value.replaceAll(", ", ","); + } + if (value != null) { + value = value.trim(); + } row.put(key, value); // reset key = null; http://git-wip-us.apache.org/repos/asf/camel/blob/75c62f2d/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java index 061ecbd..a4be2ec 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/JSonSchemaHelper.java @@ -25,7 +25,7 @@ import java.util.regex.Pattern; public final class JSonSchemaHelper { - private static final Pattern PATTERN = Pattern.compile("\"(.+?)\""); + private static final Pattern PATTERN = Pattern.compile("\"(.+?)\"|\\[(.+)\\]"); private JSonSchemaHelper() { } @@ -75,6 +75,15 @@ public final class JSonSchemaHelper { key = matcher.group(1); } else { String value = matcher.group(1); + if (value == null) { + value = matcher.group(2); + // its an enum so strip out " and trim spaces after comma + value = value.replaceAll("\"", ""); + value = value.replaceAll(", ", ","); + } + if (value != null) { + value = value.trim(); + } row.put(key, value); // reset key = null;
