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

Cleanup

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-06 12:47:32 +02:00
parent 1bcc150cb9
commit ec538039f9
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import static java.util.Arrays.stream;
import static java.util.stream.Collectors.toList;
@Singleton
class MigrationWizardServlet extends HttpServlet {
@@ -41,18 +40,19 @@ class MigrationWizardServlet extends HttpServlet {
}
public boolean wizardNecessary() {
return !repositoryV1UpdateStep.missingMigrationStrategies().isEmpty();
return !repositoryV1UpdateStep.getRepositoriesWithoutMigrationStrategies().isEmpty();
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
List<XmlRepositoryV1UpdateStep.V1Repository> missingMigrationStrategies = repositoryV1UpdateStep.missingMigrationStrategies();
protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
List<XmlRepositoryV1UpdateStep.V1Repository> repositoriesWithoutMigrationStrategies =
repositoryV1UpdateStep.getRepositoriesWithoutMigrationStrategies();
HashMap<String, Object> model = new HashMap<>();
model.put("contextPath", req.getContextPath());
model.put("submitUrl", req.getRequestURI());
model.put("repositories", missingMigrationStrategies);
model.put("repositories", repositoriesWithoutMigrationStrategies);
model.put("strategies", getMigrationStrategies());
MustacheFactory mf = new DefaultMustacheFactory();
@@ -60,10 +60,6 @@ class MigrationWizardServlet extends HttpServlet {
respondWithTemplate(resp, model, template);
}
private List<String> getMigrationStrategies() {
return stream(MigrationStrategy.values()).map(Enum::name).collect(toList());
}
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
resp.setStatus(200);
@@ -81,6 +77,10 @@ class MigrationWizardServlet extends HttpServlet {
ScmEventBus.getInstance().post(new RestartEvent(MigrationWizardServlet.class, "wrote migration data"));
}
private MigrationStrategy[] getMigrationStrategies() {
return MigrationStrategy.values();
}
private void respondWithTemplate(HttpServletResponse resp, Map<String, Object> model, Mustache template) {
PrintWriter writer;
try {