From e5809a6350e158a432215881de548e6a32be9cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 7 Jun 2019 13:59:31 +0200
Subject: [PATCH] Sort repositories by type and name

---
 .../main/java/sonia/scm/update/MigrationWizardServlet.java   | 5 ++++-
 .../scm/update/repository/XmlRepositoryV1UpdateStep.java     | 4 ++++
 .../main/resources/templates/repository-migration.mustache   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java
index 53245565bd..9db24dc8eb 100644
--- a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java
@@ -18,7 +18,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,7 +48,8 @@ class MigrationWizardServlet extends HttpServlet {
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
     List<XmlRepositoryV1UpdateStep.V1Repository> repositoriesWithoutMigrationStrategies =
-      repositoryV1UpdateStep.getRepositoriesWithoutMigrationStrategies();
+      new ArrayList<>(repositoryV1UpdateStep.getRepositoriesWithoutMigrationStrategies());
+    repositoriesWithoutMigrationStrategies.sort(Comparator.comparing(XmlRepositoryV1UpdateStep.V1Repository::getPath));
 
     HashMap<String, Object> model = new HashMap<>();
 
diff --git a/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
index 0d40a1b413..54d0d7c52f 100644
--- a/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
+++ b/scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
@@ -240,6 +240,10 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
       return type;
     }
 
+    public String getPath() {
+      return type + "/" + name;
+    }
+
     public String getNewNamespace() {
       String[] nameParts = getNameParts(name);
       return nameParts.length > 1 ? nameParts[0] : type;
diff --git a/scm-webapp/src/main/resources/templates/repository-migration.mustache b/scm-webapp/src/main/resources/templates/repository-migration.mustache
index 26b1650e68..83d2fe94dd 100644
--- a/scm-webapp/src/main/resources/templates/repository-migration.mustache
+++ b/scm-webapp/src/main/resources/templates/repository-migration.mustache
@@ -52,7 +52,7 @@
                 {{#repositories}}
                   <tr>
                     <td>
-                      {{type}}/{{name}}
+                      {{path}}
                     </td>
                     <td>
                       {{type}}