Skip to content

Commit f4efe4b

Browse files
committed
[Fix_#3569] Refining uriToPath usage
1 parent 41d5ee2 commit f4efe4b

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

kogito-serverless-workflow/kogito-serverless-workflow-builder/src/main/java/org/kie/kogito/serverless/workflow/io/URIContentLoaderFactory.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ public static String readString(URIContentLoader loader) {
4848
return new String(readAllBytes(loader));
4949
}
5050

51-
public static String getFileName(String uri) {
52-
URIContentLoaderType type = URIContentLoaderType.from(uri);
53-
String path = type.uriToPath(uri);
54-
return type.lastPart(path);
55-
}
56-
5751
public static String readString(Builder builder) {
5852
return readString(builder.build());
5953
}

kogito-serverless-workflow/kogito-serverless-workflow-builder/src/main/java/org/kie/kogito/serverless/workflow/operationid/FileNameWorkflowOperationIdFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Optional;
2222
import java.util.Set;
2323

24-
import org.kie.kogito.serverless.workflow.io.URIContentLoaderFactory;
24+
import org.kie.kogito.serverless.workflow.io.URIContentLoaderType;
2525
import org.kie.kogito.serverless.workflow.parser.ParserContext;
2626

2727
import io.serverlessworkflow.api.Workflow;
@@ -33,7 +33,8 @@ public class FileNameWorkflowOperationIdFactory extends AbstractWorkflowOperatio
3333

3434
@Override
3535
public String getFileName(Workflow workflow, FunctionDefinition function, Optional<ParserContext> context, String uri, String operation, String service) {
36-
return URIContentLoaderFactory.getFileName(uri);
36+
URIContentLoaderType type = URIContentLoaderType.from(uri);
37+
return type.lastPart(type.uriToPath(uri));
3738
}
3839

3940
@Override

kogito-serverless-workflow/kogito-serverless-workflow-builder/src/main/java/org/kie/kogito/serverless/workflow/operationid/URIWorkflowOperationIdFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class URIWorkflowOperationIdFactory extends AbstractWorkflowOperationIdFa
3333

3434
@Override
3535
public String getFileName(Workflow workflow, FunctionDefinition function, Optional<ParserContext> context, String uri, String operation, String service) {
36-
return URIContentLoaderType.from(uri).uriToPath(uri).toString();
36+
return URIContentLoaderType.from(uri).uriToPath(uri);
3737
}
3838

3939
@Override

0 commit comments

Comments
 (0)