You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2018/05/08 11:06:17 UTC
[camel] 02/02: CAMEL-10806: fix backpressure issues in camel-rxjava2
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ef372550029db33d907a7186d6ff8a2356be649
Author: nferraro <ni...@gmail.com>
AuthorDate: Tue May 8 12:40:25 2018 +0200
CAMEL-10806: fix backpressure issues in camel-rxjava2
---
bom/camel-bom/pom.xml | 10 ++++++++++
components/camel-rxjava2/pom.xml | 12 +++++++++---
.../src/main/docs/rxjava2-component.adoc | 2 +-
.../rxjava2/engine/RxJavaCamelProcessor.java | 4 ++--
.../engine/RxJavaStreamsServiceBackpressureTest.java | 2 --
parent/pom.xml | 1 +
.../components-starter/camel-rxjava2-starter/pom.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 20 ++++++++++----------
8 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index b589e03..9f8ecd3 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2110,6 +2110,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-rxjava2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-rxjava2-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/components/camel-rxjava2/pom.xml b/components/camel-rxjava2/pom.xml
index 6453911..8585f10 100644
--- a/components/camel-rxjava2/pom.xml
+++ b/components/camel-rxjava2/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components</artifactId>
- <version>2.20.0-SNAPSHOT</version>
+ <version>2.22.0-SNAPSHOT</version>
</parent>
<artifactId>camel-rxjava2</artifactId>
@@ -32,7 +32,7 @@
<properties>
<!-- use by camel-catalog -->
- <firstVersion>2.20.0</firstVersion>
+ <firstVersion>2.22.0</firstVersion>
<label>reactive,streams</label>
<camel.osgi.export.pkg>org.apache.camel.component.rxjava2.*</camel.osgi.export.pkg>
@@ -60,6 +60,12 @@
<artifactId>rxjava</artifactId>
<version>${rxjava2-version}</version>
</dependency>
+ <dependency>
+ <!-- See https://github.com/ReactiveX/RxJava/issues/5999 -->
+ <groupId>com.github.akarnokd</groupId>
+ <artifactId>rxjava2-extensions</artifactId>
+ <version>${rxjava2-extensions-version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -89,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito-version}</version>
<scope>test</scope>
</dependency>
diff --git a/components/camel-rxjava2/src/main/docs/rxjava2-component.adoc b/components/camel-rxjava2/src/main/docs/rxjava2-component.adoc
index 6e9a5b1..806301f 100644
--- a/components/camel-rxjava2/src/main/docs/rxjava2-component.adoc
+++ b/components/camel-rxjava2/src/main/docs/rxjava2-component.adoc
@@ -1,6 +1,6 @@
## RxJava2 Component
-*Available as of Camel version 2.20*
+*Available as of Camel version 2.22*
Maven users will need to add the following dependency to their `pom.xml`
for this component:
diff --git a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java b/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
index 8b43b5d..adb4de1 100644
--- a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
+++ b/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
@@ -21,10 +21,10 @@ import java.io.IOException;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
+import hu.akarnokd.rxjava2.processors.MulticastProcessor;
import io.reactivex.BackpressureStrategy;
import io.reactivex.Flowable;
import io.reactivex.FlowableEmitter;
-import io.reactivex.processors.BehaviorProcessor;
import io.reactivex.processors.FlowableProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.component.reactive.streams.ReactiveStreamsBackpressureStrategy;
@@ -46,7 +46,7 @@ final class RxJavaCamelProcessor implements Closeable {
this.name = name;
this.camelProducer = null;
this.camelEmitter = new AtomicReference<>();
- this.publisher = BehaviorProcessor.create();
+ this.publisher = MulticastProcessor.create(1); // Buffered downstream if needed
}
@Override
diff --git a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java b/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
index 429e7d3..38a6fc3 100644
--- a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
+++ b/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
@@ -26,10 +26,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.reactive.streams.ReactiveStreamsBackpressureStrategy;
import org.apache.camel.component.rxjava2.engine.suport.TestSubscriber;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore
public class RxJavaStreamsServiceBackpressureTest extends RxJavaStreamsServiceTestSupport {
@Test
diff --git a/parent/pom.xml b/parent/pom.xml
index 25a3330..68a4316 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -598,6 +598,7 @@
<rome-version>1.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
<rxjava2-version>2.1.13</rxjava2-version>
+ <rxjava2-extensions-version>0.19.0</rxjava2-extensions-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.8.0-10_1</saxon-bundle-version>
<saxon-version>9.8.0-10</saxon-version>
diff --git a/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
index 735afd4..8eb528e 100644
--- a/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.camel</groupId>
<artifactId>components-starter</artifactId>
- <version>2.20.0-SNAPSHOT</version>
+ <version>2.22.0-SNAPSHOT</version>
</parent>
<artifactId>camel-rxjava2-starter</artifactId>
<packaging>jar</packaging>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index aad86b3..e32f3ed 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2221,16 +2221,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-rest-swagger</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2316,6 +2306,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-rxjava2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-rxjava2-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-salesforce</artifactId>
<version>${project.version}</version>
</dependency>
--
To stop receiving notification emails like this one, please contact
lburgazzoli@apache.org.