You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2019/08/18 08:35:18 UTC
[camel] branch master updated: cleanups for camel-rxjava2 to
camel-rxjava component renaming
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new af160e9 cleanups for camel-rxjava2 to camel-rxjava component renaming
af160e9 is described below
commit af160e9bc7187abe1ff328d8d53a5926ce8c684e
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sun Aug 18 10:34:51 2019 +0200
cleanups for camel-rxjava2 to camel-rxjava component renaming
---
...a2PlatformTest.java => RxJavaPlatformTest.java} | 0
components/camel-rxjava/pom.xml | 2 +-
.../engine/RxJavaCamelProcessor.java | 2 +-
.../engine/RxJavaStreamsConstants.java | 2 +-
.../engine/RxJavaStreamsService.java | 2 +-
.../engine/RxJavaStreamsServiceFactory.java | 2 +-
.../org/apache/camel/reactive-streams/rxjava | 2 +-
.../RxJavaStreamsServiceBackpressureTest.java | 27 +++++++++++-----------
.../engine/RxJavaStreamsServiceEventTypeTest.java | 2 +-
.../engine/RxJavaStreamsServiceSubscriberTest.java | 2 +-
.../engine/RxJavaStreamsServiceTest.java | 2 +-
.../engine/RxJavaStreamsServiceTestSupport.java | 2 +-
.../engine/support}/TestSubscriber.java | 2 +-
13 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/platforms/RxJava2PlatformTest.java b/components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/platforms/RxJavaPlatformTest.java
similarity index 100%
rename from components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/platforms/RxJava2PlatformTest.java
rename to components/camel-reactive-streams/src/test/java/org/apache/camel/component/reactive/streams/platforms/RxJavaPlatformTest.java
diff --git a/components/camel-rxjava/pom.xml b/components/camel-rxjava/pom.xml
index 2a20e0b..06c79f9 100644
--- a/components/camel-rxjava/pom.xml
+++ b/components/camel-rxjava/pom.xml
@@ -30,7 +30,7 @@
<artifactId>camel-rxjava</artifactId>
<packaging>jar</packaging>
<name>Camel :: RxJava</name>
- <description>RxJava2 based back-end for Camel's reactive streams component</description>
+ <description>RxJava based back-end for Camel's reactive streams component</description>
<properties>
<firstVersion>2.22.0</firstVersion>
diff --git a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaCamelProcessor.java
similarity index 98%
rename from components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaCamelProcessor.java
index 056f42c..6110ff4 100644
--- a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
+++ b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaCamelProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import java.io.Closeable;
import java.io.IOException;
diff --git a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsConstants.java
similarity index 96%
rename from components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsConstants.java
index baf7cb3..5ececc0 100644
--- a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
+++ b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsConstants.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import org.apache.camel.AsyncCallback;
diff --git a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsService.java
similarity index 99%
rename from components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsService.java
index 7c6d75a..b367ec9 100644
--- a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java
+++ b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
diff --git a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceFactory.java
similarity index 96%
rename from components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceFactory.java
index 9fe4106..de5c283 100644
--- a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java
+++ b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import org.apache.camel.CamelContext;
import org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService;
diff --git a/components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava b/components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava
index 8003909..29e68e6 100644
--- a/components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava
+++ b/components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-class=org.apache.camel.component.rxjava2.engine.RxJavaStreamsServiceFactory
\ No newline at end of file
+class=org.apache.camel.component.rxjava.engine.RxJavaStreamsServiceFactory
diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
similarity index 88%
rename from components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
index 3580bb4..f402fd1 100644
--- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
+++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceBackpressureTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
@@ -24,8 +24,7 @@ import io.reactivex.Flowable;
import org.apache.camel.Exchange;
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.apache.camel.component.rxjava.engine.support.TestSubscriber;
import org.junit.Test;
public class RxJavaStreamsServiceBackpressureTest extends RxJavaStreamsServiceTestSupport {
@@ -56,12 +55,12 @@ public class RxJavaStreamsServiceBackpressureTest extends RxJavaStreamsServiceTe
context.start();
- Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
- Assert.assertEquals(20, queue.size());
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
+ assertEquals(20, queue.size());
int num = 1;
for (int i : queue) {
- Assert.assertEquals(num++, i);
+ assertEquals(num++, i);
}
}
@@ -97,17 +96,17 @@ public class RxJavaStreamsServiceBackpressureTest extends RxJavaStreamsServiceTe
crs.fromStream("integers", Integer.class).subscribe(subscriber);
context.start();
- Assert.assertTrue(latch.await(5, TimeUnit.SECONDS));
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
Thread.sleep(1000); // wait for all numbers to be generated
subscriber.request(19);
- Assert.assertTrue(latch2.await(1, TimeUnit.SECONDS));
+ assertTrue(latch2.await(1, TimeUnit.SECONDS));
Thread.sleep(200); // add other time to ensure no other items arrive
- Assert.assertEquals(2, queue.size());
+ assertEquals(2, queue.size());
int sum = queue.stream().reduce((i, j) -> i + j).get();
- Assert.assertEquals(3, sum); // 1 + 2 = 3
+ assertEquals(3, sum); // 1 + 2 = 3
subscriber.cancel();
}
@@ -144,21 +143,21 @@ public class RxJavaStreamsServiceBackpressureTest extends RxJavaStreamsServiceTe
crs.fromStream("integers", Integer.class).subscribe(subscriber);
context.start();
- Assert.assertTrue(latch1.await(5, TimeUnit.SECONDS));
+ assertTrue(latch1.await(5, TimeUnit.SECONDS));
Thread.sleep(1000); // wait for all numbers to be generated
subscriber.request(19);
- Assert.assertTrue(latch2.await(1, TimeUnit.SECONDS));
+ assertTrue(latch2.await(1, TimeUnit.SECONDS));
Thread.sleep(200); // add other time to ensure no other items arrive
// TODO: the chain caches two elements instead of one: change it if you find an EmitterProcessor without prefetch
// Assert.assertEquals(2, queue.size());
- Assert.assertEquals(3, queue.size());
+ assertEquals(3, queue.size());
int sum = queue.stream().reduce((i, j) -> i + j).get();
// Assert.assertEquals(21, sum); // 1 + 20 = 21
- Assert.assertEquals(23, sum); // 1 + 2 + 20 = 23
+ assertEquals(23, sum); // 1 + 2 + 20 = 23
subscriber.cancel();
}
diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceEventTypeTest.java
similarity index 99%
rename from components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceEventTypeTest.java
index 6703ebc..70caf34 100644
--- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java
+++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceEventTypeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import io.reactivex.Flowable;
import org.apache.camel.Exchange;
diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceSubscriberTest.java
similarity index 99%
rename from components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceSubscriberTest.java
index e408348..e44e9e3 100644
--- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java
+++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceSubscriberTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import java.util.concurrent.atomic.AtomicLong;
diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
similarity index 99%
rename from components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
index e3e0e2f..4b5175a 100644
--- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java
+++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java
similarity index 97%
rename from components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java
index 79c8b78..827b823 100644
--- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java
+++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/RxJavaStreamsServiceTestSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine;
+package org.apache.camel.component.rxjava.engine;
import org.apache.camel.CamelContext;
import org.apache.camel.component.reactive.streams.ReactiveStreamsComponent;
diff --git a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/support/TestSubscriber.java
similarity index 96%
rename from components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/support/TestSubscriber.java
index 487ff9e..c2b497e 100644
--- a/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java
+++ b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava/engine/support/TestSubscriber.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rxjava2.engine.suport;
+package org.apache.camel.component.rxjava.engine.support;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;