-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate non-iterative bulk actions to activities
- Loading branch information
Showing
8 changed files
with
276 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
138 changes: 138 additions & 0 deletions
138
...java/com/evolveum/midpoint/model/impl/scripting/NonIterativeScriptingActivityHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| /* | ||
| * Copyright (c) 2010-2019 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.model.impl.scripting; | ||
|
|
||
| import static com.evolveum.midpoint.util.MiscUtil.argCheck; | ||
|
|
||
| import javax.annotation.PostConstruct; | ||
| import javax.annotation.PreDestroy; | ||
|
|
||
| import org.jetbrains.annotations.NotNull; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import com.evolveum.midpoint.model.api.ModelPublicConstants; | ||
| import com.evolveum.midpoint.model.api.ScriptExecutionResult; | ||
| import com.evolveum.midpoint.model.api.ScriptingService; | ||
| import com.evolveum.midpoint.model.impl.tasks.ModelActivityHandler; | ||
| import com.evolveum.midpoint.repo.common.activity.ActivityExecutionException; | ||
| import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition; | ||
| import com.evolveum.midpoint.repo.common.activity.execution.AbstractActivityExecution; | ||
| import com.evolveum.midpoint.repo.common.activity.execution.ActivityExecutionResult; | ||
| import com.evolveum.midpoint.repo.common.activity.execution.ExecutionInstantiationContext; | ||
| import com.evolveum.midpoint.repo.common.activity.execution.LocalActivityExecution; | ||
| import com.evolveum.midpoint.schema.constants.SchemaConstants; | ||
| import com.evolveum.midpoint.schema.expression.VariablesMap; | ||
| import com.evolveum.midpoint.schema.result.OperationResult; | ||
| import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource; | ||
| import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionSource; | ||
| import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper.TypedWorkDefinitionWrapper; | ||
| import com.evolveum.midpoint.util.DebugUtil; | ||
| import com.evolveum.midpoint.util.exception.CommonException; | ||
| import com.evolveum.midpoint.util.logging.Trace; | ||
| import com.evolveum.midpoint.util.logging.TraceManager; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractActivityWorkStateType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.NonIterativeScriptingWorkDefinitionType; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType; | ||
| import com.evolveum.midpoint.xml.ns._public.model.scripting_3.ExecuteScriptType; | ||
|
|
||
| /** | ||
| * This is a handler for "old", non-iterative (single) bulk actions. | ||
| */ | ||
| @Component | ||
| public class NonIterativeScriptingActivityHandler | ||
| extends ModelActivityHandler< | ||
| NonIterativeScriptingActivityHandler.MyWorkDefinition, | ||
| NonIterativeScriptingActivityHandler> { | ||
|
|
||
| @Autowired private ScriptingService scriptingService; | ||
|
|
||
| private static final String LEGACY_HANDLER_URI = ModelPublicConstants.SCRIPT_EXECUTION_TASK_HANDLER_URI; | ||
| private static final Trace LOGGER = TraceManager.getTrace(NonIterativeScriptingActivityHandler.class); | ||
|
|
||
| @PostConstruct | ||
| public void register() { | ||
| handlerRegistry.register(NonIterativeScriptingWorkDefinitionType.COMPLEX_TYPE, LEGACY_HANDLER_URI, | ||
| MyWorkDefinition.class, MyWorkDefinition::new, this); | ||
| } | ||
|
|
||
| @PreDestroy | ||
| public void unregister() { | ||
| handlerRegistry.unregister(NonIterativeScriptingWorkDefinitionType.COMPLEX_TYPE, LEGACY_HANDLER_URI, | ||
| MyWorkDefinition.class); | ||
| } | ||
|
|
||
| @Override | ||
| public String getIdentifierPrefix() { | ||
| return "non-iterative-scripting"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDefaultArchetypeOid() { | ||
| return SystemObjectsType.ARCHETYPE_SINGLE_BULK_ACTION_TASK.value(); | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractActivityExecution<MyWorkDefinition, NonIterativeScriptingActivityHandler, ?> createExecution( | ||
| @NotNull ExecutionInstantiationContext<MyWorkDefinition, NonIterativeScriptingActivityHandler> context, | ||
| @NotNull OperationResult result) { | ||
| return new MyActivityExecution(context); | ||
| } | ||
|
|
||
| static class MyActivityExecution | ||
| extends LocalActivityExecution<MyWorkDefinition, NonIterativeScriptingActivityHandler, AbstractActivityWorkStateType> { | ||
|
|
||
| MyActivityExecution( | ||
| @NotNull ExecutionInstantiationContext<MyWorkDefinition, NonIterativeScriptingActivityHandler> context) { | ||
| super(context); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean doesSupportStatistics() { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| protected @NotNull ActivityExecutionResult executeLocal(OperationResult result) | ||
| throws ActivityExecutionException, CommonException { | ||
| ExecuteScriptType executeScriptRequest = getWorkDefinition().getScriptExecutionRequest().clone(); | ||
| ScriptExecutionResult executionResult = getActivityHandler().scriptingService | ||
| .evaluateExpression(executeScriptRequest, | ||
| VariablesMap.emptyMap(), false, getRunningTask(), result); | ||
| LOGGER.debug("Execution output: {} item(s)", executionResult.getDataOutput().size()); | ||
| LOGGER.debug("Execution result:\n{}", executionResult.getConsoleOutput()); | ||
| return standardExecutionResult(); | ||
| } | ||
| } | ||
|
|
||
| public static class MyWorkDefinition extends AbstractWorkDefinition { | ||
|
|
||
| private final ExecuteScriptType scriptExecutionRequest; | ||
|
|
||
| MyWorkDefinition(WorkDefinitionSource source) { | ||
| if (source instanceof LegacyWorkDefinitionSource) { | ||
| scriptExecutionRequest = ((LegacyWorkDefinitionSource) source) | ||
| .getExtensionItemRealValue(SchemaConstants.SE_EXECUTE_SCRIPT, ExecuteScriptType.class); | ||
| } else { | ||
| NonIterativeScriptingWorkDefinitionType typedDefinition = (NonIterativeScriptingWorkDefinitionType) | ||
| ((TypedWorkDefinitionWrapper) source).getTypedDefinition(); | ||
| scriptExecutionRequest = typedDefinition.getScriptExecutionRequest(); | ||
| } | ||
| argCheck(scriptExecutionRequest != null, "No script execution request provided"); | ||
| argCheck(scriptExecutionRequest.getScriptingExpression() != null, "No scripting expression provided"); | ||
| } | ||
|
|
||
| public ExecuteScriptType getScriptExecutionRequest() { | ||
| return scriptExecutionRequest; | ||
| } | ||
|
|
||
| @Override | ||
| protected void debugDumpContent(StringBuilder sb, int indent) { | ||
| DebugUtil.debugDumpWithLabelLn(sb, "scriptExecutionRequest", String.valueOf(scriptExecutionRequest), indent+1); | ||
| } | ||
| } | ||
| } |
101 changes: 0 additions & 101 deletions
101
.../src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptExecutionTaskHandler.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.