Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<maven.compiler.release>11</maven.compiler.release>
<!-- internal dependencies -->
<step-grid.version>0.0.0-MASTER-SNAPSHOT</step-grid.version>
<step-framework.version>0.0.0-MASTER-SNAPSHOT</step-framework.version>
<step-framework.version>0.0.0-SED-4625-SNAPSHOT</step-framework.version>

<!-- external, non-transitive, dependencies -->
<dep.groovy.version>5.0.4</dep.groovy.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<GlobalContext> {
@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.
Expand Down Expand Up @@ -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<GlobalContext> versionManager = new VersionManager<>(context);
VersionManager<?> versionManager = context.require(VersionManager.class);
versionManager.readLatestControllerLog();
ControllerLog latestControllerLog = versionManager.getLatestControllerLog();
ExecutionAccessor accessor = context.getExecutionAccessor();
Expand Down Expand Up @@ -157,7 +150,7 @@ public void preShutdownHook(GlobalContext context) {
}

@Override
public void postShutdownHook(GlobalContext context) {
public void postShutdownHook() {
try {
if (controller != null) {
controller.postShutdownHook();
Expand All @@ -168,12 +161,6 @@ public void postShutdownHook(GlobalContext context) {
}
}


@Override
public void serverStop(GlobalContext context) {

}

@Override
public boolean canBeDisabled() {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@

public interface ControllerPlugin extends ServerPlugin<GlobalContext> {

public ExecutionEnginePlugin getExecutionEnginePlugin();
default ExecutionEnginePlugin getExecutionEnginePlugin() {
return null;
}

public AbstractWebPlugin getWebPlugin();
default AbstractWebPlugin getWebPlugin() {
return null;
}
}