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

Rename migration -> update

Browse Source
This commit is contained in:
René Pfeuffer
2019-05-14 14:17:11 +02:00
parent 46b1bb8869
commit 4e2ac426a0
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/MigrationEngine.java → scm-webapp/src/main/java/sonia/scm/UpdateEngine.java
View File

@@ -5,16 +5,16 @@ import sonia.scm.migration.UpdateStep;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.Set; import java.util.Set;
public class MigrationEngine { public class UpdateEngine {
private final Set<UpdateStep> steps; private final Set<UpdateStep> steps;
@Inject @Inject
public MigrationEngine(Set<UpdateStep> steps) { public UpdateEngine(Set<UpdateStep> steps) {
this.steps = steps; this.steps = steps;
} }
public void migrate() { public void update() {
steps.forEach(UpdateStep::doUpdate); steps.forEach(UpdateStep::doUpdate);
} }
} }

18
scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
View File

@@ -39,7 +39,7 @@ import com.google.inject.Module;
import com.google.inject.assistedinject.FactoryModuleBuilder; import com.google.inject.assistedinject.FactoryModuleBuilder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.MigrationEngine; import sonia.scm.UpdateEngine;
import sonia.scm.SCMContext; import sonia.scm.SCMContext;
import sonia.scm.ScmContextListener; import sonia.scm.ScmContextListener;
import sonia.scm.Stage; import sonia.scm.Stage;
@@ -152,14 +152,7 @@ public class BootstrapContextListener implements ServletContextListener {
Injector bootstrapInjector = Guice.createInjector(bootstrapModule, scmContextListenerModule); Injector bootstrapInjector = Guice.createInjector(bootstrapModule, scmContextListenerModule);
processUpdates(pluginLoader, bootstrapInjector);
Injector migrationInjector = bootstrapInjector.createChildInjector(new UpdateStepModule(pluginLoader));
MigrationEngine stepEngine = migrationInjector.getInstance(MigrationEngine.class);
stepEngine.migrate();
contextListener = bootstrapInjector.getInstance(ScmContextListener.Factory.class).create(cl, plugins); contextListener = bootstrapInjector.getInstance(ScmContextListener.Factory.class).create(cl, plugins);
} catch (IOException ex) { } catch (IOException ex) {
@@ -177,6 +170,13 @@ public class BootstrapContextListener implements ServletContextListener {
} }
} }
private void processUpdates(DefaultPluginLoader pluginLoader, Injector bootstrapInjector) {
Injector updateInjector = bootstrapInjector.createChildInjector(new UpdateStepModule(pluginLoader));
UpdateEngine updateEngine = updateInjector.getInstance(UpdateEngine.class);
updateEngine.update();
}
private boolean isCorePluginExtractionDisabled() { private boolean isCorePluginExtractionDisabled() {
return Boolean.getBoolean("sonia.scm.boot.disable-core-plugin-extraction"); return Boolean.getBoolean("sonia.scm.boot.disable-core-plugin-extraction");
} }