You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/07/29 12:43:40 UTC
camel git commit: Spring-boot Disruptor configuration
Repository: camel
Updated Branches:
refs/heads/master 64122ff32 -> d83c187a3
Spring-boot Disruptor configuration
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d83c187a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d83c187a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d83c187a
Branch: refs/heads/master
Commit: d83c187a3ec4a401405e9ef3f9e75b15cf6075fd
Parents: 64122ff
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Jul 29 14:42:50 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Jul 29 14:42:50 2016 +0200
----------------------------------------------------------------------
.../DisruptorComponentAutoConfiguration.java | 2 +-
.../DisruptorComponentConfiguration.java | 18 +++++++++---------
.../DisruptorVmComponentAutoConfiguration.java | 2 +-
.../DisruptorVmComponentConfiguration.java | 18 +++++++++---------
4 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d83c187a/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 dd065ce..03c9496 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
+ @Bean(name = "disruptor-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DisruptorComponent.class)
public DisruptorComponent configureDisruptorComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/d83c187a/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 61056f2..a2294db 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 int defaultConcurrentConsumers;
+ private Integer defaultConcurrentConsumers;
/**
* To configure the default value for multiple consumers
*/
@@ -57,17 +57,17 @@ public class DisruptorComponentConfiguration {
* To configure the ring buffer size
*/
@Deprecated
- private int queueSize;
+ private Integer queueSize;
/**
* To configure the ring buffer size
*/
- private int bufferSize;
+ private Integer bufferSize;
- public int getDefaultConcurrentConsumers() {
+ public Integer getDefaultConcurrentConsumers() {
return defaultConcurrentConsumers;
}
- public void setDefaultConcurrentConsumers(int defaultConcurrentConsumers) {
+ public void setDefaultConcurrentConsumers(Integer defaultConcurrentConsumers) {
this.defaultConcurrentConsumers = defaultConcurrentConsumers;
}
@@ -105,20 +105,20 @@ public class DisruptorComponentConfiguration {
@Deprecated
@DeprecatedConfigurationProperty
- public int getQueueSize() {
+ public Integer getQueueSize() {
return queueSize;
}
@Deprecated
- public void setQueueSize(int queueSize) {
+ public void setQueueSize(Integer queueSize) {
this.queueSize = queueSize;
}
- public int getBufferSize() {
+ public Integer getBufferSize() {
return bufferSize;
}
- public void setBufferSize(int bufferSize) {
+ public void setBufferSize(Integer bufferSize) {
this.bufferSize = bufferSize;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/d83c187a/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 300b9dc..44a630e 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
+ @Bean(name = "disruptor-vm-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DisruptorVmComponent.class)
public DisruptorVmComponent configureDisruptorVmComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/d83c187a/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 aca3020..4054c51 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 int defaultConcurrentConsumers;
+ private Integer defaultConcurrentConsumers;
/**
* To configure the default value for multiple consumers
*/
@@ -57,17 +57,17 @@ public class DisruptorVmComponentConfiguration {
* To configure the ring buffer size
*/
@Deprecated
- private int queueSize;
+ private Integer queueSize;
/**
* To configure the ring buffer size
*/
- private int bufferSize;
+ private Integer bufferSize;
- public int getDefaultConcurrentConsumers() {
+ public Integer getDefaultConcurrentConsumers() {
return defaultConcurrentConsumers;
}
- public void setDefaultConcurrentConsumers(int defaultConcurrentConsumers) {
+ public void setDefaultConcurrentConsumers(Integer defaultConcurrentConsumers) {
this.defaultConcurrentConsumers = defaultConcurrentConsumers;
}
@@ -105,20 +105,20 @@ public class DisruptorVmComponentConfiguration {
@Deprecated
@DeprecatedConfigurationProperty
- public int getQueueSize() {
+ public Integer getQueueSize() {
return queueSize;
}
@Deprecated
- public void setQueueSize(int queueSize) {
+ public void setQueueSize(Integer queueSize) {
this.queueSize = queueSize;
}
- public int getBufferSize() {
+ public Integer getBufferSize() {
return bufferSize;
}
- public void setBufferSize(int bufferSize) {
+ public void setBufferSize(Integer bufferSize) {
this.bufferSize = bufferSize;
}
}
\ No newline at end of file