diff --git a/pom.xml b/pom.xml
index 539758091..eb35db783 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
11
0.0.0-MASTER-SNAPSHOT
- 0.0.0-MASTER-SNAPSHOT
+ 0.0.0-SED-4625-SNAPSHOT
5.0.4
diff --git a/step-controller/step-controller-server/src/main/java/step/core/controller/ControllerSettingPlugin.java b/step-controller/step-controller-server/src/main/java/step/core/controller/ControllerSettingPlugin.java
index 5f4c90547..85a3e2743 100644
--- a/step-controller/step-controller-server/src/main/java/step/core/controller/ControllerSettingPlugin.java
+++ b/step-controller/step-controller-server/src/main/java/step/core/controller/ControllerSettingPlugin.java
@@ -26,38 +26,18 @@
import step.engine.plugins.AbstractExecutionEnginePlugin;
import step.engine.plugins.ExecutionEnginePlugin;
-@Plugin
+@Plugin(dependencies = {StepControllerPlugin.class})
public class ControllerSettingPlugin extends AbstractControllerPlugin {
private ControllerSettingAccessor controllerSettingAccessor;
@Override
- public void serverStart(GlobalContext context) throws Exception {
+ public void init(GlobalContext context) throws Exception {
controllerSettingAccessor = new ControllerSettingAccessorImpl(
context.getCollectionFactory().getCollection("settings", ControllerSetting.class));
context.put(ControllerSettingAccessor.class, controllerSettingAccessor);
}
- @Override
- public void migrateData(GlobalContext context) throws Exception {
-
- }
-
- @Override
- public void initializeData(GlobalContext context) throws Exception {
-
- }
-
- @Override
- public void afterInitializeData(GlobalContext context) throws Exception {
-
- }
-
- @Override
- public void serverStop(GlobalContext context) {
-
- }
-
@Override
public ExecutionEnginePlugin getExecutionEnginePlugin() {
return new AbstractExecutionEnginePlugin() {
diff --git a/step-controller/step-controller-server/src/main/java/step/core/controller/StepControllerPlugin.java b/step-controller/step-controller-server/src/main/java/step/core/controller/StepControllerPlugin.java
index 1aca86de1..2c09d0868 100644
--- a/step-controller/step-controller-server/src/main/java/step/core/controller/StepControllerPlugin.java
+++ b/step-controller/step-controller-server/src/main/java/step/core/controller/StepControllerPlugin.java
@@ -14,29 +14,24 @@
import step.core.execution.model.ExecutionStatus;
import step.core.plugins.AbstractControllerPlugin;
import step.core.plugins.exceptions.PluginCriticalException;
-import step.framework.server.ControllerInitializationPlugin;
import step.core.plugins.Plugin;
import step.core.scheduler.ExecutionScheduler;
import step.core.scheduler.SchedulerServices;
import step.framework.server.CORSRequestResponseFilter;
import step.versionmanager.ControllerLog;
import step.versionmanager.VersionManager;
+import step.versionmanager.VersionManagerPlugin;
import java.io.IOException;
import java.util.List;
-@Plugin
-public class StepControllerPlugin extends AbstractControllerPlugin implements ControllerInitializationPlugin {
+@Plugin(runsBefore = {VersionManagerPlugin.class})
+public class StepControllerPlugin extends AbstractControllerPlugin {
private static final Logger logger = LoggerFactory.getLogger(StepControllerPlugin.class);
private Controller controller;
- @Override
- public void checkPreconditions(GlobalContext context) throws Exception {
-
- }
-
@Override
public void init(GlobalContext context) throws Exception {
// Only used for validation here, blows up if there is something wrong with the configuration.
@@ -99,11 +94,9 @@ public static String getControllerUrl(Configuration conf, boolean forBackend, bo
return url;
}
-
@Override
public void recover(GlobalContext context) throws Exception {
- //At this stage the version manager plugin cannot be started yet, so we create a version manager directly here to read the last start time
- VersionManager versionManager = new VersionManager<>(context);
+ VersionManager> versionManager = context.require(VersionManager.class);
versionManager.readLatestControllerLog();
ControllerLog latestControllerLog = versionManager.getLatestControllerLog();
ExecutionAccessor accessor = context.getExecutionAccessor();
@@ -157,7 +150,7 @@ public void preShutdownHook(GlobalContext context) {
}
@Override
- public void postShutdownHook(GlobalContext context) {
+ public void postShutdownHook() {
try {
if (controller != null) {
controller.postShutdownHook();
@@ -168,12 +161,6 @@ public void postShutdownHook(GlobalContext context) {
}
}
-
- @Override
- public void serverStop(GlobalContext context) {
-
- }
-
@Override
public boolean canBeDisabled() {
return false;
diff --git a/step-controller/step-controller-server/src/main/java/step/core/plugins/AbstractControllerPlugin.java b/step-controller/step-controller-server/src/main/java/step/core/plugins/AbstractControllerPlugin.java
index 88392e21d..04b1b7177 100644
--- a/step-controller/step-controller-server/src/main/java/step/core/plugins/AbstractControllerPlugin.java
+++ b/step-controller/step-controller-server/src/main/java/step/core/plugins/AbstractControllerPlugin.java
@@ -18,48 +18,6 @@
******************************************************************************/
package step.core.plugins;
-import step.core.GlobalContext;
-import step.engine.plugins.ExecutionEnginePlugin;
-
public abstract class AbstractControllerPlugin extends AbstractPlugin implements ControllerPlugin {
- @Override
- public ExecutionEnginePlugin getExecutionEnginePlugin() {
- return null;
- }
-
- public AbstractWebPlugin getWebPlugin() {
- return null;
- }
-
- @Override
- public boolean canBeDisabled() {
- return true;
- }
-
- @Override
- public void serverStart(GlobalContext context) throws Exception {
-
- }
-
- @Override
- public void serverStop(GlobalContext context) {
-
- }
-
- @Override
- public void migrateData(GlobalContext context) throws Exception {
-
- }
-
- @Override
- public void initializeData(GlobalContext context) throws Exception {
-
- }
-
- @Override
- public void afterInitializeData(GlobalContext context) throws Exception {
-
- }
-
}
diff --git a/step-controller/step-controller-server/src/main/java/step/core/plugins/ControllerPlugin.java b/step-controller/step-controller-server/src/main/java/step/core/plugins/ControllerPlugin.java
index 84918c754..b232c62ca 100644
--- a/step-controller/step-controller-server/src/main/java/step/core/plugins/ControllerPlugin.java
+++ b/step-controller/step-controller-server/src/main/java/step/core/plugins/ControllerPlugin.java
@@ -24,7 +24,11 @@
public interface ControllerPlugin extends ServerPlugin {
- public ExecutionEnginePlugin getExecutionEnginePlugin();
+ default ExecutionEnginePlugin getExecutionEnginePlugin() {
+ return null;
+ }
- public AbstractWebPlugin getWebPlugin();
+ default AbstractWebPlugin getWebPlugin() {
+ return null;
+ }
}