Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

Create migration module only if necessary

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-11 14:34:44 +02:00
parent a456dd5e42
commit a6caa03d86
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scm-webapp/src/main/java/sonia/scm/update/MigrationWizardContextListener.java
View File

@@ -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());
}
}

7
scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java
View File

@@ -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<RepositoryLineEntry> repositoryLineEntries = getRepositoryLineEntries();
doGet(req, resp, repositoryLineEntries);
}
protected void doGet(HttpServletRequest req, HttpServletResponse resp, List<RepositoryLineEntry> repositoryLineEntries) {
private void doGet(HttpServletRequest req, HttpServletResponse resp, List<RepositoryLineEntry> repositoryLineEntries) {
HashMap<String, Object> 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);

1
scm-webapp/src/test/java/sonia/scm/update/MigrationWizardServletTest.java
View File

@@ -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);