From 95e4272f1554012df9d5b2752af5005032a378e5 Mon Sep 17 00:00:00 2001
From: "Davis, Kevin" <kdavisk6@gmail.com>
Date: Tue, 29 Jan 2019 22:00:13 -0500
Subject: [PATCH 1/2] updating netty dependencies for benchmarks

---
 benchmark/pom.xml                             | 38 +++++++++++++------
 .../benchmark/RealRequestBenchmarks.java      | 28 +++++++++-----
 pom.xml                                       | 14 +++++++
 3 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index cd056934ff..89d55ca4f8 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -53,30 +53,39 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.okhttp</groupId>
+      <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>2.7.4</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bouncycastle</groupId>
-          <artifactId>bcprov-jdk15on</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.reactivex</groupId>
-      <artifactId>rxnetty</artifactId>
-      <version>0.5.1</version>
+      <artifactId>rxnetty-http</artifactId>
+      <version>0.5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxnetty-spectator-http</artifactId>
+      <version>0.5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxnetty-common</artifactId>
+      <version>0.5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxnetty-tcp</artifactId>
+      <version>0.5.2</version>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-buffer</artifactId>
-      <version>4.1.0.Beta7</version>
+      <version>4.1.5.Final</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.reactivex</groupId>
       <artifactId>rxjava</artifactId>
-      <version>1.0.14</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
@@ -89,6 +98,11 @@
       <version>${jmh.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-nop</artifactId>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java b/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java
index 21728ed038..0f6a3b11c2 100644
--- a/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java
+++ b/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java
@@ -13,18 +13,24 @@
  */
 package feign.benchmark;
 
+
+
+import feign.Feign;
 import feign.Logger;
 import feign.Logger.Level;
+import feign.Response;
 import feign.Retryer;
-import io.netty.buffer.ByteBuf;
-import io.reactivex.netty.RxNetty;
+import io.reactivex.netty.protocol.http.HttpHandlerNames;
 import io.reactivex.netty.protocol.http.server.HttpServer;
 import io.reactivex.netty.protocol.http.server.HttpServerRequest;
 import io.reactivex.netty.protocol.http.server.HttpServerResponse;
 import io.reactivex.netty.protocol.http.server.RequestHandler;
-import io.reactivex.netty.server.ErrorHandler;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import io.netty.buffer.ByteBuf;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.internal.http.HttpHeaders;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -36,10 +42,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import feign.Feign;
-import feign.Response;
 import rx.Observable;
 
 @Measurement(iterations = 5, time = 1)
@@ -58,8 +60,16 @@ public class RealRequestBenchmarks {
 
   @Setup
   public void setup() {
-    server = RxNetty.createHttpServer(SERVER_PORT, (request, response) -> response.flush());
-    server.start();
+
+    server = HttpServer.newServer(SERVER_PORT)
+        .start((request, response) -> {
+          return null;
+        });
+
+            //(request, response) -> {
+            //  response.writeStringAndFlushOnEach(Observable.just("OK"))).awaitShutdown();
+            //server = RxNetty.createHttpServer(SERVER_PORT, (request, response) -> response.flush());
+            // server.start();
     client = new OkHttpClient();
     client.retryOnConnectionFailure();
     okFeign = Feign.builder()
diff --git a/pom.xml b/pom.xml
index e1e7537f1d..f9664f2960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
 
     <okhttp3.version>3.6.0</okhttp3.version>
     <gson.version>2.5</gson.version>
+    <slf4j.version>1.7.13</slf4j.version>
 
     <junit.version>4.12</junit.version>
     <jackson.version>2.9.8</jackson.version>
@@ -292,6 +293,19 @@
         <version>${jackson.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-nop</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+
     </dependencies>
   </dependencyManagement>
 

From 148a37360313b6bafd10a7569a4047c87eb8c3e8 Mon Sep 17 00:00:00 2001
From: "Davis, Kevin" <kdavisk6@gmail.com>
Date: Tue, 29 Jan 2019 22:04:51 -0500
Subject: [PATCH 2/2] Updated Bouncycastle

---
 benchmark/pom.xml                                        | 5 +++++
 .../main/java/feign/benchmark/RealRequestBenchmarks.java | 9 +--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 89d55ca4f8..91e6025eb6 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -56,6 +56,11 @@
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.60</version>
+    </dependency>
     <dependency>
       <groupId>io.reactivex</groupId>
       <artifactId>rxnetty-http</artifactId>
diff --git a/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java b/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java
index 0f6a3b11c2..146b619d5c 100644
--- a/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java
+++ b/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java
@@ -62,14 +62,7 @@ public class RealRequestBenchmarks {
   public void setup() {
 
     server = HttpServer.newServer(SERVER_PORT)
-        .start((request, response) -> {
-          return null;
-        });
-
-            //(request, response) -> {
-            //  response.writeStringAndFlushOnEach(Observable.just("OK"))).awaitShutdown();
-            //server = RxNetty.createHttpServer(SERVER_PORT, (request, response) -> response.flush());
-            // server.start();
+        .start((request, response) -> null);
     client = new OkHttpClient();
     client.retryOnConnectionFailure();
     okFeign = Feign.builder()