Simplify casting

Discord4J-Addons · May 15, 2017 · 9a7412f · 9a7412f
1 parent 07f6094
commit 9a7412f
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 109 deletions.
diff --git a/.idea/modules/rx-extensions-core/rx-extensions-core.iml b/.idea/modules/rx-extensions-core/rx-extensions-core.iml
diff --git a/.idea/modules/rx-extensions-reactor/rx-extensions-reactor.iml b/.idea/modules/rx-extensions-reactor/rx-extensions-reactor.iml
diff --git a/.idea/modules/rx-extensions-rxjava/rx-extensions-rxjava.iml b/.idea/modules/rx-extensions-rxjava/rx-extensions-rxjava.iml
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 
 allprojects {
     group 'com.austinv11.rx'
-    version '1.0'
+    version '1.1'
 
     task wrapper(type: Wrapper) {
         gradleVersion = '3.4.1'

diff --git a/rx-extensions-core/src/main/java/com/austinv11/rx/RxModule.java b/rx-extensions-core/src/main/java/com/austinv11/rx/RxModule.java
@@ -25,7 +25,7 @@ public String getAuthor() {
 
 	@Override
 	public String getVersion() {
-		return "1.0";
+		return "1.1";
 	}
 
 	@Override

diff --git a/rx-extensions-reactor/src/main/java/com/austinv11/rx/ReactorEventAdapter.java b/rx-extensions-reactor/src/main/java/com/austinv11/rx/ReactorEventAdapter.java
@@ -29,7 +29,7 @@ public ReactorEventAdapter(EventDispatcher dispatcher) {
 	 */
 	@Override
 	public <T extends Event> Flux<T> stream(Class<T> c) {
-		return flux.filter(e -> c.isAssignableFrom(e.getClass())).map(e -> (T) e);
+		return flux.ofType(c);
 	}
 
 	/**

diff --git a/rx-extensions-rxjava/src/main/java/com/austinv11/rx/RxJavaEventAdapter.java b/rx-extensions-rxjava/src/main/java/com/austinv11/rx/RxJavaEventAdapter.java
@@ -30,7 +30,7 @@ public RxJavaEventAdapter(EventDispatcher dispatcher) {
 	 */
 	@Override
 	public <T extends Event> Flowable<T> stream(Class<T> c) {
-		return eventFlowable.filter(e -> c.isAssignableFrom(e.getClass())).map(e -> (T) e);
+		return eventFlowable.ofType(c);
 	}
 
 	/**