From 09c13100dd39fd4a352bc8899b75be0c65be7b26 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Thu, 3 Dec 2020 08:54:56 +0100
Subject: [PATCH] cleanup

---
 scm-core/src/main/java/sonia/scm/repository/ImportHandler.java  | 1 -
 scm-ui/ui-components/src/validation.test.ts                     | 2 ++
 scm-ui/ui-components/src/validation.ts                          | 2 +-
 scm-ui/ui-types/src/RepositoryTypes.ts                          | 2 +-
 .../ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx  | 2 +-
 .../sonia/scm/api/v2/resources/RepositoryImportResource.java    | 2 --
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java b/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java
index dc2dcdad83..a4280048c7 100644
--- a/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/ImportHandler.java
@@ -45,7 +45,6 @@ public interface ImportHandler {
    * @param manager The global {@link RepositoryManager}
    * @return a {@link List} names of imported repositories
    * @throws IOException
-   * @since 2.11.0
    * @deprecated
    */
   public List<String> importRepositories(RepositoryManager manager) throws IOException;
diff --git a/scm-ui/ui-components/src/validation.test.ts b/scm-ui/ui-components/src/validation.test.ts
index 68d6bc8ee5..764a48a0a6 100644
--- a/scm-ui/ui-components/src/validation.test.ts
+++ b/scm-ui/ui-components/src/validation.test.ts
@@ -174,6 +174,8 @@ describe("test url validation", () => {
   }
   const valid = [
     "https://foo.com/blah_blah",
+    "ssh://foo.com/blah_blah",
+    "ftp://foo.com/blah_blah",
     "https://foo.com/blah_blah/",
     "https://foo.com/blah_blah_(wikipedia)",
     "https://foo.com/blah_blah_(wikipedia)_(again)",
diff --git a/scm-ui/ui-components/src/validation.ts b/scm-ui/ui-components/src/validation.ts
index 7d343bc6c7..f5ce43c1d8 100644
--- a/scm-ui/ui-components/src/validation.ts
+++ b/scm-ui/ui-components/src/validation.ts
@@ -50,7 +50,7 @@ export const isPathValid = (path: string) => {
   return pathRegex.test(path);
 };
 
-const urlRegex = /^(ftp|https?):\/\/[^\s$.?#].[^\s]*$/;
+const urlRegex = /^(ssh|ftp|https?):\/\/[^\s$.?#].[^\s]*$/;
 
 export const isUrlValid = (url: string) => {
   return urlRegex.test(url);
diff --git a/scm-ui/ui-types/src/RepositoryTypes.ts b/scm-ui/ui-types/src/RepositoryTypes.ts
index 732c068e3f..cad6546573 100644
--- a/scm-ui/ui-types/src/RepositoryTypes.ts
+++ b/scm-ui/ui-types/src/RepositoryTypes.ts
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import {Collection, Links} from "./hal";
+import { Collection, Links } from "./hal";
 
 export type RepositoryType = {
   name: string;
diff --git a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx
index fb1a9e0ed7..c04b3a0ed3 100644
--- a/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/ImportRepositoryFromUrl.tsx
@@ -86,13 +86,13 @@ const ImportRepositoryFromUrl: FC<Props> = ({ url, setImportPending }) => {
 
   return (
     <form onSubmit={submit}>
+      <ErrorNotification error={error} />
       <ImportFromUrlForm
         repository={repo}
         onChange={setRepo}
         setValid={(importUrl: boolean) => setValid({ ...valid, importUrl })}
         disabled={loading}
       />
-      <ErrorNotification error={error} />
       <hr />
       <NamespaceAndNameFields
         repository={repo}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryImportResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryImportResource.java
index bca1a13b63..badfd5185e 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryImportResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryImportResource.java
@@ -250,8 +250,6 @@ public class RepositoryImportResource {
     @Email
     String getContact();
     String getDescription();
-    List<HealthCheckFailureDto> getHealthCheckFailures();
-    Instant getLastModified();
     String getImportUrl();
     String getUsername();
     String getPassword();