From 77788bab01a75f6db3e7403a82a421d0e47ab6c0 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Wed, 11 Nov 2020 16:42:09 +0100
Subject: [PATCH] cleanup

---
 .../branches/containers/DeleteBranch.tsx      | 41 ++++++++-----------
 .../BranchCollectionToDtoMapper.java          |  1 -
 .../scm/api/v2/resources/ResourceLinks.java   | 16 ++++----
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/scm-ui/ui-webapp/src/repos/branches/containers/DeleteBranch.tsx b/scm-ui/ui-webapp/src/repos/branches/containers/DeleteBranch.tsx
index 2ff9ff9284..681cae1e0a 100644
--- a/scm-ui/ui-webapp/src/repos/branches/containers/DeleteBranch.tsx
+++ b/scm-ui/ui-webapp/src/repos/branches/containers/DeleteBranch.tsx
@@ -38,8 +38,6 @@ const DeleteBranch: FC<Props> = ({ repository, branch }: Props) => {
   const [t] = useTranslation("repos");
   const history = useHistory();
 
-  console.log("branchview", repository, branch);
-
   const deleteBranch = () => {
     apiClient
       .delete((branch._links.delete as Link).href)
@@ -51,27 +49,24 @@ const DeleteBranch: FC<Props> = ({ repository, branch }: Props) => {
     return null;
   }
 
-  let confirmAlert = null;
-  if (showConfirmAlert) {
-    confirmAlert = (
-      <ConfirmAlert
-        title={t("branch.delete.confirmAlert.title")}
-        message={t("branch.delete.confirmAlert.message")}
-        buttons={[
-          {
-            className: "is-outlined",
-            label: t("branch.delete.confirmAlert.submit"),
-            onClick: () => deleteBranch()
-          },
-          {
-            label: t("branch.delete.confirmAlert.cancel"),
-            onClick: () => null
-          }
-        ]}
-        close={() => setShowConfirmAlert(false)}
-      />
-    );
-  }
+  const confirmAlert = (
+    <ConfirmAlert
+      title={t("branch.delete.confirmAlert.title")}
+      message={t("branch.delete.confirmAlert.message")}
+      buttons={[
+        {
+          className: "is-outlined",
+          label: t("branch.delete.confirmAlert.submit"),
+          onClick: () => deleteBranch()
+        },
+        {
+          label: t("branch.delete.confirmAlert.cancel"),
+          onClick: () => null
+        }
+      ]}
+      close={() => setShowConfirmAlert(false)}
+    />
+  );
 
   return (
     <>
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchCollectionToDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchCollectionToDtoMapper.java
index f102d27c4f..bb0e93f27f 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchCollectionToDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchCollectionToDtoMapper.java
@@ -30,7 +30,6 @@ import de.otto.edison.hal.HalRepresentation;
 import de.otto.edison.hal.Link;
 import de.otto.edison.hal.Links;
 import sonia.scm.repository.Branch;
-import sonia.scm.repository.NamespaceAndName;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryPermissions;
 
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
index bbb02a64fc..7bd6c353f5 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
@@ -24,15 +24,14 @@
 
 package sonia.scm.api.v2.resources;
 
-import sonia.scm.repository.NamespaceAndName;
-import sonia.scm.repository.Repository;
 import sonia.scm.security.gpg.UserPublicKeyResource;
 
 import javax.inject.Inject;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-@SuppressWarnings("squid:S1192") // string literals should not be duplicated
+@SuppressWarnings("squid:S1192")
+  // string literals should not be duplicated
 class ResourceLinks {
 
   private final ScmPathInfoStore scmPathInfoStore;
@@ -274,13 +273,13 @@ class ResourceLinks {
   }
 
   AutoCompleteLinks autoComplete() {
-    return new AutoCompleteLinks (scmPathInfoStore.get());
+    return new AutoCompleteLinks(scmPathInfoStore.get());
   }
 
-  static class AutoCompleteLinks  {
+  static class AutoCompleteLinks {
     private final LinkBuilder linkBuilder;
 
-    AutoCompleteLinks (ScmPathInfo pathInfo) {
+    AutoCompleteLinks(ScmPathInfo pathInfo) {
       linkBuilder = new LinkBuilder(pathInfo, AutoCompleteResource.class);
     }
 
@@ -515,11 +514,11 @@ class ResourceLinks {
     }
 
     public String changesets(String namespace, String name) {
-      return toTemplateParams(incomingLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("incoming").parameters().method("incomingChangesets").parameters("source","target").href());
+      return toTemplateParams(incomingLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("incoming").parameters().method("incomingChangesets").parameters("source", "target").href());
     }
 
     public String changesets(String namespace, String name, String source, String target) {
-      return incomingLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("incoming").parameters().method("incomingChangesets").parameters(source,target).href();
+      return incomingLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("incoming").parameters().method("incomingChangesets").parameters(source, target).href();
     }
 
     public String diff(String namespace, String name) {
@@ -596,6 +595,7 @@ class ResourceLinks {
     ModificationsLinks(ScmPathInfo pathInfo) {
       modificationsLinkBuilder = new LinkBuilder(pathInfo, RepositoryRootResource.class, RepositoryResource.class, ModificationsRootResource.class);
     }
+
     String self(String namespace, String name, String revision) {
       return modificationsLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("modifications").parameters().method("get").parameters(revision).href();
     }