Improve the "temp-extensions" workaround:

- Cleanup code
testcontainers · Nov 7, 2024 · bede900 · bede900
1 parent f4cdcc8
commit bede900
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java b/modules/hivemq/src/main/java/org/testcontainers/hivemq/HiveMQContainer.java
@@ -146,19 +146,20 @@ private boolean removePrepackagedExtensions() {
     }
 
     @Override
-    public void copyFileToContainer(final @NotNull MountableFile mountableFile, @NotNull String containerPath) {
-        if (!isStarted && removePrepackagedExtensions() && containerPath.startsWith("/opt/hivemq/extensions/")) {
-            containerPath = "/opt/hivemq/temp-extensions/" + containerPath.substring("/opt/hivemq/extensions/".length());
-        }
-        super.copyFileToContainer(mountableFile, containerPath);
+    public void copyFileToContainer(final @NotNull MountableFile mountableFile, final @NotNull String containerPath) {
+        super.copyFileToContainer(mountableFile, mapContainerPathIfRequired(containerPath));
     }
 
     @Override
-    public void copyFileToContainer(final @NotNull Transferable transferable, @NotNull String containerPath) {
+    public void copyFileToContainer(final @NotNull Transferable transferable, final @NotNull String containerPath) {
+        super.copyFileToContainer(transferable, mapContainerPathIfRequired(containerPath));
+    }
+
+    private @NotNull String mapContainerPathIfRequired(final @NotNull String containerPath) {
         if (!isStarted && removePrepackagedExtensions() && containerPath.startsWith("/opt/hivemq/extensions/")) {
-            containerPath = "/opt/hivemq/temp-extensions/" + containerPath.substring("/opt/hivemq/extensions/".length());
+            return "/opt/hivemq/temp-extensions/" + containerPath.substring("/opt/hivemq/extensions/".length());
         }
-        super.copyFileToContainer(transferable, containerPath);
+        return containerPath;
     }
 
     protected void containerIsStarted(final @NotNull InspectContainerResponse containerInfo) {