Make Network instances reusable. Closes #469 (#470)

* Make Network instances reusable. Closes #469 * Update CHANGELOG.md * Update CHANGELOG.md
testcontainers · Nov 6, 2017 · 1c66a14 · 1c66a14
1 parent 635f137
commit 1c66a14
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 - Fixed regression in 1.4.3 when using Docker Compose on Windows ([\#439](https://github.com/testcontainers/testcontainers-java/issues/439))
 
 ### Changed
+- Make Network instances reusable (i.e. work with `@ClassRule`) ([\#469](https://github.com/testcontainers/testcontainers-java/issues/469))
 
 ## [1.4.3] - 2017-10-14
 ### Fixed

diff --git a/core/src/main/java/org/testcontainers/containers/Network.java b/core/src/main/java/org/testcontainers/containers/Network.java
@@ -9,20 +9,15 @@
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.utility.ResourceReaper;
 
-import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
 public interface Network extends AutoCloseable, TestRule {
 
     String getId();
 
-    @Override
-    default void close() {
-        ResourceReaper.instance().removeNetworkById(getId());
-    }
-
     static Network newNetwork() {
         return builder().build();
     }
@@ -42,10 +37,20 @@ class NetworkImpl extends ExternalResource implements Network {
         private String driver;
 
         @Singular
-        private Set<Consumer<CreateNetworkCmd>> createNetworkCmdModifiers = new LinkedHashSet<>();
+        private Set<Consumer<CreateNetworkCmd>> createNetworkCmdModifiers;
 
-        @Getter(lazy = true)
-        private final String id = create();
+        private String id;
+
+        private final AtomicBoolean initialized = new AtomicBoolean();
+
+        @Override
+        public String getId() {
+            if (initialized.compareAndSet(false, true)) {
+                id = create();
+            }
+
+            return id;
+        }
 
         private String create() {
             CreateNetworkCmd createNetworkCmd = DockerClientFactory.instance().client().createNetworkCmd();
@@ -74,5 +79,12 @@ private String create() {
         protected void after() {
             close();
         }
+
+        @Override
+        public void close() {
+            if (initialized.getAndSet(false)) {
+                ResourceReaper.instance().removeNetworkById(id);
+            }
+        }
     }
 }
diff --git a/core/src/test/java/org/testcontainers/containers/NetworkTest.java b/core/src/test/java/org/testcontainers/containers/NetworkTest.java
@@ -90,5 +90,24 @@ public void testModifiers() throws Exception {
                 );
             }
         }
+
+        @Test
+        public void testReusability() throws Exception {
+            try (Network network = Network.newNetwork()) {
+                String firstId = network.getId();
+                assertNotNull(
+                        "Network exists",
+                        DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(firstId).exec()
+                );
+
+                network.close();
+
+                assertNotEquals(
+                        "New network created",
+                        firstId,
+                        DockerClientFactory.instance().client().inspectNetworkCmd().withNetworkId(network.getId()).exec().getId()
+                );
+            }
+        }
     }
 }