Fix sync issue with unreadable character in file creation

This commit fixes the problem where a sync issue occurs when the URL contains a query parameter but lacks a subpath. The existing process was incorrectly adding a slash at the end of the URL, resulting in the generation of an incorrect URL.
spaship · Jul 4, 2023 · 43d5297 · 43d5297
1 parent 5f52544
commit 43d5297
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,7 @@ nb-configuration.xml
 sidecar.iml
 build-local
 
-local-build.bat
+local-build.bat
+local-build.sh
+local-git-recon.bat
+git-rebase-upstream.bat
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.spaship</groupId>
     <artifactId>spaship-sidecar</artifactId>
-    <version>1.4.1</version>
+    <version>1.5.1</version>
     <properties>
         <compiler-plugin.version>3.10.1</compiler-plugin.version>
         <maven.compiler.release>17</maven.compiler.release>

diff --git a/src/main/java/io/spaship/sidecar/sync/SyncService.java b/src/main/java/io/spaship/sidecar/sync/SyncService.java
@@ -17,13 +17,19 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiPredicate;
+import java.util.function.Predicate;
 
 public class SyncService {
 
     private static final Logger LOG = LoggerFactory.getLogger(SyncService.class);
     private static final List<Timer> timers = new ArrayList<>();
-    BiPredicate<String, String> isForwardSlashMissing = (subPath, sourceUrl) ->
-            !(subPath.startsWith("/") || sourceUrl.endsWith("/"));
+    Predicate<String> hasSubPath = subPath ->Objects.nonNull(subPath) &&
+            !(subPath.isEmpty() || subPath.isBlank()) && !subPath.equals("/");
+    BiPredicate<String, String> isForwardSlashMissing = (subPath, sourceUrl) -> {
+        if(!hasSubPath.test(subPath))
+            return false;
+        return !(subPath.startsWith("/") || sourceUrl.endsWith("/"));
+    };
     AtomicBoolean errorFlag = new AtomicBoolean(false);
 
 
@@ -125,7 +131,7 @@ public void updateResource(TargetEntry targetEntry) {
             var targetUrlParts = targetEntry.getSourceUrl().split("\\?");
             var targetUrl = targetEntry.getSourceUrl().concat(subPath);
 
-            if (isForwardSlashMissing.test(subPath, targetEntry.getSourceUrl()))
+            if (hasSubPath.test(subPath) && isForwardSlashMissing.test(subPath, targetEntry.getSourceUrl()))
                 targetUrl = targetEntry.getSourceUrl().concat("/").concat(subPath);
 
             var urlPartLength = targetUrlParts.length;
@@ -137,6 +143,8 @@ public void updateResource(TargetEntry targetEntry) {
                 if (isForwardSlashMissing.test(subPath, targetUrlParts[0])) {
                     targetUrl = targetUrlParts[0].concat("/").concat(subPath).concat("?").concat(targetUrlParts[1]);
                 } else {
+                    if(!hasSubPath.test(subPath))
+                        subPath="";
                     targetUrl = targetUrlParts[0].concat(subPath).concat("?").concat(targetUrlParts[1]);
                 }
             }

diff --git a/src/main/resources/META-INF/resources/index.html b/src/main/resources/META-INF/resources/index.html
@@ -304,7 +304,7 @@ <h5>Application</h5>
                     <ul>
                         <li>GroupId: <code>io.spaship</code></li>
                         <li>ArtifactId: <code>spaship-sidecar</code></li>
-                        <li>Version: <code>2.0.0</code></li>
+                        <li>Version: <code>1.5.1</code></li>
                         <li>Quarkus Version: <code>2.16.3.Final</code></li>
                     </ul>
                 </div>