Synchronization of files with a windows backslash.

dqops · Feb 27, 2024 · 345dc50 · 345dc50
1 parent e54ea26
commit 345dc50
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/dqops/src/main/java/com/dqops/core/filesystem/metadata/FileMetadata.java b/dqops/src/main/java/com/dqops/core/filesystem/metadata/FileMetadata.java
@@ -236,4 +236,11 @@ public boolean equals(Object o) {
     public int hashCode() {
         return relativePath.hashCode();
     }
+
+    @Override
+    public String toString() {
+        return "FileMetadata{" +
+                "relativePath=" + relativePath +
+                '}';
+    }
 }
diff --git a/dqops/src/main/java/com/dqops/core/filesystem/metadata/FolderMetadata.java b/dqops/src/main/java/com/dqops/core/filesystem/metadata/FolderMetadata.java
@@ -704,4 +704,11 @@ public void truncateToLicenseLimits(DqoCloudApiKeyPayload apiKeyPayload) {
             }
         }
     }
+
+    @Override
+    public String toString() {
+        return "FolderMetadata{" +
+                "relativePath=" + relativePath +
+                '}';
+    }
 }
diff --git a/dqops/src/main/java/com/dqops/core/filesystem/virtual/FileNameSanitizer.java b/dqops/src/main/java/com/dqops/core/filesystem/virtual/FileNameSanitizer.java
@@ -186,6 +186,7 @@ public static Path convertEncodedPathToFullyUrlEncodedPath(Path path) {
         for (int i = 0; i < pathElements.length; i++) {
             String rawName = decodeFileSystemName(pathElements[i]);
             urlEncodedPathElements[i] = URLEncoder.encode(rawName, StandardCharsets.UTF_8)
+                    .replace("%", "%25")
                     .replace("+", "%20"); // fixing spaces, because GCP storage bucket does not use '+' for a space
         }
 

diff --git a/...core/synchronization/filesystems/gcp/GSRemoteFileSystemSynchronizationOperationsImpl.java b/...core/synchronization/filesystems/gcp/GSRemoteFileSystemSynchronizationOperationsImpl.java
@@ -248,7 +248,7 @@ public FolderMetadata listFilesInFolder(FileSystemSynchronizationRoot fileSystem
 
             for (Blob blob : blogPage.iterateAll()) {
                 String blobFileName = blob.getName();
-                Path fullBlobFilePathInsideBucket = FileNameSanitizer.convertRawPathToEncodedPath(blobFileName);
+                Path fullBlobFilePathInsideBucket = Path.of(blobFileName.replace("%25", "%"));
                 Map<String, String> metadata = blob.getMetadata();
                 if (metadata != null && Objects.equals(metadata.get("DQOFileType"), "empty-parquet")) {
                     // ignoring because it is a special empty file to ensure that the schema of an external table could be detected from a parquet file