Moving HttpServerBuilder to a module accessible also from other tests

RB=1255634
G=si-core-reviewers
R=ssheng
A=ssheng

CHANGELOG

@@ -1,8 +1,16 @@
+20.0.12
+-------
+
 20.0.11
 -------
 (RB=1255476)
 add more tests for MPConsistentHashRing iterator
 
+(RB=1206912)
+Adding ability to pass down the provider of the list of downstream services.
+
+(RB=1255634)
+Moving HttpServerBuilder to a module accessible also from other tests
 
 20.0.10
 -------

gradle.properties

@@ -1,4 +1,4 @@
-version=20.0.10
+version=20.0.11
 sonatypeUsername=please_set_in_home_dir_if_uploading_to_maven_central
 sonatypePassword=please_set_in_home_dir_if_uploading_to_maven_central
 org.gradle.configureondemand=true

r2-netty/build.gradle

@@ -19,5 +19,5 @@ dependencies {
   testCompile externalDependency.servletApi
   testCompile externalDependency.testng
   testCompile project (':test-util')
-
+  testCompile project (':r2-testutils')
 }

r2-netty/src/test/java/com/linkedin/r2/transport/http/client/TestChannelPoolManagerFactorySharingConnection.java

@@ -20,6 +20,7 @@
 import com.linkedin.common.util.None;
 import com.linkedin.r2.message.rest.RestRequest;
 import com.linkedin.r2.message.rest.RestRequestBuilder;
+import com.linkedin.r2.testutils.server.HttpServerBuilder;
 import com.linkedin.r2.transport.common.Client;
 import com.linkedin.r2.transport.common.bridge.client.TransportClientAdapter;
 import io.netty.handler.codec.http.HttpMethod;

r2-netty/src/test/java/com/linkedin/r2/transport/http/client/TestHttpClientFactory.java

@@ -27,6 +27,7 @@
 import com.linkedin.r2.message.rest.RestRequest;
 import com.linkedin.r2.message.rest.RestRequestBuilder;
 import com.linkedin.r2.message.rest.RestResponse;
+import com.linkedin.r2.testutils.server.HttpServerBuilder;
 import com.linkedin.r2.transport.common.Client;
 import com.linkedin.r2.transport.common.bridge.client.TransportClient;
 import com.linkedin.r2.transport.common.bridge.client.TransportClientAdapter;

r2-netty/src/test/java/com/linkedin/r2/transport/http/client/TestHttpNettyStreamClient.java

@@ -38,6 +38,7 @@
 import com.linkedin.r2.message.stream.entitystream.EntityStreams;
 import com.linkedin.r2.message.stream.entitystream.ReadHandle;
 import com.linkedin.r2.message.stream.entitystream.Reader;
+import com.linkedin.r2.testutils.server.HttpServerBuilder;
 import com.linkedin.r2.transport.common.bridge.client.TransportCallbackAdapter;
 import com.linkedin.r2.transport.common.bridge.client.TransportClient;
 import com.linkedin.r2.transport.common.bridge.common.TransportCallback;

r2-netty/src/test/java/com/linkedin/r2/transport/http/client/stream/http2/TestEarlyUpgrade.java

@@ -18,7 +18,7 @@
 
 import com.linkedin.common.callback.FutureCallback;
 import com.linkedin.common.util.None;
-import com.linkedin.r2.transport.http.client.HttpServerBuilder;
+import com.linkedin.r2.testutils.server.HttpServerBuilder;
 import com.linkedin.r2.transport.http.client.common.ChannelPoolManager;
 import com.linkedin.r2.transport.http.client.common.ChannelPoolManagerFactoryImpl;
 import com.linkedin.r2.transport.http.client.common.ChannelPoolManagerKey;

r2-netty/src/test/java/com/linkedin/r2/transport/http/client/stream/http2/TestHttp2NettyStreamClient.java

@@ -32,7 +32,7 @@
 import com.linkedin.r2.transport.common.bridge.common.FutureTransportCallback;
 import com.linkedin.r2.transport.common.bridge.common.TransportResponse;
 import com.linkedin.r2.transport.http.client.HttpClientBuilder;
-import com.linkedin.r2.transport.http.client.HttpServerBuilder;
+import com.linkedin.r2.testutils.server.HttpServerBuilder;
 import com.linkedin.test.util.ExceptionTestUtil;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.handler.codec.http.HttpHeaderNames;

r2-testutils/build.gradle

@@ -2,6 +2,13 @@ apply plugin: 'java'
 
 dependencies {
   compile project(path: ':r2-core')
+  compile externalDependency.jettyAlpnServer
+  compile externalDependency.jettyHttp
+  compile externalDependency.jettyHttp2Server
+  compile externalDependency.jettyServlet
+  compile externalDependency.jettyServer
+  compile externalDependency.jettyUtil
+  compile externalDependency.servletApi
 }
 
 //This module supports only adding test classes (i.e only a test compile of this project should happen anywhere its being referenced).

r2-netty/src/test/java/com/linkedin/r2/transport/http/client/HttpServerBuilder.java → r2-testutils/src/main/java/com/linkedin/r2/testutils/server/HttpServerBuilder.java

@@ -14,7 +14,7 @@
    limitations under the License.
 */
 
-package com.linkedin.r2.transport.http.client;
+package com.linkedin.r2.testutils.server;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;