#664 Fixed handling of the paths with + in them (#665)

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - Retry any exceptions (not just `DockerClientException`) on image pull ([\#662](https://github.com/testcontainers/testcontainers-java/issues/662))
+- Fixed handling of the paths with `+` in them ([\#664](https://github.com/testcontainers/testcontainers-java/issues/664))
 
 ### Changed
 - Database container images are now pinned to a specific version rather than using `latest`. The tags selected are the most recent as of the time of this change. If a JDBC URL is used with no tag specified, a WARN level log message is output, pending a future change to make tags mandatory in the JDBC URL. ([\#671](https://github.com/testcontainers/testcontainers-java/issues/671))

core/src/main/java/org/testcontainers/utility/MountableFile.java

@@ -148,7 +148,7 @@ private static URL getClasspathResource(@NotNull final String resourcePath, @Not
     private static String unencodeResourceURIToFilePath(@NotNull final String resource) {
         try {
             // Convert any url-encoded characters (e.g. spaces) back into unencoded form
-            return URLDecoder.decode(resource, Charsets.UTF_8.name())
+            return URLDecoder.decode(resource.replaceAll("\\+", "%2B"), Charsets.UTF_8.name())
                     .replaceFirst("jar:", "")
                     .replaceFirst("file:", "")
                     .replaceAll("!.*", "");

core/src/test/java/org/testcontainers/utility/MountableFileTest.java

@@ -65,6 +65,17 @@ public void forHostPathWithSpaces() throws Exception {
         assertFalse("The resolved path does not contain an escaped space", mountableFile.getResolvedPath().contains("\\ "));
     }
 
+    @Test
+    public void forHostPathWithPlus() throws Exception {
+        final Path file = createTempFile("some+path");
+        final MountableFile mountableFile = MountableFile.forHostPath(file.toString());
+
+        performChecks(mountableFile);
+
+        assertTrue("The resolved path contains the original space", mountableFile.getResolvedPath().contains("+"));
+        assertFalse("The resolved path does not contain an escaped space", mountableFile.getResolvedPath().contains(" "));
+    }
+
     @Test
     public void forClasspathResourceWithPermission() throws Exception {
         final MountableFile mountableFile = MountableFile.forClasspathResource("mappable-resource/test-resource.txt",
@@ -113,4 +124,4 @@ private void performChecks(final MountableFile mountableFile) {
         assertFalse("The filesystem path '" + mountablePath + "' does not contain any URL escaping", mountablePath.contains("%20"));
     }
 
-}
+}