diff --git a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardContextListener.java b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardContextListener.java index c98062c900..6929c8b10a 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardContextListener.java +++ b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardContextListener.java @@ -2,21 +2,22 @@ package sonia.scm.update; import com.google.inject.Injector; import com.google.inject.servlet.GuiceServletContextListener; +import sonia.scm.update.repository.XmlRepositoryV1UpdateStep; public class MigrationWizardContextListener extends GuiceServletContextListener { - private final Injector injector; + private final Injector bootstrapInjector; public MigrationWizardContextListener(Injector bootstrapInjector) { - this.injector = bootstrapInjector.createChildInjector(new MigrationWizardModule()); + this.bootstrapInjector = bootstrapInjector; } public boolean wizardNecessary() { - return injector.getInstance(MigrationWizardServlet.class).wizardNecessary(); + return !bootstrapInjector.getInstance(XmlRepositoryV1UpdateStep.class).getRepositoriesWithoutMigrationStrategies().isEmpty(); } @Override protected Injector getInjector() { - return injector; + return bootstrapInjector.createChildInjector(new MigrationWizardModule()); } } 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 f26b1afac5..bf89382b1a 100644 --- a/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java @@ -44,17 +44,13 @@ class MigrationWizardServlet extends HttpServlet { this.migrationStrategyDao = migrationStrategyDao; } - public boolean wizardNecessary() { - return !repositoryV1UpdateStep.getRepositoriesWithoutMigrationStrategies().isEmpty(); - } - @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) { List repositoryLineEntries = getRepositoryLineEntries(); doGet(req, resp, repositoryLineEntries); } - protected void doGet(HttpServletRequest req, HttpServletResponse resp, List repositoryLineEntries) { + private void doGet(HttpServletRequest req, HttpServletResponse resp, List repositoryLineEntries) { HashMap model = new HashMap<>(); model.put("contextPath", req.getContextPath()); @@ -77,7 +73,6 @@ class MigrationWizardServlet extends HttpServlet { String id = repositoryLineEntry.getId(); String namespace = req.getParameter("namespace-" + id); String name = req.getParameter("name-" + id); - String strategy = req.getParameter("strategy-" + id); repositoryLineEntry.setNamespace(namespace); repositoryLineEntry.setName(name); diff --git a/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java b/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java index e40179eb7f..612e614f6f 100644 --- a/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java +++ b/scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java @@ -157,7 +157,6 @@ class MigrationWizardServletTest { ); doReturn("invalid namespace").when(request).getParameter("namespace-id"); doReturn("invalid name").when(request).getParameter("name-id"); - doReturn("COPY").when(request).getParameter("strategy-id"); servlet.doPost(request, response);