Repository: camel Updated Branches: refs/heads/master d1c12228e -> 64122ff32
Upgrade Disruptor to version 3.3.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64122ff3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64122ff3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64122ff3 Branch: refs/heads/master Commit: 64122ff32ad052a0b57b3db9d0bb5641e78cb1ba Parents: d1c1222 Author: Andrea Cosentino <[email protected]> Authored: Fri Jul 29 14:23:01 2016 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Fri Jul 29 14:23:01 2016 +0200 ---------------------------------------------------------------------- .../DisruptorComponentAutoConfiguration.java | 2 +- .../DisruptorComponentConfiguration.java | 18 +++++++++--------- .../DisruptorVmComponentAutoConfiguration.java | 2 +- .../DisruptorVmComponentConfiguration.java | 18 +++++++++--------- parent/pom.xml | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/64122ff3/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java index 03c9496..dd065ce 100644 --- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java +++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(DisruptorComponentConfiguration.class) public class DisruptorComponentAutoConfiguration { - @Bean(name = "disruptor-component") + @Bean @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(DisruptorComponent.class) public DisruptorComponent configureDisruptorComponent( http://git-wip-us.apache.org/repos/asf/camel/blob/64122ff3/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentConfiguration.java index a2294db..61056f2 100644 --- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentConfiguration.java +++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentConfiguration.java @@ -33,7 +33,7 @@ public class DisruptorComponentConfiguration { /** * To configure the default number of concurrent consumers */ - private Integer defaultConcurrentConsumers; + private int defaultConcurrentConsumers; /** * To configure the default value for multiple consumers */ @@ -57,17 +57,17 @@ public class DisruptorComponentConfiguration { * To configure the ring buffer size */ @Deprecated - private Integer queueSize; + private int queueSize; /** * To configure the ring buffer size */ - private Integer bufferSize; + private int bufferSize; - public Integer getDefaultConcurrentConsumers() { + public int getDefaultConcurrentConsumers() { return defaultConcurrentConsumers; } - public void setDefaultConcurrentConsumers(Integer defaultConcurrentConsumers) { + public void setDefaultConcurrentConsumers(int defaultConcurrentConsumers) { this.defaultConcurrentConsumers = defaultConcurrentConsumers; } @@ -105,20 +105,20 @@ public class DisruptorComponentConfiguration { @Deprecated @DeprecatedConfigurationProperty - public Integer getQueueSize() { + public int getQueueSize() { return queueSize; } @Deprecated - public void setQueueSize(Integer queueSize) { + public void setQueueSize(int queueSize) { this.queueSize = queueSize; } - public Integer getBufferSize() { + public int getBufferSize() { return bufferSize; } - public void setBufferSize(Integer bufferSize) { + public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/64122ff3/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java index 44a630e..300b9dc 100644 --- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java +++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties(DisruptorVmComponentConfiguration.class) public class DisruptorVmComponentAutoConfiguration { - @Bean(name = "disruptor-vm-component") + @Bean @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(DisruptorVmComponent.class) public DisruptorVmComponent configureDisruptorVmComponent( http://git-wip-us.apache.org/repos/asf/camel/blob/64122ff3/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentConfiguration.java index 4054c51..aca3020 100644 --- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentConfiguration.java +++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentConfiguration.java @@ -33,7 +33,7 @@ public class DisruptorVmComponentConfiguration { /** * To configure the default number of concurrent consumers */ - private Integer defaultConcurrentConsumers; + private int defaultConcurrentConsumers; /** * To configure the default value for multiple consumers */ @@ -57,17 +57,17 @@ public class DisruptorVmComponentConfiguration { * To configure the ring buffer size */ @Deprecated - private Integer queueSize; + private int queueSize; /** * To configure the ring buffer size */ - private Integer bufferSize; + private int bufferSize; - public Integer getDefaultConcurrentConsumers() { + public int getDefaultConcurrentConsumers() { return defaultConcurrentConsumers; } - public void setDefaultConcurrentConsumers(Integer defaultConcurrentConsumers) { + public void setDefaultConcurrentConsumers(int defaultConcurrentConsumers) { this.defaultConcurrentConsumers = defaultConcurrentConsumers; } @@ -105,20 +105,20 @@ public class DisruptorVmComponentConfiguration { @Deprecated @DeprecatedConfigurationProperty - public Integer getQueueSize() { + public int getQueueSize() { return queueSize; } @Deprecated - public void setQueueSize(Integer queueSize) { + public void setQueueSize(int queueSize) { this.queueSize = queueSize; } - public Integer getBufferSize() { + public int getBufferSize() { return bufferSize; } - public void setBufferSize(Integer bufferSize) { + public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/64122ff3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index fa39076..fcacd02 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -149,7 +149,7 @@ <cxf-xjc-utils-version>3.0.5</cxf-xjc-utils-version> <deltaspike-version>1.7.1</deltaspike-version> <derby-version>10.11.1.1</derby-version> - <disruptor-version>3.3.4</disruptor-version> + <disruptor-version>3.3.5</disruptor-version> <dnsjava-version>2.1.7</dnsjava-version> <dnsjava-bundle-version>2.1.7_1</dnsjava-bundle-version> <docker-guava-version>18.0</docker-guava-version>
