[camel-karavan] branch main updated: use file system separator for split method (#133)

[marat]

This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new b79b826  use file system separator for split method (#133)
b79b826 is described below

commit b79b826b10c8f73ab0fa030a7f25557080ab8358
Author: Elie FRANCIS <e.fran...@everteam.com>
AuthorDate: Sun Nov 28 18:28:31 2021 +0100

    use file system separator for split method (#133)
---
 .../main/java/org/apache/camel/karavan/api/ComponentResources.java   | 5 ++++-
 .../src/main/java/org/apache/camel/karavan/api/KameletResources.java | 5 ++++-
 .../main/java/org/apache/camel/karavan/service/CamelKService.java    | 4 +++-
 .../java/org/apache/camel/karavan/service/FileSystemService.java     | 5 ++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
 
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
index c4a2276..e54e2e7 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ComponentResources.java
@@ -25,8 +25,11 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+
+import java.io.File;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Path("/component")
@@ -45,7 +48,7 @@ public class ComponentResources {
                 .stream()
                 .filter(s -> s.endsWith(".json"))
                 .map(s -> {
-                    String[] parts = s.split("/");
+                    String[] parts = s.split(Pattern.quote(File.separator));
                     return parts[parts.length - 1];
                 }).collect(Collectors.toList());
     }
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
index 67e1fff..39d7f8b 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
@@ -25,9 +25,12 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+
+import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Path("/kamelet")
@@ -58,7 +61,7 @@ public class KameletResources {
                 .stream()
                 .filter(s -> s.endsWith(".yaml"))
                 .map(s -> {
-                    String[] parts = s.split("/");
+                    String[] parts = s.split(Pattern.quote(File.separator));
                     return parts[parts.length - 1];
                 }).collect(Collectors.toList());
     }
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelKService.java 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelKService.java
index 89a2e4a..c1e6cad 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelKService.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelKService.java
@@ -28,12 +28,14 @@ import org.jboss.logging.Logger;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @ApplicationScoped
@@ -87,7 +89,7 @@ public class CamelKService {
                 .stream()
                 .filter(s -> s.endsWith(".yaml"))
                 .map(s -> {
-                    String[] parts = s.split("/");
+                    String[] parts = s.split(Pattern.quote(File.separator));
                     return parts[parts.length - 1];
                 }).collect(Collectors.toList());
     }
diff --git 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/FileSystemService.java
 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/FileSystemService.java
index 320cd19..d63ec59 100644
--- 
a/karavan-app/src/main/java/org/apache/camel/karavan/service/FileSystemService.java
+++ 
b/karavan-app/src/main/java/org/apache/camel/karavan/service/FileSystemService.java
@@ -24,11 +24,14 @@ import org.jboss.logging.Logger;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @ApplicationScoped
@@ -66,7 +69,7 @@ public class FileSystemService {
                 .stream()
                 .filter(s -> s.endsWith(".yaml"))
                 .map(s -> {
-                    String[] parts = s.split("/");
+                    String[] parts = s.split(Pattern.quote(File.separator));
                     return parts[parts.length - 1];
                 }).collect(Collectors.toList());
     }