[camel] branch main updated: CAMEL-16622: FileUtil should not compact https urls

[davsclaus]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 172c061  CAMEL-16622: FileUtil should not compact https urls
172c061 is described below

commit 172c061b8304b7a599297af2f8ce51c24ab3de9d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon May 17 11:01:09 2021 +0200

    CAMEL-16622: FileUtil should not compact https urls
---
 .../src/test/java/org/apache/camel/util/FileUtilTest.java          | 7 +++++++
 core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java 
b/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
index 4b77330..4a73654 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
@@ -292,6 +292,13 @@ public class FileUtilTest extends TestSupport {
     }
 
     @Test
+    public void testCompactHttpsPath() {
+        String in = 
"https://foo.com/apps/func/schemas/part/myap/dummy-schema.xsd";;
+        String out = FileUtil.compactPath(in, "/");
+        assertEquals(in, out);
+    }
+
+    @Test
     public void testCompactFilePath() {
         // should preserve the file: scheme prefix
         if (FileUtil.isWindows()) {
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java 
b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
index b87d48d..e25a1f7 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
@@ -289,7 +289,7 @@ public final class FileUtil {
             return null;
         }
 
-        if (path.startsWith("http:")) {
+        if (path.startsWith("http:") || path.startsWith("https:")) {
             return path;
         }