From 12c4b6c1e9b429c3e4f72a6df7c24d2704bac538 Mon Sep 17 00:00:00 2001
From: Andrea Richiardi <a.richiardi.work@gmail.com>
Date: Tue, 9 Mar 2021 00:26:47 -0800
Subject: [PATCH] [Fix #50] Add type hints for ResourceReaper (#51)

---
 src/clj_test_containers/core.clj | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/clj_test_containers/core.clj b/src/clj_test_containers/core.clj
index 3a3b999..697599b 100644
--- a/src/clj_test_containers/core.clj
+++ b/src/clj_test_containers/core.clj
@@ -17,7 +17,8 @@
    (org.testcontainers.images.builder
     ImageFromDockerfile)
    (org.testcontainers.utility
-    MountableFile)))
+    MountableFile
+    ResourceReaper)))
 
 (defn- resolve-bind-mode
   (^BindMode [bind-mode]
@@ -27,7 +28,7 @@
 
 (defn- reaper-instance
   []
-  (org.testcontainers.utility.ResourceReaper/instance))
+  (ResourceReaper/instance))
 
 (defmulti wait
   "Sets a wait strategy to the container.  Supports :http, :health and :log as
@@ -278,10 +279,10 @@
                    [port]
                    [port (.getMappedPort container port)])
         mapped-ports (into {} (map map-port) exposed-ports)
-        container-id (.getContainerId container)
-        image-name (.getDockerImageName container)
+        container-id ^String (.getContainerId container)
+        image-name ^String (.getDockerImageName container)
         logger (log log-to container)]
-    (.registerContainerForCleanup (reaper-instance)
+    (.registerContainerForCleanup ^ResourceReaper (reaper-instance)
                                   container-id
                                   image-name)
     (-> container-config
@@ -317,7 +318,7 @@
 
      (let [network (.build builder)
            network-name (.getName network)]
-       (.registerNetworkIdForCleanup (reaper-instance) network-name)
+       (.registerNetworkIdForCleanup ^ResourceReaper (reaper-instance) network-name)
        {:network network
         :name network-name
         :ipv6 (.getEnableIpv6 network)
@@ -328,7 +329,7 @@
 (defn perform-cleanup!
   "Stops and removes all container instances which were created in the active JVM or REPL session"
   []
-  (.performCleanup (reaper-instance)))
+  (.performCleanup ^ResourceReaper (reaper-instance)))
 
 
 ;;; REPL Helpers