[Fix_#3569] Refining uriToPath usage

apache · Jul 11, 2024 · dcead23 · dcead23
1 parent 41d5ee2
commit dcead23
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 16 deletions.
diff --git a/...flow-builder/src/main/java/org/kie/kogito/serverless/workflow/io/CachedContentLoader.java b/...flow-builder/src/main/java/org/kie/kogito/serverless/workflow/io/CachedContentLoader.java
@@ -98,12 +98,5 @@ protected static String trimScheme(String uri, String scheme) {
         return str;
     }
 
-    protected static String removeSlash(String str) {
-        while (str.startsWith("/")) {
-            str = str.substring(1);
-        }
-        return str;
-    }
-
     protected abstract byte[] loadURI();
 }
diff --git a/...w-builder/src/main/java/org/kie/kogito/serverless/workflow/io/ClassPathContentLoader.java b/...w-builder/src/main/java/org/kie/kogito/serverless/workflow/io/ClassPathContentLoader.java
@@ -75,6 +75,13 @@ static String uriToPath(String uri) {
         return removeSlash(trimScheme(uri, URIContentLoaderType.CLASSPATH.scheme()));
     }
 
+    private static String removeSlash(String str) {
+        while (str.startsWith("/")) {
+            str = str.substring(1);
+        }
+        return str;
+    }
+
     @Override
     public URIContentLoaderType type() {
         return URIContentLoaderType.CLASSPATH;

diff --git a/...-builder/src/main/java/org/kie/kogito/serverless/workflow/io/URIContentLoaderFactory.java b/...-builder/src/main/java/org/kie/kogito/serverless/workflow/io/URIContentLoaderFactory.java
@@ -48,12 +48,6 @@ public static String readString(URIContentLoader loader) {
         return new String(readAllBytes(loader));
     }
 
-    public static String getFileName(String uri) {
-        URIContentLoaderType type = URIContentLoaderType.from(uri);
-        String path = type.uriToPath(uri);
-        return type.lastPart(path);
-    }
-
     public static String readString(Builder builder) {
         return readString(builder.build());
     }

diff --git a/...va/org/kie/kogito/serverless/workflow/operationid/FileNameWorkflowOperationIdFactory.java b/...va/org/kie/kogito/serverless/workflow/operationid/FileNameWorkflowOperationIdFactory.java
@@ -21,7 +21,7 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.kie.kogito.serverless.workflow.io.URIContentLoaderFactory;
+import org.kie.kogito.serverless.workflow.io.URIContentLoaderType;
 import org.kie.kogito.serverless.workflow.parser.ParserContext;
 
 import io.serverlessworkflow.api.Workflow;
@@ -33,7 +33,8 @@ public class FileNameWorkflowOperationIdFactory extends AbstractWorkflowOperatio
 
     @Override
     public String getFileName(Workflow workflow, FunctionDefinition function, Optional<ParserContext> context, String uri, String operation, String service) {
-        return URIContentLoaderFactory.getFileName(uri);
+        URIContentLoaderType type = URIContentLoaderType.from(uri);
+        return type.lastPart(type.uriToPath(uri));
     }
 
     @Override

diff --git a/...in/java/org/kie/kogito/serverless/workflow/operationid/URIWorkflowOperationIdFactory.java b/...in/java/org/kie/kogito/serverless/workflow/operationid/URIWorkflowOperationIdFactory.java
@@ -33,7 +33,7 @@ public class URIWorkflowOperationIdFactory extends AbstractWorkflowOperationIdFa
 
     @Override
     public String getFileName(Workflow workflow, FunctionDefinition function, Optional<ParserContext> context, String uri, String operation, String service) {
-        return URIContentLoaderType.from(uri).uriToPath(uri).toString();
+        return URIContentLoaderType.from(uri).uriToPath(uri);
     }
 
     @Override