Skip to content

SED-4115 Activation expressions are not cached #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeromecomte wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SED-4115 Activation expressions are not cached #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ac123e
SED-4115 Activation expressions are not cached
jeromecomte Jul 25, 2025
49b6b1d
SED-4115 PR feedbacks
jeromecomte Jul 25, 2025
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
4 changes: 3 additions & 1 deletion ...ges-controller/src/test/java/step/automation/packages/AutomationPackageManagerOSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import step.core.scheduler.*;
import step.datapool.excel.ExcelDataPool;
import step.engine.plugins.AbstractExecutionEnginePlugin;
import step.entities.activation.Activator;
import step.expressions.ExpressionHandler;
import step.functions.Function;
import step.functions.accessor.FunctionAccessorImpl;
Expand Down Expand Up @@ -104,7 +105,8 @@ public void before() {
this.automationPackageAccessor = new AutomationPackageAccessorImpl(new InMemoryCollection<>());
this.functionAccessor = new FunctionAccessorImpl(new InMemoryCollection<>());
this.parameterAccessor = new AbstractAccessor<>(new InMemoryCollection<>());
ParameterManager parameterManager = new ParameterManager(this.parameterAccessor, null, "groovy", new DynamicBeanResolver(new DynamicValueResolver(new ExpressionHandler())));
ExpressionHandler expressionHandler = new ExpressionHandler();
ParameterManager parameterManager = new ParameterManager(this.parameterAccessor, null, new DynamicBeanResolver(new DynamicValueResolver(expressionHandler)), new Activator(expressionHandler));

Configuration configuration = createTestConfiguration();
this.resourceManager = new LocalResourceManagerImpl();
Expand Down
22 changes: 3 additions & 19 deletions ...on-packages-junit-core/src/main/java/step/engine/plugins/ParameterManagerLocalPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,14 @@
import step.core.execution.ExecutionEngineContext;
import step.core.execution.OperationMode;
import step.core.plugins.Plugin;
import step.entities.activation.Activator;
import step.parameter.Parameter;
import step.parameter.ParameterManager;
import step.plugins.parametermanager.ParameterManagerPlugin;

@Plugin(dependencies= {BasePlugin.class})
public class ParameterManagerLocalPlugin extends ParameterManagerPlugin {

public static final String STEP_PARAMTER_SCRIPT_ENGINE = "StepParamterScriptEngine";
public static final String defaultScriptEngine = "groovy";

public ParameterManagerLocalPlugin() {
super();
}
Expand All @@ -52,25 +50,11 @@ public void initializeExecutionEngineContext(AbstractExecutionEngineContext pare
Accessor<Parameter> parameterAccessor = new AbstractAccessor<>(new InMemoryCollection<>());
EncryptionManager encryptionManager = executionEngineContext.get(EncryptionManager.class);

String scriptEngine = getScriptEngine();
ParameterManager parameterManager = new ParameterManager(parameterAccessor, encryptionManager, scriptEngine, executionEngineContext.getDynamicBeanResolver());
ParameterManager parameterManager = new ParameterManager(parameterAccessor, encryptionManager,
executionEngineContext.getDynamicBeanResolver(), new Activator(executionEngineContext.getExpressionHandler()));
executionEngineContext.put(ParameterManager.class, parameterManager);

configure(parameterManager);
}

private String getScriptEngine() {
String scriptEngine = defaultScriptEngine;
String propertyVar = System.getProperty(STEP_PARAMTER_SCRIPT_ENGINE);
if (propertyVar != null && !propertyVar.isBlank()) {
scriptEngine = propertyVar;
} else {
String envVar = System.getenv(STEP_PARAMTER_SCRIPT_ENGINE);
if (envVar != null && ! envVar.isBlank()) {
scriptEngine = envVar;
}
}
return scriptEngine;
}

}
139 changes: 0 additions & 139 deletions step-commons/src/main/java/step/commons/activation/Activator.java
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions step-commons/src/main/java/step/commons/activation/Expression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@
******************************************************************************/
package step.commons.activation;

import javax.script.CompiledScript;

public class Expression {

String script;

String scriptEngine;

CompiledScript compiledScript;
private String script;

// This field isn't used anymore but has been kept in order to avoid serialization exceptions
private String scriptEngine;

public Expression() {
super();
Expand Down
9 changes: 6 additions & 3 deletions ...-controller/step-controller-backend/src/test/java/step/core/export/ExportManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import step.core.plans.PlanEntity;
import step.core.plans.builder.PlanBuilder;
import step.datapool.excel.ExcelDataPool;
import step.entities.activation.Activator;
import step.expressions.ExpressionHandler;
import step.functions.Function;
import step.functions.accessor.FunctionAccessor;
Expand Down Expand Up @@ -141,11 +142,13 @@ private void newContext(EncryptionManager encryptionManager) {
entityManager = new EntityManager();

FileResolver fileResolver = new FileResolver(resourceManager);
SelectorHelper selectorHelper = new SelectorHelper(new DynamicJsonObjectResolver(new DynamicJsonValueResolver(new ExpressionHandler())));
FunctionLocator functionLocator = new FunctionLocator(functionAccessor, selectorHelper);
ExpressionHandler expressionHandler = new ExpressionHandler();
SelectorHelper selectorHelper = new SelectorHelper(new DynamicJsonObjectResolver(new DynamicJsonValueResolver(expressionHandler)));
Activator activator = new Activator(expressionHandler);
FunctionLocator functionLocator = new FunctionLocator(functionAccessor, selectorHelper, activator);
entityManager
.register(new Entity<>(Parameter.ENTITY_NAME, parameterAccessor, Parameter.class))
.register(new PlanEntity(planAccessor, new PlanLocator(planAccessor, selectorHelper), entityManager))
.register(new PlanEntity(planAccessor, new PlanLocator(planAccessor, selectorHelper, activator), entityManager))
.register(new FunctionEntity(functionAccessor, functionLocator, entityManager))
.register(new ResourceEntity(resourceAccessor, resourceManager, fileResolver, entityManager))
.register(new Entity<>(EntityManager.resourceRevisions, resourceRevisionAccessor, ResourceRevision.class));
Expand Down
5 changes: 3 additions & 2 deletions ...plugins/src/main/java/step/plugins/parametermanager/ParameterManagerControllerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@
import step.core.plugins.AbstractControllerPlugin;
import step.core.plugins.Plugin;
import step.engine.plugins.ExecutionEnginePlugin;
import step.entities.activation.Activator;
import step.framework.server.tables.Table;
import step.framework.server.tables.TableRegistry;
import step.parameter.Parameter;
import step.parameter.ParameterManager;
import step.plugins.encryption.EncryptionManagerDependencyPlugin;
import step.plugins.screentemplating.*;
import step.plugins.screentemplating.ScreenTemplatePlugin;

import java.util.Set;
import java.util.function.BiConsumer;
Expand Down Expand Up @@ -76,7 +77,7 @@ public void serverStart(GlobalContext context) {
return allFilterAttributes.contains(PARAMETER_VALUE_FIELD + ".value") ? new Equals(PARAMETER_PROTECTED_VALUE_FIELD, false) : Filters.empty();
}));

ParameterManager parameterManager = new ParameterManager(parameterAccessor, encryptionManager, context.getConfiguration(), context.getDynamicBeanResolver());
ParameterManager parameterManager = new ParameterManager(parameterAccessor, encryptionManager, context.getDynamicBeanResolver(), new Activator(context.getExpressionHandler()));
context.put(ParameterManager.class, parameterManager);
this.parameterManager = parameterManager;

Expand Down
17 changes: 8 additions & 9 deletions ...-base-plugins/src/test/java/step/plugins/parametermanager/ParameterManagerPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,10 @@
******************************************************************************/
package step.plugins.parametermanager;

import static org.junit.Assert.*;

import java.util.HashMap;
import java.util.Map;

import ch.exense.commons.app.Configuration;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

import step.core.accessors.AbstractOrganizableObject;
import step.core.accessors.InMemoryAccessor;
import step.core.dynamicbeans.DynamicBeanResolver;
Expand All @@ -41,12 +35,19 @@
import step.core.plugins.exceptions.PluginCriticalException;
import step.core.variables.VariablesManager;
import step.engine.plugins.ExecutionEnginePlugin;
import step.entities.activation.Activator;
import step.expressions.ExpressionHandler;
import step.functions.Function;
import step.parameter.Parameter;
import step.parameter.ParameterManager;
import step.parameter.ParameterScope;

import java.util.HashMap;
import java.util.Map;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

public class ParameterManagerPluginTest {

protected InMemoryAccessor<Parameter> parameterAccessor = new InMemoryAccessor<>();
Expand Down Expand Up @@ -437,9 +438,7 @@ public LocalParameterManagerPlugin(InMemoryAccessor<Parameter> parameterAccessor
}

public LocalParameterManagerPlugin(InMemoryAccessor<Parameter> parameterAccessor, EncryptionManager encryptionManager, Configuration configuration) {
super(new ParameterManager(parameterAccessor, encryptionManager, configuration, new DynamicBeanResolver(new DynamicValueResolver(new ExpressionHandler()))));
super(new ParameterManager(parameterAccessor, encryptionManager, new DynamicBeanResolver(new DynamicValueResolver(new ExpressionHandler())), new Activator(new ExpressionHandler())));
}


}
}
Loading