Respect SSH urls without port (#810)

Author: vinokurig

wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParser.java

@@ -54,7 +54,7 @@ public class AzureDevOpsURLParser {
   private final String azureSSHDevOpsPatternTemplate =
       "^git@ssh\\.%s:v3/(?<organization>.*)/(?<project>.*)/(?<repoName>.*)$";
   private final String azureSSHDevOpsServerPatternTemplate =
-      "^ssh://%s:22/(?<organization>.*)/(?<project>.*)/_git/(?<repoName>.*)$";
+      "^ssh://%s(:\\d*)?/(?<organization>.*)/(?<project>.*)/_git/(?<repoName>.*)$";
   private final String azureDevOpsPatternTemplate =
       "^https?://(?<organizationCanIgnore>[^@]++)?@?%s/(?<organization>[^/]++)/((?<project>[^/]++)/)?_git/"
           + "(?<repoName>[^?]++)"
@@ -119,7 +119,10 @@ private Optional<String> getServerUrl(String repositoryUrl) {
       substring = repositoryUrl.substring(6);
     }
     if (!isNullOrEmpty(substring)) {
-      return Optional.of("https://" + substring.substring(0, substring.indexOf(":")));
+      return Optional.of(
+          "https://"
+              + substring.substring(
+                  0, substring.contains(":") ? substring.indexOf(":") : substring.indexOf("/")));
     }
     // Otherwise, extract the base url from the given repository url by cutting the url after the
     // first slash.

wsmaster/che-core-api-factory-azure-devops/src/test/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsURLParserTest.java

@@ -268,6 +268,14 @@ public Object[][] expectedServerParsing() {
         "main",
         null
       },
+      {
+        "ssh://dev.azure-server.com/MyOrg/MyProject/_git/MyRepo",
+        "MyOrg",
+        "MyProject",
+        "MyRepo",
+        null,
+        null
+      },
       {
         "ssh://dev.azure-server.com:22/MyOrg/MyProject/_git/MyRepo",
         "MyOrg",

wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParser.java

@@ -57,8 +57,8 @@ public class BitbucketServerURLParser {
           "^(?<scheme>%s)://(?<host>%s)/users/(?<user>[^/]+)/repos/(?<repo>[^/]+)/?",
           "^(?<scheme>%s)://(?<host>%s)/scm/(?<project>[^/~]+)/(?<repo>[^/]+).git",
           "^(?<scheme>%s)://(?<host>%s)/projects/(?<project>[^/]+)/repos/(?<repo>[^/]+)/browse(\\?at=(?<branch>.*))?",
-          "^(?<scheme>%s)://git@(?<host>%s):(?<port>\\d*)/~(?<user>[^/]+)/(?<repo>.*).git$",
-          "^(?<scheme>%s)://git@(?<host>%s):(?<port>\\d*)/(?<project>[^/]+)/(?<repo>.*).git$");
+          "^(?<scheme>%s)://git@(?<host>%s):?(?<port>\\d*)?/~(?<user>[^/]+)/(?<repo>.*).git$",
+          "^(?<scheme>%s)://git@(?<host>%s):?(?<port>\\d*)?/(?<project>[^/]+)/(?<repo>.*).git$");
   private final List<Pattern> bitbucketUrlPatterns = new ArrayList<>();
   private static final String OAUTH_PROVIDER_NAME = "bitbucket-server";
 
@@ -152,7 +152,9 @@ private boolean isApiRequestRelevant(String repositoryUrl) {
   private String getServerUrl(String repositoryUrl) {
     if (repositoryUrl.startsWith("ssh://git@")) {
       String substring = repositoryUrl.substring(10);
-      return "https://" + substring.substring(0, substring.indexOf(":"));
+      return "https://"
+          + substring.substring(
+              0, substring.contains(":") ? substring.indexOf(":") : substring.indexOf("/"));
     }
     return repositoryUrl.substring(
         0,

wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerURLParserTest.java

@@ -215,7 +215,9 @@ public Object[][] urls() {
       {"https://bitbucket.2mcl.com/users/user/repos/repo/"},
       {"https://bbkt.com/scm/project/test1.git"},
       {"ssh://[email protected]:12345/~user/repo.git"},
-      {"ssh://[email protected]:12345/project/test1.git"}
+      {"ssh://[email protected]:12345/project/test1.git"},
+      {"ssh://[email protected]/~user/repo.git"},
+      {"ssh://[email protected]/project/test1.git"}
     };
   }