workaround listNetwork's filter until it's fixed in docker-java (#385)

* workaround listNetwork's filter until it's fixed in docker-java (see docker-java/docker-java#857 )
* Delete Docker Compose's networks by id instead of name

Author: bsideup

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 - Fix erroneous version reference used during CI testing of shaded dependencies
 - Fix leakage of Vibur and Tomcat JDBC test dependencies in `jdbc-test` and `mysql` modules (#382)
 - Add timeout and retries for creation of `RemoteWebDriver` (#381, #373, #257)
+- Fixed double encoding of listNetwork's filter until it's fixed in docker-java (#385)
 
 ### Changed
 - Added support for Docker networks (#372)

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

@@ -176,7 +176,7 @@ private void registerContainersForShutdown() {
             // Compose can define their own networks as well; ensure these are cleaned up
             dockerClient.listNetworksCmd().exec().forEach(network -> {
                 if (network.getName().contains(identifier)) {
-                    ResourceReaper.instance().registerNetworkForCleanup(network.getName());
+                    ResourceReaper.instance().registerNetworkForCleanup(network.getId());
                 }
             });
 

core/src/main/java/org/testcontainers/containers/Network.java

@@ -48,8 +48,6 @@ class NetworkImpl extends ExternalResource implements Network {
         private final String id = create();
 
         private String create() {
-            ResourceReaper.instance().registerNetworkForCleanup(name);
-
             CreateNetworkCmd createNetworkCmd = DockerClientFactory.instance().client().createNetworkCmd();
 
             createNetworkCmd.withName(name);
@@ -67,7 +65,9 @@ private String create() {
                 consumer.accept(createNetworkCmd);
             }
 
-            return createNetworkCmd.exec().getId();
+            String id = createNetworkCmd.exec().getId();
+            ResourceReaper.instance().registerNetworkForCleanup(id);
+            return id;
         }
 
         @Override

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

@@ -3,7 +3,6 @@
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
 import com.google.common.base.Throwables;
 import org.apache.commons.io.IOUtils;
 import org.jetbrains.annotations.Nullable;
@@ -142,7 +141,7 @@ public DockerClient getClient() {
     protected DockerClient getClientForConfig(DockerClientConfig config) {
         return DockerClientBuilder
                     .getInstance(config)
-                    .withDockerCmdExecFactory(new NettyDockerCmdExecFactory())
+                    .withDockerCmdExecFactory(new TestcontainersDockerCmdExecFactory())
                     .build();
     }
 

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

@@ -0,0 +1,55 @@
+package org.testcontainers.dockerclient;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.github.dockerjava.api.command.ListNetworksCmd;
+import com.github.dockerjava.api.model.Network;
+import com.github.dockerjava.core.DockerClientConfig;
+import com.github.dockerjava.core.util.FiltersEncoder;
+import com.github.dockerjava.netty.MediaType;
+import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
+import com.github.dockerjava.netty.WebTarget;
+import com.github.dockerjava.netty.exec.AbstrSyncDockerCmdExec;
+import lombok.SneakyThrows;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+class TestcontainersDockerCmdExecFactory extends NettyDockerCmdExecFactory {
+
+    @Override
+    @SneakyThrows
+    public ListNetworksCmd.Exec createListNetworksCmdExec() {
+        Field baseResourceField = NettyDockerCmdExecFactory.class.getDeclaredField("baseResource");
+        baseResourceField.setAccessible(true);
+
+        // FIXME Workaround for https://github.com/docker-java/docker-java/issues/857
+        return new ListNetworksCmdExec((WebTarget) baseResourceField.get(this), getDockerClientConfig());
+    }
+
+    private static class ListNetworksCmdExec extends AbstrSyncDockerCmdExec<ListNetworksCmd, List<Network>> implements ListNetworksCmd.Exec {
+
+        private static final Logger LOGGER = LoggerFactory.getLogger(com.github.dockerjava.netty.exec.ListNetworksCmdExec.class);
+
+        public ListNetworksCmdExec(WebTarget baseResource, DockerClientConfig dockerClientConfig) {
+            super(baseResource, dockerClientConfig);
+        }
+
+        @Override
+        protected List<Network> execute(ListNetworksCmd command) {
+            WebTarget webTarget = getBaseResource().path("/networks");
+
+            if (command.getFilters() != null && !command.getFilters().isEmpty()) {
+                // Next line was changed (urlPathSegmentEscaper was removed)
+                webTarget = webTarget.queryParam("filters", FiltersEncoder.jsonEncode(command.getFilters()));
+            }
+
+            LOGGER.trace("GET: {}", webTarget);
+
+            return webTarget.request().accept(MediaType.APPLICATION_JSON).get(new TypeReference<List<Network>>() {
+            });
+        }
+    }
+
+}