Remove netty transport, rework shading (#1307)

* Remove Netty transport from docker-java

* Remove Netty transport from docker-java, rework the shading config

* exclude public API dependencies from the shaded ones

* encode filter's key, remove `okhttp` stage

* fix the jupiter tests

* fix the spock tests

Author: bsideup

build.gradle

@@ -56,32 +56,17 @@ subprojects {
         configurations = []
         classifier = null
 
-        relocate('META-INF/native/libnetty', 'META-INF/native/liborg-testcontainers-shaded-netty')
-
-        [
-            "org.apache.http",
-            "org.apache.commons.lang",
-            "org.apache.commons.io",
-            "org.apache.commons.codec",
-            "org.glassfish",
-            "org.aopalliance",
-            "org.jvnet",
-            "javax.annotation",
-            "javax.inject",
-            "javax.ws.rs",
-            "com.fasterxml.jackson",
-            "jersey.repackaged",
-            "com.google",
-            "io.netty",
-            "org.bouncycastle",
-            "org.zeroturnaround",
-            "okhttp3",
-            "okio",
-            "org.scalasbt.ipcsocket",
-            "com.trilead.ssh2",
-        ].each { relocate(it, "org.testcontainers.shaded.$it") }
+        // Keep docker-java's package inside the final jar
+        relocate("com.github.dockerjava", "com.github.dockerjava")
     }
 
+    task relocateShadowJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation) {
+        target = tasks.shadowJar
+        prefix = "org.testcontainers.shaded"
+    }
+
+    tasks.shadowJar.dependsOn tasks.relocateShadowJar
+
     publishing {
         publications {
             mavenJava(MavenPublication) { publication ->

core/build.gradle

@@ -21,7 +21,6 @@ shadowJar {
     exclude 'org/newsclub/**'
 
     [
-        'META-INF/io.netty.versions.properties',
         'META-INF/NOTICE',
         'META-INF/NOTICE.txt',
         'META-INF/LICENSE',
@@ -33,31 +32,16 @@ shadowJar {
         'META-INF/services/com.fasterxml.jackson.core.*',
         'META-INF/services/com.github.dockerjava.api.command.*',
         'META-INF/services/javax.ws.rs.ext.*',
-        'META-INF/services/org.glassfish.hk2.extension.*',
-        'META-INF/services/org.jvnet.hk2.external.generator.*',
-        'META-INF/services/org.glassfish.jersey.internal.spi.*',
         'META-INF/services/java.security.Provider',
         'mozilla/public-suffix-list.txt',
     ].each { exclude(it) }
 
-    dependencies {
-        include(dependency('org.apache.httpcomponents:.*'))
-        include(dependency('org.glassfish.*:.*'))
-        include(dependency('org.aopalliance.*:.*'))
-        include(dependency('javax.ws.rs:.*'))
-        include(dependency('com.fasterxml.*:.*'))
-        include(dependency('com.github.docker-java:.*'))
-        include(dependency('com.google.guava:.*'))
-        include(dependency('io.netty:.*'))
-        include(dependency('org.bouncycastle:.*'))
-        include(dependency('org.zeroturnaround:zt-exec'))
-        include(dependency('commons-lang:commons-lang'))
-        include(dependency('commons-io:commons-io'))
-        include(dependency('commons-codec:commons-codec'))
-        include(dependency('com.squareup.okhttp3:.*'))
-        include(dependency('com.squareup.okio:.*'))
-        include(dependency('org.scala-sbt.ipcsocket:ipcsocket'))
-        include(dependency('org.glassfish.main.external:trilead-ssh2-repackaged'))
+    project.afterEvaluate {
+        dependencies {
+            for (id in project.configurations.compile.resolvedConfiguration.resolvedArtifacts*.moduleVersion*.id) {
+                exclude(dependency("${id.group}:${id.name}"))
+            }
+        }
     }
 }
 
@@ -98,25 +82,25 @@ dependencies {
     shaded ('com.github.docker-java:docker-java:3.1.0-rc-4') {
         exclude(group: 'org.glassfish.jersey.core')
         exclude(group: 'org.glassfish.jersey.connectors')
+        exclude(group: 'org.glassfish.jersey.inject')
         exclude(group: 'log4j')
         exclude(group: 'com.google.code.findbug')
         exclude(group: 'com.kohlschutter.junixsocket')
+        exclude(group: 'io.netty')
+        exclude(group: 'org.apache.httpcomponents')
+        exclude(group: 'org.slf4j')
+        exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
+
     shaded 'com.squareup.okhttp3:okhttp:3.12.1'
 
     shaded 'org.glassfish.main.external:trilead-ssh2-repackaged:4.1.2'
 
-    shaded 'javax.ws.rs:javax.ws.rs-api:2.0.1'
-    shaded 'org.zeroturnaround:zt-exec:1.10'
-    shaded 'commons-lang:commons-lang:2.6'
-    shaded 'commons-io:commons-io:2.6'
-    shaded 'commons-codec:commons-codec:1.12'
-    // docker-java uses SslConfigurator from jersey-common for TLS
-    shaded ('org.glassfish.jersey.core:jersey-common:2.27') {
-        // SslConfigurator doesn't use classes from dependencies
-        exclude(module: '*')
+    shaded 'org.zeroturnaround:zt-exec:1.10', {
+        exclude(group: 'org.slf4j')
     }
 
+    testCompile 'org.apache.httpcomponents:httpclient:4.5.7'
     testCompile 'redis.clients:jedis:3.0.1'
     testCompile 'com.rabbitmq:amqp-client:5.6.0'
     testCompile 'org.mongodb:mongo-java-driver:3.10.1'

core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java

@@ -37,13 +37,7 @@ public void testPackages() throws Exception {
     public void testMetaInf() throws Exception {
         assertThatFileList(root.resolve("META-INF")).containsOnly(
                 "MANIFEST.MF",
-                "services",
-                "native"
-        );
-
-        assertThatFileList(root.resolve("META-INF").resolve("native")).containsOnly(
-                "liborg-testcontainers-shaded-netty_transport_native_epoll_x86_64.so",
-                "liborg-testcontainers-shaded-netty_transport_native_kqueue_x86_64.jnilib"
+                "services"
         );
     }
 

core/src/main/java/com/github/dockerjava/core/util/FiltersEncoder.java

@@ -0,0 +1,27 @@
+package com.github.dockerjava.core.util;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Monkey patched {@link FiltersEncoder} to avoid a use of jaxrs.
+ * See https://github.com/docker-java/docker-java/issues/1176
+ */
+public class FiltersEncoder {
+
+    private FiltersEncoder() {
+    }
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+    public static String jsonEncode(Map<String, List<String>> filters) {
+        try {
+            return OBJECT_MAPPER.writeValueAsString(filters);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java

@@ -13,7 +13,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.dockerclient.auth.AuthDelegatingDockerClientConfig;
-import org.testcontainers.dockerclient.transport.TestcontainersDockerCmdExecFactory;
 import org.testcontainers.dockerclient.transport.okhttp.OkHttpDockerCmdExecFactory;
 import org.testcontainers.utility.TestcontainersConfiguration;
 
@@ -173,9 +172,6 @@ protected DockerClient getClientForConfig(DockerClientConfig config) {
         if ("okhttp".equals(transportType)) {
             clientBuilder
                 .withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory());
-        } else if ("netty".equals(transportType)) {
-            clientBuilder
-                .withDockerCmdExecFactory(new TestcontainersDockerCmdExecFactory());
         } else {
             throw new IllegalArgumentException("Unknown transport type: " + transportType);
         }