final rx java removal (#652)

Removed final lines of RxJava code and removed RxJava Maven dependencies
ExpediaGroup · Apr 15, 2020 · 3da7848 · 3da7848
1 parent cd2ae43
commit 3da7848
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 92 deletions.
diff --git a/components/client/pom.xml b/components/client/pom.xml
@@ -78,11 +78,6 @@
       <artifactId>mockito-core</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava-reactive-streams</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>

diff --git a/components/common/pom.xml b/components/common/pom.xml
@@ -32,11 +32,6 @@
       <artifactId>reactor-core</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.hdrhistogram</groupId>
       <artifactId>HdrHistogram</artifactId>

diff --git a/components/proxy/pom.xml b/components/proxy/pom.xml
@@ -35,11 +35,6 @@
       <artifactId>styx-server</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava-reactive-streams</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative-boringssl-static</artifactId>

diff --git a/components/proxy/src/main/java/com/hotels/styx/proxy/plugin/InstrumentedPlugin.java b/components/proxy/src/main/java/com/hotels/styx/proxy/plugin/InstrumentedPlugin.java
@@ -26,16 +26,14 @@
 import com.hotels.styx.api.plugins.spi.PluginException;
 import com.hotels.styx.common.SimpleCache;
 import org.slf4j.Logger;
+import reactor.core.publisher.Flux;
 
 import java.util.Map;
 
 import static com.hotels.styx.api.HttpResponseStatus.BAD_REQUEST;
 import static com.hotels.styx.api.HttpResponseStatus.INTERNAL_SERVER_ERROR;
 import static java.util.Objects.requireNonNull;
 import static org.slf4j.LoggerFactory.getLogger;
-import static rx.Observable.error;
-import static rx.RxReactiveStreams.toObservable;
-import static rx.RxReactiveStreams.toPublisher;
 
 /**
  * Collects metrics on plugin.
@@ -86,10 +84,9 @@ public Map<String, HttpHandler> adminInterfaceHandlers() {
     public Eventual<LiveHttpResponse> intercept(LiveHttpRequest request, Chain originalChain) {
         StatusRecordingChain chain = new StatusRecordingChain(originalChain);
         try {
-            return new Eventual<>(toPublisher(
-                    toObservable(plugin.intercept(request, chain))
+            return new Eventual<>(Flux.from(plugin.intercept(request, chain))
                             .doOnNext(response -> recordStatusCode(chain, response))
-                            .onErrorResumeNext(error -> error(recordAndWrapError(chain, error)))));
+                            .onErrorResume(error -> Flux.error(recordAndWrapError(chain, error))));
         } catch (Throwable e) {
             recordException(e);
             return Eventual.error(new PluginException(e, plugin.name()));
@@ -141,10 +138,9 @@ public Context context() {
         @Override
         public Eventual<LiveHttpResponse> proceed(LiveHttpRequest request) {
             try {
-                return new Eventual<>(
-                        toPublisher(toObservable(chain.proceed(request))
+                return new Eventual<>(Flux.from(chain.proceed(request))
                                 .doOnNext(response -> upstreamStatus = response.status())
-                                .doOnError(error -> upstreamException = true)));
+                                .doOnError(error -> upstreamException = true));
             } catch (RuntimeException | Error e) {
                 upstreamException = true;
                 throw e;

diff --git a/components/server/pom.xml b/components/server/pom.xml
@@ -30,11 +30,6 @@
       <artifactId>styx-common</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava-reactive-streams</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative-boringssl-static</artifactId>

diff --git a/components/server/src/main/java/com/hotels/styx/server/netty/WebServerConnectorFactory.java b/components/server/src/main/java/com/hotels/styx/server/netty/WebServerConnectorFactory.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2019 Expedia Inc.
+  Copyright (C) 2013-2020 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/...ents/server/src/main/java/com/hotels/styx/server/netty/connectors/HttpResponseWriter.java b/...ents/server/src/main/java/com/hotels/styx/server/netty/connectors/HttpResponseWriter.java
@@ -27,6 +27,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.BaseSubscriber;
+import reactor.core.publisher.Flux;
 
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
@@ -36,7 +37,6 @@
 import static io.netty.handler.codec.http.HttpHeaders.setTransferEncodingChunked;
 import static io.netty.handler.codec.http.LastHttpContent.EMPTY_LAST_CONTENT;
 import static java.util.Objects.requireNonNull;
-import static rx.RxReactiveStreams.toObservable;
 
 /**
  * Netty HTTP response writer.
@@ -157,7 +157,7 @@ private void onWriteEmptyLastChunkOutcome(ChannelFuture writeOp) {
             return future;
         } catch (Throwable cause) {
             LOGGER.warn("Failed to convert response headers. response={}, Cause={}", new Object[]{response, cause});
-            toObservable(response.body()).forEach(it -> Buffers.toByteBuf(it).release());
+            Flux.from(response.body().drop()).subscribe();
             future.completeExceptionally(cause);
             return future;
         }

diff --git a/plugin-examples/pom.xml b/plugin-examples/pom.xml
@@ -37,11 +37,6 @@
       <artifactId>styx-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/pom.xml b/pom.xml
@@ -114,7 +114,6 @@
     <antlr.version>4.5.1-1</antlr.version>
     <netty.version>4.1.42.Final</netty.version>
     <netty-tcnative.version>2.0.26.Final</netty-tcnative.version>
-    <rxjava.version>1.1.6</rxjava.version>
     <reactive-streams.version>1.0.2</reactive-streams.version>
     <reactor.version>3.3.0.RELEASE</reactor.version>
     <pcollections.version>3.0.3</pcollections.version>
@@ -195,7 +194,6 @@
     <surefire.skip.tests>false</surefire.skip.tests>
 
     <netty-transport-native-epoll.classifier/>
-    <rxjava-reactive-streams.version>1.1.1</rxjava-reactive-streams.version>
     <mockk.version>1.9.3</mockk.version>
   </properties>
 
@@ -254,19 +252,6 @@
         <classifier>${netty-tcnative.classifier}</classifier>
       </dependency>
 
-      <!-- RxJava -->
-      <dependency>
-        <groupId>io.reactivex</groupId>
-        <artifactId>rxjava</artifactId>
-        <version>${rxjava.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.reactivex</groupId>
-        <artifactId>rxjava-reactive-streams</artifactId>
-        <version>${rxjava-reactive-streams.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.reactivestreams</groupId>
         <artifactId>reactive-streams</artifactId>

diff --git a/support/api-testsupport/pom.xml b/support/api-testsupport/pom.xml
@@ -39,16 +39,6 @@
       <scope>compile</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>io.reactivex</groupId>
-      <artifactId>rxjava-reactive-streams</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/system-tests/e2e-suite/src/test/java/com/hotels/styx/plugins/OnCompleteErrorPlugin.java b/system-tests/e2e-suite/src/test/java/com/hotels/styx/plugins/OnCompleteErrorPlugin.java
@@ -19,20 +19,18 @@
 import com.hotels.styx.api.LiveHttpRequest;
 import com.hotels.styx.api.LiveHttpResponse;
 import com.hotels.styx.api.plugins.spi.Plugin;
-
-import static rx.RxReactiveStreams.toObservable;
-import static rx.RxReactiveStreams.toPublisher;
+import reactor.core.publisher.Flux;
 
 public class OnCompleteErrorPlugin implements Plugin {
 
     @Override
     public Eventual<LiveHttpResponse> intercept(LiveHttpRequest request, Chain chain) {
 
-        return new Eventual<>(toPublisher(toObservable(chain.proceed(request))
-                .doOnCompleted(() -> {
+        return new Eventual<>(Flux.from(chain.proceed(request))
+                .doOnComplete(() -> {
                     if (request.header("Fail_at_onCompleted").isPresent()) {
                         throw new RuntimeException("foobar");
                     }
-                })));
+                }));
     }
 }
diff --git a/...m-tests/e2e-suite/src/test/scala/com/hotels/styx/support/ImplicitScalaRxConversions.scala b/...m-tests/e2e-suite/src/test/scala/com/hotels/styx/support/ImplicitScalaRxConversions.scala