From e2ff24bec834723d2e2e38d890e68782a5547822 Mon Sep 17 00:00:00 2001 From: Kateryna Oblakevych Date: Sun, 3 May 2026 14:26:50 -0700 Subject: [PATCH 1/3] fix: allow trailing slash in the base_url --- .../cli/commands/functionality/PropertiesBeanUtils.java | 6 +++++- .../cli/commands/functionality/PropertiesBeanUtilsTest.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java b/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java index 6bd052039..5145cc52e 100644 --- a/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java +++ b/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java @@ -81,7 +81,11 @@ private static boolean isUrlOfficial(String baseUrl) { } public static boolean isUrlValid(String baseUrl) { - return isUrlForTesting(baseUrl) || isUrlOfficial(baseUrl); + if (baseUrl == null) { + return false; + } + String normalized = StringUtils.removeEnd(baseUrl, "/"); + return isUrlForTesting(normalized) || isUrlOfficial(normalized); } /** diff --git a/src/test/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtilsTest.java b/src/test/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtilsTest.java index 7073c38d2..a471e05c9 100644 --- a/src/test/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtilsTest.java +++ b/src/test/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtilsTest.java @@ -155,7 +155,11 @@ private static Stream testIsUrlValid() { arguments("https://organizzzation.daanya.crowdin.dev"), arguments("https://daanya.crowdin.dev"), arguments("https://98011165-2619304c.test.crowdin.com"), - arguments("https://myorg.e-test.crowdin.com") + arguments("https://myorg.e-test.crowdin.com"), + arguments("https://Daanya.crowdin.com/"), + arguments("https://Daanya.api.crowdin.com/"), + arguments("https://organizzzation.daanya.crowdin.dev/"), + arguments("https://myorg.e-test.crowdin.com/") ); } From 9efad192995ada86cdacd9bf5e1490ff9c7a546c Mon Sep 17 00:00:00 2001 From: Kateryna Oblakevych Date: Sun, 3 May 2026 14:46:04 -0700 Subject: [PATCH 2/3] remove repeatable null check --- file-zero.json | 3 +++ .../cli/commands/functionality/PropertiesBeanUtils.java | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 file-zero.json diff --git a/file-zero.json b/file-zero.json new file mode 100644 index 000000000..4e76bf8a8 --- /dev/null +++ b/file-zero.json @@ -0,0 +1,3 @@ +{ + "ен": "тато" +} \ No newline at end of file diff --git a/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java b/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java index 5145cc52e..837946251 100644 --- a/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java +++ b/src/main/java/com/crowdin/cli/commands/functionality/PropertiesBeanUtils.java @@ -81,9 +81,6 @@ private static boolean isUrlOfficial(String baseUrl) { } public static boolean isUrlValid(String baseUrl) { - if (baseUrl == null) { - return false; - } String normalized = StringUtils.removeEnd(baseUrl, "/"); return isUrlForTesting(normalized) || isUrlOfficial(normalized); } From 58be602b5b6c29d0e8e039741825cce99a73677c Mon Sep 17 00:00:00 2001 From: Kateryna Oblakevych Date: Thu, 21 May 2026 07:40:07 -0700 Subject: [PATCH 3/3] remove file --- file-zero.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 file-zero.json diff --git a/file-zero.json b/file-zero.json deleted file mode 100644 index 4e76bf8a8..000000000 --- a/file-zero.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ен": "тато" -} \ No newline at end of file