Merged in feature/redirect_migrated_repositories (pull request #277)

Feature redirect migrated repositories

scm-webapp/src/main/java/sonia/scm/lifecycle/modules/ScmServletModule.java

@@ -57,6 +57,7 @@ import sonia.scm.group.GroupDisplayManager;
 import sonia.scm.group.GroupManager;
 import sonia.scm.group.GroupManagerProvider;
 import sonia.scm.group.xml.XmlGroupDAO;
+import sonia.scm.migration.MigrationDAO;
 import sonia.scm.net.SSLContextProvider;
 import sonia.scm.net.ahc.AdvancedHttpClient;
 import sonia.scm.net.ahc.ContentTransformer;
@@ -97,6 +98,7 @@ import sonia.scm.template.MustacheTemplateEngine;
 import sonia.scm.template.TemplateEngine;
 import sonia.scm.template.TemplateEngineFactory;
 import sonia.scm.template.TemplateServlet;
+import sonia.scm.update.repository.DefaultMigrationStrategyDAO;
 import sonia.scm.user.DefaultUserDisplayManager;
 import sonia.scm.user.DefaultUserManager;
 import sonia.scm.user.UserDAO;
@@ -183,6 +185,7 @@ class ScmServletModule extends ServletModule {
     bind(RepositoryDAO.class, XmlRepositoryDAO.class);
     bind(RepositoryRoleDAO.class, XmlRepositoryRoleDAO.class);
     bind(RepositoryRoleManager.class).to(DefaultRepositoryRoleManager.class);
+    bind(MigrationDAO.class).to(DefaultMigrationStrategyDAO.class);
 
     bindDecorated(RepositoryManager.class, DefaultRepositoryManager.class,
       RepositoryManagerProvider.class);

scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java

@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.lifecycle.RestartEvent;
 import sonia.scm.event.ScmEventBus;
 import sonia.scm.update.repository.MigrationStrategy;
-import sonia.scm.update.repository.MigrationStrategyDao;
+import sonia.scm.update.repository.DefaultMigrationStrategyDAO;
 import sonia.scm.update.repository.V1Repository;
 import sonia.scm.update.repository.XmlRepositoryV1UpdateStep;
 import sonia.scm.util.ValidationUtil;
@@ -37,10 +37,10 @@ class MigrationWizardServlet extends HttpServlet {
   private static final Logger LOG = LoggerFactory.getLogger(MigrationWizardServlet.class);
 
   private final XmlRepositoryV1UpdateStep repositoryV1UpdateStep;
-  private final MigrationStrategyDao migrationStrategyDao;
+  private final DefaultMigrationStrategyDAO migrationStrategyDao;
 
   @Inject
-  MigrationWizardServlet(XmlRepositoryV1UpdateStep repositoryV1UpdateStep, MigrationStrategyDao migrationStrategyDao) {
+  MigrationWizardServlet(XmlRepositoryV1UpdateStep repositoryV1UpdateStep, DefaultMigrationStrategyDAO migrationStrategyDao) {
     this.repositoryV1UpdateStep = repositoryV1UpdateStep;
     this.migrationStrategyDao = migrationStrategyDao;
   }
@@ -103,11 +103,12 @@ class MigrationWizardServlet extends HttpServlet {
       .forEach(
         entry-> {
           String id = entry.getId();
+          String protocol = entry.getType();
           String originalName = entry.getOriginalName();
           String strategy = req.getParameter("strategy-" + id);
           String namespace = req.getParameter("namespace-" + id);
           String name = req.getParameter("name-" + id);
-          migrationStrategyDao.set(id, originalName, MigrationStrategy.valueOf(strategy), namespace, name);
+          migrationStrategyDao.set(id, protocol, originalName, MigrationStrategy.valueOf(strategy), namespace, name);
         }
       );
 

scm-webapp/src/main/java/sonia/scm/update/repository/DefaultMigrationStrategyDAO.java

@@ -0,0 +1,44 @@
+package sonia.scm.update.repository;
+
+import sonia.scm.migration.MigrationDAO;
+import sonia.scm.migration.MigrationInfo;
+import sonia.scm.store.ConfigurationStore;
+import sonia.scm.store.ConfigurationStoreFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Collection;
+import java.util.Optional;
+
+import static java.util.stream.Collectors.toList;
+
+@Singleton
+public class DefaultMigrationStrategyDAO implements MigrationDAO {
+
+  private final RepositoryMigrationPlan plan;
+  private final ConfigurationStore<RepositoryMigrationPlan> store;
+
+  @Inject
+  public DefaultMigrationStrategyDAO(ConfigurationStoreFactory storeFactory) {
+    store = storeFactory.withType(RepositoryMigrationPlan.class).withName("migration-plan").build();
+    this.plan = store.getOptional().orElse(new RepositoryMigrationPlan());
+  }
+
+  public Optional<RepositoryMigrationPlan.RepositoryMigrationEntry> get(String id) {
+    return plan.get(id);
+  }
+
+  public void set(String repositoryId, String protocol, String originalName, MigrationStrategy strategy, String newNamespace, String newName) {
+    plan.set(repositoryId, protocol, originalName, strategy, newNamespace, newName);
+    store.set(plan);
+  }
+
+  @Override
+  public Collection<MigrationInfo> getAll() {
+    return plan
+      .getEntries()
+      .stream()
+      .map(e -> new MigrationInfo(e.getRepositoryId(), e.getProtocol(), e.getOriginalName(), e.getNewNamespace(), e.getNewName()))
+      .collect(toList());
+  }
+}

scm-webapp/src/main/java/sonia/scm/update/repository/MigrationStrategyDao.java

@@ -1,30 +0,0 @@
-package sonia.scm.update.repository;
-
-import sonia.scm.store.ConfigurationStore;
-import sonia.scm.store.ConfigurationStoreFactory;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.Optional;
-
-@Singleton
-public class MigrationStrategyDao {
-
-  private final RepositoryMigrationPlan plan;
-  private final ConfigurationStore<RepositoryMigrationPlan> store;
-
-  @Inject
-  public MigrationStrategyDao(ConfigurationStoreFactory storeFactory) {
-    store = storeFactory.withType(RepositoryMigrationPlan.class).withName("migration-plan").build();
-    this.plan = store.getOptional().orElse(new RepositoryMigrationPlan());
-  }
-
-  public Optional<RepositoryMigrationPlan.RepositoryMigrationEntry> get(String id) {
-    return plan.get(id);
-  }
-
-  public void set(String repositoryId, String originalName, MigrationStrategy strategy, String newNamespace, String newName) {
-    plan.set(repositoryId, originalName, strategy, newNamespace, newName);
-    store.set(plan);
-  }
-}

scm-webapp/src/main/java/sonia/scm/update/repository/RepositoryMigrationPlan.java

@@ -4,6 +4,8 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -29,14 +31,18 @@ class RepositoryMigrationPlan {
       .findFirst();
   }
 
-  public void set(String repositoryId, String originalName, MigrationStrategy strategy, String newNamespace, String newName) {
+  public Collection<RepositoryMigrationEntry> getEntries() {
+    return Collections.unmodifiableList(entries);
+  }
+
+  public void set(String repositoryId, String protocol, String originalName, MigrationStrategy strategy, String newNamespace, String newName) {
     Optional<RepositoryMigrationEntry> entry = get(repositoryId);
     if (entry.isPresent()) {
       entry.get().setStrategy(strategy);
       entry.get().setNewNamespace(newNamespace);
       entry.get().setNewName(newName);
     } else {
-      entries.add(new RepositoryMigrationEntry(repositoryId, originalName, strategy, newNamespace, newName));
+      entries.add(new RepositoryMigrationEntry(repositoryId, protocol, originalName, strategy, newNamespace, newName));
     }
   }
 
@@ -45,6 +51,7 @@ class RepositoryMigrationPlan {
   static class RepositoryMigrationEntry {
 
     private String repositoryId;
+    private String protocol;
     private String originalName;
     private MigrationStrategy dataMigrationStrategy;
     private String newNamespace;
@@ -53,14 +60,23 @@ class RepositoryMigrationPlan {
     RepositoryMigrationEntry() {
     }
 
-    RepositoryMigrationEntry(String repositoryId, String originalName, MigrationStrategy dataMigrationStrategy, String newNamespace, String newName) {
+    RepositoryMigrationEntry(String repositoryId, String protocol, String originalName, MigrationStrategy dataMigrationStrategy, String newNamespace, String newName) {
       this.repositoryId = repositoryId;
+      this.protocol = protocol;
       this.originalName = originalName;
       this.dataMigrationStrategy = dataMigrationStrategy;
       this.newNamespace = newNamespace;
       this.newName = newName;
     }
 
+    public String getRepositoryId() {
+      return repositoryId;
+    }
+
+    public String getProtocol() {
+      return protocol;
+    }
+
     public String getOriginalName() {
       return originalName;
     }

scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java

@@ -49,7 +49,7 @@ import static sonia.scm.version.Version.parse;
  * <li>a new entry in the new <code>repository-paths.xml</code> database is written,</li>
  * <li>the data directory is moved or copied to a SCM v2 consistent directory. How this is done
  * can be specified by a strategy (@see {@link MigrationStrategy}), that has to be set in
- * a database file named <code>migration-plan.xml</code></li> (to create this file, use {@link MigrationStrategyDao}),
+ * a database file named <code>migration-plan.xml</code></li> (to create this file, use {@link DefaultMigrationStrategyDAO}),
  * and
  * <li>the new <code>metadata.xml</code> file is created.</li>
  * </ul>
@@ -63,7 +63,7 @@ public class XmlRepositoryV1UpdateStep implements CoreUpdateStep {
 
   private final SCMContextProvider contextProvider;
   private final XmlRepositoryDAO repositoryDao;
-  private final MigrationStrategyDao migrationStrategyDao;
+  private final DefaultMigrationStrategyDAO migrationStrategyDao;
   private final Injector injector;
   private final ConfigurationEntryStore<V1Properties> propertyStore;
 
@@ -71,7 +71,7 @@ public class XmlRepositoryV1UpdateStep implements CoreUpdateStep {
   public XmlRepositoryV1UpdateStep(
     SCMContextProvider contextProvider,
     XmlRepositoryDAO repositoryDao,
-    MigrationStrategyDao migrationStrategyDao,
+    DefaultMigrationStrategyDAO migrationStrategyDao,
     Injector injector,
     ConfigurationEntryStoreFactory configurationEntryStoreFactory
   ) {