From c45cc432336e26715b8645aa2c193ff3b4f210cd Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Thu, 10 Aug 2023 15:04:15 +0300 Subject: [PATCH] Do not substring `.git` while parsing Azure DevOps Urls Signed-off-by: Igor Vinokur --- .../server/azure/devops/AzureDevOpsURLParser.java | 4 ---- .../azure/devops/AzureDevOpsURLParserTest.java | 13 ++++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java b/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java index 6bfd60016c..a2aa19e19d 100644 --- a/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java +++ b/wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java @@ -71,10 +71,6 @@ public class AzureDevOpsURLParser { } String repoName = matcher.group("repoName"); - if (repoName.endsWith(".git")) { - repoName = repoName.substring(0, repoName.length() - 4); - } - String project = matcher.group("project"); if (project == null) { // if project is not specified, repo name must be equal to project name diff --git a/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java b/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java index 3ef9faade6..0b6242612c 100644 --- a/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java +++ b/wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java @@ -71,7 +71,7 @@ public class AzureDevOpsURLParserTest { "https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo.git", "MyOrg", "MyProject", - "MyRepo", + "MyRepo.git", null, null }, @@ -79,7 +79,7 @@ public class AzureDevOpsURLParserTest { "https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo.dot.git", "MyOrg", "MyProject", - "MyRepo.dot", + "MyRepo.dot.git", null, null }, @@ -100,7 +100,14 @@ public class AzureDevOpsURLParserTest { null }, {"https://dev.azure.com/MyOrg/MyProject/_git/-", "MyOrg", "MyProject", "-", null, null}, - {"https://dev.azure.com/MyOrg/MyProject/_git/-j.git", "MyOrg", "MyProject", "-j", null, null}, + { + "https://dev.azure.com/MyOrg/MyProject/_git/-j.git", + "MyOrg", + "MyProject", + "-j.git", + null, + null + }, { "https://MyOrg@dev.azure.com/MyOrg/MyProject/_git/MyRepo?path=MyFile&version=GBmain&_a=contents", "MyOrg",