Repository: camel Updated Branches: refs/heads/master 34018e68a -> 0e47e97e4
CAMEL-10197: Adjusted the mvn plugin for SB auto configuration to deal with long values to set the field value with a L suffix. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e47e97e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e47e97e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e47e97e Branch: refs/heads/master Commit: 0e47e97e45b994c396529378795e3ff5a257ac9d Parents: 34018e6 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Sep 30 10:18:15 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Sep 30 10:18:15 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/component/direct/DirectComponent.java | 3 +-- .../org/apache/camel/component/directvm/DirectVmComponent.java | 2 +- .../main/java/org/apache/camel/component/seda/SedaComponent.java | 2 ++ .../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 4 ++++ 4 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0e47e97e/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java index 30b2352..a200928 100644 --- a/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java @@ -29,7 +29,6 @@ import org.apache.camel.util.ServiceHelper; * * @version */ - public class DirectComponent extends UriEndpointComponent { // must keep a map of consumers on the component to ensure endpoints can lookup old consumers @@ -37,7 +36,7 @@ public class DirectComponent extends UriEndpointComponent { // on DefaultCamelContext private final Map<String, DirectConsumer> consumers = new HashMap<String, DirectConsumer>(); private boolean block; - @Metadata(defaultValue = "30000L") + @Metadata(defaultValue = "30000") private long timeout = 30000L; public DirectComponent() { http://git-wip-us.apache.org/repos/asf/camel/blob/0e47e97e/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java index dc38c9b..d5c341f 100644 --- a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java @@ -40,7 +40,7 @@ public class DirectVmComponent extends UriEndpointComponent { // on DefaultCamelContext private static final ConcurrentMap<String, DirectVmConsumer> CONSUMERS = new ConcurrentHashMap<String, DirectVmConsumer>(); private boolean block; - @Metadata(defaultValue = "30000L") + @Metadata(defaultValue = "30000") private long timeout = 30000L; private HeaderFilterStrategy headerFilterStrategy; @Metadata(defaultValue = "true") http://git-wip-us.apache.org/repos/asf/camel/blob/0e47e97e/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java index 87a0843..3402bf4 100644 --- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java @@ -24,6 +24,7 @@ import org.apache.camel.Component; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.spi.Metadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,6 +37,7 @@ public class SedaComponent extends UriEndpointComponent { protected final Logger log = LoggerFactory.getLogger(getClass()); protected final int maxConcurrentConsumers = 500; protected int queueSize; + @Metadata(defaultValue = "1") protected int concurrentConsumers = 1; private final Map<String, QueueReference> queues = new HashMap<String, QueueReference>(); private BlockingQueueFactory<Exchange> defaultQueueFactory = new LinkedBlockingQueueFactory<Exchange>(); http://git-wip-us.apache.org/repos/asf/camel/blob/0e47e97e/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java index 45bdcc2..65e14c0 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java @@ -361,6 +361,10 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo { if (!Strings.isBlank(option.getDefaultValue())) { if ("java.lang.String".equals(option.getJavaType())) { prop.getField().setStringInitializer(option.getDefaultValue()); + } else if ("long".equals(option.getJavaType()) || "java.lang.Long".equals(option.getJavaType())) { + // the value should be a Long number + String value = option.getDefaultValue() + "L"; + prop.getField().setLiteralInitializer(value); } else if ("integer".equals(option.getType()) || "boolean".equals(option.getType())) { prop.getField().setLiteralInitializer(option.getDefaultValue()); } else if (!Strings.isBlank(option.getEnumValues())) {
