diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml index 14e21ed0d..e49805a62 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml @@ -49,6 +49,11 @@ hapi-fhir-validation-resources-r4 ${hapi.fhir.version.v1} + + + org.ow2.asm + asm + org.apache.logging.log4j @@ -194,6 +199,10 @@ hapi-fhir-base ${hapi.fhir.version.v1} + + org.ow2.asm + asm + diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/ProcessPluginApiImpl.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/ProcessPluginApiImpl.java index 8ad20b9e2..ab9daeb4b 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/ProcessPluginApiImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/ProcessPluginApiImpl.java @@ -2,7 +2,7 @@ import java.util.Objects; -import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateExecution; import org.springframework.beans.factory.InitializingBean; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/AbstractListener.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/AbstractListener.java index e8be4669e..05b9aef6e 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/AbstractListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/AbstractListener.java @@ -6,13 +6,13 @@ import java.util.Objects; import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.ResourceType; import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.ParameterComponent; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.springframework.beans.factory.InitializingBean; public abstract class AbstractListener implements ExecutionListener, InitializingBean diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/ContinueListener.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/ContinueListener.java index a77f2bf23..06912c063 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/ContinueListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/ContinueListener.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Task; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/EndListener.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/EndListener.java index 4cfb660a6..5557e6bdb 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/EndListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/EndListener.java @@ -4,10 +4,10 @@ import java.util.Objects; import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.TaskStatus; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -116,4 +116,4 @@ private void logEnd(boolean subProcess, Task endTask, Task mainTask) getCurrentTime(), endTaskUrl, requester, businessKey); } } -} \ No newline at end of file +} diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/StartListener.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/StartListener.java index 86b930a50..17dd3a849 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/StartListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/StartListener.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Task; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/logging/PluginMdcImpl.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/logging/PluginMdcImpl.java index 754161e50..7255f3df3 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/logging/PluginMdcImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/logging/PluginMdcImpl.java @@ -3,12 +3,12 @@ import java.util.Objects; import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.ResourceType; import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.ParameterComponent; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.api.Constants; import dev.dsf.bpe.api.logging.AbstractPluginMdc; @@ -89,4 +89,4 @@ private String getFirstInputParameter(Task task, Coding code) .filter(v -> v instanceof StringType).map(v -> (StringType) v).map(StringType::getValue).findFirst() .orElse(null); } -} \ No newline at end of file +} diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginClassLoader.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginClassLoader.java new file mode 100644 index 000000000..56f022ce3 --- /dev/null +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginClassLoader.java @@ -0,0 +1,158 @@ +package dev.dsf.bpe.v1.plugin; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLClassLoader; + +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.Handle; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Type; + +public class ProcessPluginClassLoader extends URLClassLoader +{ + private static final String FROM_PACKAGE = "org/camunda/bpm"; + private static final String TO_PACKAGE = "org/operaton/bpm"; + + public ProcessPluginClassLoader(String name, URL[] urls, ClassLoader parent) + { + super(name, urls, parent); + } + + @Override + protected Class findClass(String name) throws ClassNotFoundException + { + try (InputStream is = getResourceAsStream(name.replace('.', '/') + ".class")) + { + if (is == null) + throw new ClassNotFoundException(name); + + ClassReader reader = new ClassReader(is); + ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES) + { + @Override + protected ClassLoader getClassLoader() + { + return ProcessPluginClassLoader.this; + } + }; + + ClassVisitor visitor = new ClassVisitor(Opcodes.ASM9, writer) + { + @Override + public void visit(int version, int access, String name, String signature, String superName, + String[] interfaces) + { + super.visit(version, access, name, signature, replace(superName), replaceAll(interfaces)); + } + + @Override + public FieldVisitor visitField(int access, String name, String descriptor, String signature, + Object value) + { + return super.visitField(access, name, replace(descriptor), replace(signature), value); + } + + @Override + public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, + String[] exceptions) + { + MethodVisitor mv = super.visitMethod(access, name, replace(descriptor), replace(signature), + replaceAll(exceptions)); + + return new MethodVisitor(Opcodes.ASM9, mv) + { + @Override + public void visitTypeInsn(int opcode, String type) + { + super.visitTypeInsn(opcode, replace(type)); + } + + @Override + public void visitFieldInsn(int opcode, String owner, String name, String descriptor) + { + super.visitFieldInsn(opcode, replace(owner), name, replace(descriptor)); + } + + @Override + public void visitMethodInsn(int opcode, String owner, String name, String descriptor, + boolean isInterface) + { + super.visitMethodInsn(opcode, replace(owner), name, replace(descriptor), isInterface); + } + + @Override + public void visitLdcInsn(Object value) + { + if (value instanceof Type t) + value = Type.getType(replace(t.getDescriptor())); + else if (value instanceof String s) + value = replace(s); + + super.visitLdcInsn(value); + } + + @Override + public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootstrapMethodHandle, + Object... bootstrapMethodArguments) + { + super.visitInvokeDynamicInsn(name, replace(descriptor), bootstrapMethodHandle, + replaceMethodArguments(bootstrapMethodArguments)); + } + }; + } + }; + + reader.accept(visitor, ClassReader.EXPAND_FRAMES); + + byte[] modified = writer.toByteArray(); + + return defineClass(name, modified, 0, modified.length); + } + catch (IOException e) + { + throw new ClassNotFoundException("Failed to load class: " + name, e); + } + } + + private String replace(String name) + { + return name == null ? null : name.replace(FROM_PACKAGE, TO_PACKAGE); + } + + private String[] replaceAll(String[] names) + { + if (names == null) + return null; + + String[] result = new String[names.length]; + + for (int i = 0; i < names.length; i++) + result[i] = replace(names[i]); + + return result; + } + + private Object[] replaceMethodArguments(Object... args) + { + Object[] newArgs = new Object[args.length]; + + for (int i = 0; i < args.length; i++) + { + Object arg = args[i]; + if (arg instanceof Type t) + newArgs[i] = Type.getType(replace(t.getDescriptor())); + else if (arg instanceof Handle h) + newArgs[i] = new Handle(h.getTag(), h.getOwner(), h.getName(), replace(h.getDesc()), h.isInterface()); + else + newArgs[i] = arg; + } + + return newArgs; + } +} diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginFactoryImpl.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginFactoryImpl.java index dcb5893af..b1080c013 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginFactoryImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginFactoryImpl.java @@ -1,10 +1,11 @@ package dev.dsf.bpe.v1.plugin; +import java.net.URL; import java.net.URLClassLoader; import java.nio.file.Path; import java.util.stream.Stream; -import org.camunda.bpm.engine.impl.variable.serializer.TypedValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.TypedValueSerializer; import org.springframework.context.ApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; @@ -25,9 +26,15 @@ public ProcessPluginFactoryImpl(ClassLoader apiClassLoader, ApplicationContext a ProcessPluginDefinition.class); } + @Override + protected URLClassLoader createPluginClassLoader(String name, URL[] urls, ClassLoader parent) + { + return new ProcessPluginClassLoader(name, urls, parent); + } + @Override protected ProcessPlugin createProcessPlugin(Object processPluginDefinition, boolean draft, Path jarFile, - URLClassLoader pluginClassLoader) + ClassLoader pluginClassLoader) { return new ProcessPluginImpl((ProcessPluginDefinition) processPluginDefinition, API_VERSION, draft, jarFile, pluginClassLoader, environment, apiApplicationContext, serverBaseUrl); diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginImpl.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginImpl.java index cba92a76a..d1990d273 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginImpl.java @@ -13,13 +13,6 @@ import java.util.function.Function; import java.util.function.Predicate; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.delegate.JavaDelegate; -import org.camunda.bpm.engine.delegate.TaskListener; -import org.camunda.bpm.engine.delegate.VariableScope; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; -import org.camunda.bpm.engine.impl.util.ClassDelegateUtil; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.ActivityDefinition; import org.hl7.fhir.r4.model.CodeSystem; @@ -35,6 +28,13 @@ import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.TaskStatus; import org.hl7.fhir.r4.model.ValueSet; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.delegate.VariableScope; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.impl.util.ClassDelegateUtil; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/spring/ApiServiceConfig.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/spring/ApiServiceConfig.java index d38e5091c..c284f78e4 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/spring/ApiServiceConfig.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/spring/ApiServiceConfig.java @@ -2,7 +2,7 @@ import java.util.Locale; -import org.camunda.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceSerializer.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceSerializer.java index b3ad24e8a..4bd35dce6 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceSerializer.java @@ -4,10 +4,10 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; import org.hl7.fhir.r4.model.Resource; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceValues.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceValues.java index badba8c2f..20d41f77b 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceValues.java @@ -2,12 +2,12 @@ import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; import org.hl7.fhir.r4.model.Resource; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class FhirResourceValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListSerializer.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListSerializer.java index d692409e8..da63d203d 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListSerializer.java @@ -4,9 +4,9 @@ import java.io.IOException; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.springframework.beans.factory.InitializingBean; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListValues.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListValues.java index fc102fb4f..5c8d92878 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListValues.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; import org.hl7.fhir.r4.model.Resource; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class FhirResourcesListValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetSerializer.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetSerializer.java index 24e254b8c..5a3dc61ec 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetSerializer.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.springframework.beans.factory.InitializingBean; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetValues.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetValues.java index 537183871..b80f5c24f 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetValues.java @@ -2,11 +2,11 @@ import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class TargetValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsSerializer.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsSerializer.java index a8e788f6e..a48e03696 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsSerializer.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.springframework.beans.factory.InitializingBean; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsValues.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsValues.java index d9b7c8444..545209d05 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/TargetsValues.java @@ -2,11 +2,11 @@ import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class TargetsValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/VariablesImpl.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/VariablesImpl.java index 4b7589c48..6fd89834a 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/VariablesImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/VariablesImpl.java @@ -7,11 +7,11 @@ import java.util.Optional; import java.util.stream.Stream; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.variable.value.TypedValue; import org.hl7.fhir.r4.model.QuestionnaireResponse; import org.hl7.fhir.r4.model.Resource; import org.hl7.fhir.r4.model.Task; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.variable.value.TypedValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/test/java/dev/dsf/bpe/v1/plugin/ProcessPluginImplTest.java b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/test/java/dev/dsf/bpe/v1/plugin/ProcessPluginImplTest.java index 1908590e0..1e2509876 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1-impl/src/test/java/dev/dsf/bpe/v1/plugin/ProcessPluginImplTest.java +++ b/dsf-bpe/dsf-bpe-process-api-v1-impl/src/test/java/dev/dsf/bpe/v1/plugin/ProcessPluginImplTest.java @@ -13,13 +13,13 @@ import java.util.List; import java.util.Map; -import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.model.bpmn.BpmnModelInstance; -import org.camunda.bpm.model.bpmn.instance.Process; -import org.camunda.bpm.model.bpmn.instance.camunda.CamundaProperties; -import org.camunda.bpm.model.bpmn.instance.camunda.CamundaProperty; import org.junit.Test; +import org.operaton.bpm.engine.delegate.BpmnError; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.model.bpmn.BpmnModelInstance; +import org.operaton.bpm.model.bpmn.instance.Process; +import org.operaton.bpm.model.bpmn.instance.operaton.OperatonProperties; +import org.operaton.bpm.model.bpmn.instance.operaton.OperatonProperty; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -321,17 +321,17 @@ public void testInitializeAndValidateResources() throws Exception assertNotNull(processes); assertEquals(1, processes.size()); Process process = processes.stream().findFirst().get(); - Collection camundaPropertiesElements = process.getExtensionElements() - .getChildElementsByType(CamundaProperties.class); + Collection camundaPropertiesElements = process.getExtensionElements() + .getChildElementsByType(OperatonProperties.class); assertNotNull(camundaPropertiesElements); assertEquals(1, camundaPropertiesElements.size()); - CamundaProperties camundaProperties = camundaPropertiesElements.stream().findFirst().get(); - Collection camundaPropertyElements = camundaProperties.getCamundaProperties(); + OperatonProperties camundaProperties = camundaPropertiesElements.stream().findFirst().get(); + Collection camundaPropertyElements = camundaProperties.getOperatonProperties(); assertNotNull(camundaPropertyElements); assertEquals(1, camundaPropertyElements.size()); - CamundaProperty property = camundaPropertyElements.stream().findFirst().get(); - assertEquals(ProcessPlugin.MODEL_ATTRIBUTE_PROCESS_API_VERSION, property.getCamundaName()); - assertEquals(ProcessPluginFactoryImpl.API_VERSION, Integer.parseInt(property.getCamundaValue())); + OperatonProperty property = camundaPropertyElements.stream().findFirst().get(); + assertEquals(ProcessPlugin.MODEL_ATTRIBUTE_PROCESS_API_VERSION, property.getOperatonName()); + assertEquals(ProcessPluginFactoryImpl.API_VERSION, Integer.parseInt(property.getOperatonValue())); } private ProcessPluginDefinition createPluginDefinition(List> springConfigurations, diff --git a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml index 3fef9c94c..8e9d063b9 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api-v1/pom.xml @@ -18,8 +18,8 @@ ${hapi.fhir.version.v1} - org.camunda.bpm - camunda-engine + org.operaton.bpm + operaton-engine org.springframework diff --git a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/ProcessPluginApi.java b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/ProcessPluginApi.java index af00b93bd..f5f7afe66 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/ProcessPluginApi.java +++ b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/ProcessPluginApi.java @@ -1,6 +1,6 @@ package dev.dsf.bpe.v1; -import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractServiceDelegate.java b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractServiceDelegate.java index f796f1d69..72cb0db78 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractServiceDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractServiceDelegate.java @@ -3,14 +3,14 @@ import java.util.List; import java.util.Objects; -import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.JavaDelegate; import org.hl7.fhir.r4.model.CodeableConcept; import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.TaskOutputComponent; import org.hl7.fhir.r4.model.Task.TaskStatus; +import org.operaton.bpm.engine.delegate.BpmnError; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.JavaDelegate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractTaskMessageSend.java b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractTaskMessageSend.java index 59f46fb15..d198d841a 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractTaskMessageSend.java +++ b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/AbstractTaskMessageSend.java @@ -6,12 +6,6 @@ import java.util.UUID; import java.util.stream.Stream; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.JavaDelegate; -import org.camunda.bpm.engine.impl.el.FixedValue; -import org.camunda.bpm.model.bpmn.instance.EndEvent; -import org.camunda.bpm.model.bpmn.instance.IntermediateThrowEvent; -import org.camunda.bpm.model.bpmn.instance.SendTask; import org.hl7.fhir.r4.model.CodeableConcept; import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.Meta; @@ -23,6 +17,12 @@ import org.hl7.fhir.r4.model.Task.TaskIntent; import org.hl7.fhir.r4.model.Task.TaskOutputComponent; import org.hl7.fhir.r4.model.Task.TaskStatus; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.impl.el.FixedValue; +import org.operaton.bpm.model.bpmn.instance.EndEvent; +import org.operaton.bpm.model.bpmn.instance.IntermediateThrowEvent; +import org.operaton.bpm.model.bpmn.instance.SendTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/DefaultUserTaskListener.java b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/DefaultUserTaskListener.java index 244977ed7..418263444 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/DefaultUserTaskListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/activity/DefaultUserTaskListener.java @@ -6,9 +6,6 @@ import java.util.Objects; import java.util.stream.Collectors; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.DelegateTask; -import org.camunda.bpm.engine.delegate.TaskListener; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.CodeableConcept; import org.hl7.fhir.r4.model.Questionnaire; @@ -20,6 +17,9 @@ import org.hl7.fhir.r4.model.Task.TaskOutputComponent; import org.hl7.fhir.r4.model.Task.TaskStatus; import org.hl7.fhir.r4.model.Type; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateTask; +import org.operaton.bpm.engine.delegate.TaskListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -72,7 +72,7 @@ public final void notify(DelegateTask userTask) { logger.trace("Execution of user task with id='{}'", execution.getCurrentActivityId()); - String questionnaireUrlWithVersion = userTask.getBpmnModelElementInstance().getCamundaFormKey(); + String questionnaireUrlWithVersion = userTask.getBpmnModelElementInstance().getOperatonFormKey(); Questionnaire questionnaire = readQuestionnaire(questionnaireUrlWithVersion); String businessKey = execution.getBusinessKey(); diff --git a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/variables/Variables.java b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/variables/Variables.java index e471f5bcf..dc6d4a57f 100644 --- a/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/variables/Variables.java +++ b/dsf-bpe/dsf-bpe-process-api-v1/src/main/java/dev/dsf/bpe/v1/variables/Variables.java @@ -5,10 +5,10 @@ import java.util.Date; import java.util.List; -import org.camunda.bpm.engine.variable.value.TypedValue; import org.hl7.fhir.r4.model.QuestionnaireResponse; import org.hl7.fhir.r4.model.Resource; import org.hl7.fhir.r4.model.Task; +import org.operaton.bpm.engine.variable.value.TypedValue; import dev.dsf.bpe.v1.constants.BpmnExecutionVariables; @@ -305,7 +305,7 @@ default Targets createTargets(Target... targets) */ default void setInteger(String variableName, Integer value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.integerValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.integerValue(value)); } /** @@ -336,7 +336,7 @@ default Integer getInteger(String variableName) */ default void setString(String variableName, String value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.stringValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.stringValue(value)); } /** @@ -367,7 +367,7 @@ default String getString(String variableName) */ default void setBoolean(String variableName, Boolean value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.booleanValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.booleanValue(value)); } /** @@ -398,7 +398,7 @@ default Boolean getBoolean(String variableName) */ default void setByteArray(String variableName, byte[] value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.byteArrayValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.byteArrayValue(value)); } /** @@ -429,7 +429,7 @@ default byte[] getByteArray(String variableName) */ default void setDate(String variableName, Date value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.dateValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.dateValue(value)); } /** @@ -460,7 +460,7 @@ default Date getDate(String variableName) */ default void setLong(String variableName, Long value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.longValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.longValue(value)); } /** @@ -491,7 +491,7 @@ default Long getLong(String variableName) */ default void setShort(String variableName, Short value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.shortValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.shortValue(value)); } /** @@ -522,7 +522,7 @@ default Short getShort(String variableName) */ default void setDouble(String variableName, Double value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.doubleValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.doubleValue(value)); } /** @@ -553,7 +553,7 @@ default Double getDouble(String variableName) */ default void setNumber(String variableName, Number value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.numberValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.numberValue(value)); } /** @@ -584,7 +584,7 @@ default Number getNumber(String variableName) */ default void setFile(String variableName, File value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.fileValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.fileValue(value)); } /** diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractMessageDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractMessageDelegate.java index b4848462f..b3a213cf3 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractMessageDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractMessageDelegate.java @@ -2,7 +2,7 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.activity.values.SendTaskValues; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractProcessPluginDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractProcessPluginDelegate.java index 2f828fd69..8e452273a 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractProcessPluginDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractProcessPluginDelegate.java @@ -3,7 +3,7 @@ import java.util.Objects; import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.variables.Variables; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ExecutionListenerDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ExecutionListenerDelegate.java index 1411bff6f..c2d144642 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ExecutionListenerDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ExecutionListenerDelegate.java @@ -2,14 +2,14 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.error.ExecutionListenerErrorHandler; import dev.dsf.bpe.v2.variables.Variables; public class ExecutionListenerDelegate extends AbstractProcessPluginDelegate - implements org.camunda.bpm.engine.delegate.ExecutionListener + implements org.operaton.bpm.engine.delegate.ExecutionListener { public ExecutionListenerDelegate(ProcessPluginApi api, Function variablesFactory, ExecutionListener delegate) diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageEndEventDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageEndEventDelegate.java index 558b0144f..3865f2cf4 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageEndEventDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageEndEventDelegate.java @@ -2,8 +2,8 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.JavaDelegate; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.activity.values.SendTaskValues; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageIntermediateThrowEventDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageIntermediateThrowEventDelegate.java index e14c62602..5f9f20fcf 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageIntermediateThrowEventDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageIntermediateThrowEventDelegate.java @@ -2,8 +2,8 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.JavaDelegate; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.activity.values.SendTaskValues; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageSendTaskDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageSendTaskDelegate.java index d22b6230f..28caaf9ee 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageSendTaskDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageSendTaskDelegate.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.BpmnError; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.JavaDelegate; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.activity.values.SendTaskValues; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ServiceTaskDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ServiceTaskDelegate.java index fdcc6d072..ae50e3fbb 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ServiceTaskDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ServiceTaskDelegate.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.BpmnError; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.JavaDelegate; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.error.ErrorBoundaryEvent; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/UserTaskListenerDelegate.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/UserTaskListenerDelegate.java index beb62527d..6520a318b 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/UserTaskListenerDelegate.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/UserTaskListenerDelegate.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.DelegateTask; -import org.camunda.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateTask; +import org.operaton.bpm.engine.delegate.TaskListener; import dev.dsf.bpe.v2.ProcessPluginApi; import dev.dsf.bpe.v2.activity.values.CreateQuestionnaireResponseValues; @@ -28,7 +28,7 @@ public void notify(DelegateTask delegateTask) try { delegate.notify(api, variables, new CreateQuestionnaireResponseValues(delegateTask.getId(), - delegateTask.getBpmnModelElementInstance().getCamundaFormKey())); + delegateTask.getBpmnModelElementInstance().getOperatonFormKey())); } // stop process execution if exception not absorbed by error handler catch (Exception exception) diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/AbstractListener.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/AbstractListener.java index 4bcd84e26..df59bdb7f 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/AbstractListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/AbstractListener.java @@ -6,13 +6,13 @@ import java.util.Objects; import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.ResourceType; import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.ParameterComponent; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.springframework.beans.factory.InitializingBean; public abstract class AbstractListener implements ExecutionListener, InitializingBean diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/ContinueListener.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/ContinueListener.java index 0366bfd72..ab66baae5 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/ContinueListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/ContinueListener.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Task; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/EndListener.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/EndListener.java index d9b03e37c..1b503d895 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/EndListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/EndListener.java @@ -4,10 +4,10 @@ import java.util.Objects; import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.TaskStatus; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -116,4 +116,4 @@ private void logEnd(boolean subProcess, Task endTask, Task mainTask) getCurrentTime(), endTaskUrl, requester, businessKey); } } -} \ No newline at end of file +} diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/StartListener.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/StartListener.java index 73c3ad3a8..af5826c85 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/StartListener.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/listener/StartListener.java @@ -2,9 +2,9 @@ import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; import org.hl7.fhir.r4.model.Task; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/logging/PluginMdcImpl.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/logging/PluginMdcImpl.java index 6365b236e..ddb16b2dc 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/logging/PluginMdcImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/logging/PluginMdcImpl.java @@ -3,12 +3,12 @@ import java.util.Objects; import java.util.function.Function; -import org.camunda.bpm.engine.delegate.DelegateExecution; import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.ResourceType; import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.ParameterComponent; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.api.Constants; import dev.dsf.bpe.api.logging.AbstractPluginMdc; @@ -89,4 +89,4 @@ private String getFirstInputParameter(Task task, Coding code) .filter(v -> v instanceof StringType).map(v -> (StringType) v).map(StringType::getValue).findFirst() .orElse(null); } -} \ No newline at end of file +} diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginFactoryImpl.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginFactoryImpl.java index e4c503deb..b469d9100 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginFactoryImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginFactoryImpl.java @@ -1,10 +1,9 @@ package dev.dsf.bpe.v2.plugin; -import java.net.URLClassLoader; import java.nio.file.Path; import java.util.stream.Stream; -import org.camunda.bpm.engine.impl.variable.serializer.TypedValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.TypedValueSerializer; import org.springframework.context.ApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; @@ -27,10 +26,10 @@ public ProcessPluginFactoryImpl(ClassLoader apiClassLoader, ApplicationContext a @Override protected ProcessPlugin createProcessPlugin(Object processPluginDefinition, boolean draft, Path jarFile, - URLClassLoader classLoader) + ClassLoader pluginClassLoader) { return new ProcessPluginImpl((ProcessPluginDefinition) processPluginDefinition, API_VERSION, draft, jarFile, - classLoader, environment, apiApplicationContext, serverBaseUrl); + pluginClassLoader, environment, apiApplicationContext, serverBaseUrl); } @Override diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginImpl.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginImpl.java index 65b78c26f..14b84ad10 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/plugin/ProcessPluginImpl.java @@ -20,14 +20,6 @@ import java.util.function.Supplier; import org.apache.commons.lang3.ClassUtils; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.Expression; -import org.camunda.bpm.engine.delegate.JavaDelegate; -import org.camunda.bpm.engine.delegate.TaskListener; -import org.camunda.bpm.engine.delegate.VariableScope; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; -import org.camunda.bpm.engine.impl.util.ClassDelegateUtil; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.ActivityDefinition; import org.hl7.fhir.r4.model.CodeSystem; @@ -43,6 +35,14 @@ import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.TaskStatus; import org.hl7.fhir.r4.model.ValueSet; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.Expression; +import org.operaton.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.delegate.VariableScope; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.impl.util.ClassDelegateUtil; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -440,7 +440,7 @@ public JavaDelegate getMessageIntermediateThrowEvent(String className, List fieldDeclarations, VariableScope variableScope) { ExecutionListener target = get(ExecutionListener.class, className); diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/spring/ApiServiceConfig.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/spring/ApiServiceConfig.java index 62623ae2d..9846308c0 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/spring/ApiServiceConfig.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/spring/ApiServiceConfig.java @@ -4,8 +4,8 @@ import java.util.function.Function; import org.apache.tika.detect.Detector; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceSerializer.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceSerializer.java index 1e8abf80f..7091408c6 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceSerializer.java @@ -6,11 +6,11 @@ import java.io.OutputStreamWriter; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; import org.hl7.fhir.r4.model.Binary; import org.hl7.fhir.r4.model.Resource; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceValues.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceValues.java index 5a1e8d4a0..183a9b1d7 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourceValues.java @@ -2,12 +2,12 @@ import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; import org.hl7.fhir.r4.model.Resource; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class FhirResourceValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListSerializer.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListSerializer.java index a1291f314..57353f136 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListSerializer.java @@ -4,9 +4,9 @@ import java.io.IOException; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.springframework.beans.factory.InitializingBean; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListValues.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListValues.java index 29ba2cf05..26d1dfd8a 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/FhirResourcesListValues.java @@ -4,12 +4,12 @@ import java.util.List; import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; import org.hl7.fhir.r4.model.Resource; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class FhirResourcesListValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderSerializer.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderSerializer.java index f08a65f9a..ac8ac697f 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderSerializer.java @@ -1,8 +1,8 @@ package dev.dsf.bpe.v2.variables; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import dev.dsf.bpe.v2.variables.JsonHolderValues.JsonHolderValue; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderValues.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderValues.java index 9a5d86ea1..3ef766e30 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/JsonHolderValues.java @@ -2,11 +2,11 @@ import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class JsonHolderValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetSerializer.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetSerializer.java index d06286691..ba63ceb74 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetSerializer.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.springframework.beans.factory.InitializingBean; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetValues.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetValues.java index 4b1670abe..b423523ff 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetValues.java @@ -2,11 +2,11 @@ import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class TargetValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsSerializer.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsSerializer.java index 175a859c0..1430d5892 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsSerializer.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsSerializer.java @@ -3,9 +3,9 @@ import java.io.IOException; import java.util.Objects; -import org.camunda.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; import org.springframework.beans.factory.InitializingBean; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsValues.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsValues.java index c523c98ab..6e581e9a2 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsValues.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/TargetsValues.java @@ -2,11 +2,11 @@ import java.util.Map; -import org.camunda.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; -import org.camunda.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; -import org.camunda.bpm.engine.variable.type.PrimitiveValueType; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; +import org.operaton.bpm.engine.variable.impl.type.PrimitiveValueTypeImpl; +import org.operaton.bpm.engine.variable.impl.value.PrimitiveTypeValueImpl; +import org.operaton.bpm.engine.variable.type.PrimitiveValueType; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; public final class TargetsValues { diff --git a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/VariablesImpl.java b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/VariablesImpl.java index 9aebebce6..e6296671a 100644 --- a/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/VariablesImpl.java +++ b/dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/VariablesImpl.java @@ -10,11 +10,11 @@ import java.util.Optional; import java.util.stream.Stream; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.variable.value.TypedValue; import org.hl7.fhir.r4.model.QuestionnaireResponse; import org.hl7.fhir.r4.model.Resource; import org.hl7.fhir.r4.model.Task; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.variable.value.TypedValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -363,61 +363,61 @@ public QuestionnaireResponse getLatestReceivedQuestionnaireResponse() @Override public void setInteger(String variableName, Integer value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.integerValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.integerValue(value)); } @Override public void setString(String variableName, String value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.stringValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.stringValue(value)); } @Override public void setByteArray(String variableName, byte[] value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.byteArrayValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.byteArrayValue(value)); } @Override public void setDate(String variableName, Date value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.dateValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.dateValue(value)); } @Override public void setLong(String variableName, Long value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.longValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.longValue(value)); } @Override public void setShort(String variableName, Short value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.shortValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.shortValue(value)); } @Override public void setDouble(String variableName, Double value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.doubleValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.doubleValue(value)); } @Override public void setNumber(String variableName, Number value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.numberValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.numberValue(value)); } @Override public void setFile(String variableName, File value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.fileValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.fileValue(value)); } @Override public void setBoolean(String variableName, Boolean value) { - setVariable(variableName, org.camunda.bpm.engine.variable.Variables.booleanValue(value)); + setVariable(variableName, org.operaton.bpm.engine.variable.Variables.booleanValue(value)); } @Override @@ -452,61 +452,61 @@ public T getVariable(String variableName) @Override public void setIntegerLocal(String variableName, Integer value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.integerValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.integerValue(value)); } @Override public void setStringLocal(String variableName, String value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.stringValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.stringValue(value)); } @Override public void setByteArrayLocal(String variableName, byte[] value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.byteArrayValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.byteArrayValue(value)); } @Override public void setDateLocal(String variableName, Date value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.dateValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.dateValue(value)); } @Override public void setLongLocal(String variableName, Long value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.longValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.longValue(value)); } @Override public void setShortLocal(String variableName, Short value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.shortValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.shortValue(value)); } @Override public void setDoubleLocal(String variableName, Double value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.doubleValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.doubleValue(value)); } @Override public void setNumberLocal(String variableName, Number value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.numberValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.numberValue(value)); } @Override public void setFileLocal(String variableName, File value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.fileValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.fileValue(value)); } @Override public void setBooleanLocal(String variableName, Boolean value) { - setVariableLocal(variableName, org.camunda.bpm.engine.variable.Variables.booleanValue(value)); + setVariableLocal(variableName, org.operaton.bpm.engine.variable.Variables.booleanValue(value)); } private void setVariableLocal(String variableName, TypedValue value) diff --git a/dsf-bpe/dsf-bpe-process-api/pom.xml b/dsf-bpe/dsf-bpe-process-api/pom.xml index 9f9877985..99965c6ca 100644 --- a/dsf-bpe/dsf-bpe-process-api/pom.xml +++ b/dsf-bpe/dsf-bpe-process-api/pom.xml @@ -19,8 +19,8 @@ jakarta.mail - org.camunda.bpm - camunda-engine + org.operaton.bpm + operaton-engine org.springframework diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactory.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactory.java index a4cd23bee..5bca80a41 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactory.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactory.java @@ -1,6 +1,6 @@ package dev.dsf.bpe.api.listener; -import org.camunda.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.ExecutionListener; public interface ListenerFactory { diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactoryImpl.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactoryImpl.java index a7d0550f4..67ee7c623 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactoryImpl.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/listener/ListenerFactoryImpl.java @@ -1,6 +1,6 @@ package dev.dsf.bpe.api.listener; -import org.camunda.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.ExecutionListener; public class ListenerFactoryImpl implements ListenerFactory { diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/AbstractPluginMdc.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/AbstractPluginMdc.java index d6ecc64b4..eeb421706 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/AbstractPluginMdc.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/AbstractPluginMdc.java @@ -4,8 +4,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.DelegateTask; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateTask; import org.slf4j.MDC; public abstract class AbstractPluginMdc implements PluginMdc diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/PluginMdc.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/PluginMdc.java index 84762dd5c..a3d498b30 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/PluginMdc.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/logging/PluginMdc.java @@ -3,8 +3,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.DelegateTask; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.DelegateTask; public interface PluginMdc { diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java index c2723497b..70a5886d7 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPlugin.java @@ -22,25 +22,25 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.camunda.bpm.engine.impl.variable.serializer.TypedValueSerializer; -import org.camunda.bpm.model.bpmn.Bpmn; -import org.camunda.bpm.model.bpmn.BpmnModelInstance; -import org.camunda.bpm.model.bpmn.instance.EndEvent; -import org.camunda.bpm.model.bpmn.instance.ExtensionElements; -import org.camunda.bpm.model.bpmn.instance.FlowNode; -import org.camunda.bpm.model.bpmn.instance.IntermediateThrowEvent; -import org.camunda.bpm.model.bpmn.instance.MessageEventDefinition; -import org.camunda.bpm.model.bpmn.instance.Process; -import org.camunda.bpm.model.bpmn.instance.SendTask; -import org.camunda.bpm.model.bpmn.instance.ServiceTask; -import org.camunda.bpm.model.bpmn.instance.SubProcess; -import org.camunda.bpm.model.bpmn.instance.UserTask; -import org.camunda.bpm.model.bpmn.instance.camunda.CamundaExecutionListener; -import org.camunda.bpm.model.bpmn.instance.camunda.CamundaField; -import org.camunda.bpm.model.bpmn.instance.camunda.CamundaProperties; -import org.camunda.bpm.model.bpmn.instance.camunda.CamundaProperty; -import org.camunda.bpm.model.bpmn.instance.camunda.CamundaTaskListener; -import org.camunda.bpm.model.xml.instance.ModelElementInstance; +import org.operaton.bpm.engine.impl.variable.serializer.TypedValueSerializer; +import org.operaton.bpm.model.bpmn.Bpmn; +import org.operaton.bpm.model.bpmn.BpmnModelInstance; +import org.operaton.bpm.model.bpmn.instance.EndEvent; +import org.operaton.bpm.model.bpmn.instance.ExtensionElements; +import org.operaton.bpm.model.bpmn.instance.FlowNode; +import org.operaton.bpm.model.bpmn.instance.IntermediateThrowEvent; +import org.operaton.bpm.model.bpmn.instance.MessageEventDefinition; +import org.operaton.bpm.model.bpmn.instance.Process; +import org.operaton.bpm.model.bpmn.instance.SendTask; +import org.operaton.bpm.model.bpmn.instance.ServiceTask; +import org.operaton.bpm.model.bpmn.instance.SubProcess; +import org.operaton.bpm.model.bpmn.instance.UserTask; +import org.operaton.bpm.model.bpmn.instance.operaton.OperatonExecutionListener; +import org.operaton.bpm.model.bpmn.instance.operaton.OperatonField; +import org.operaton.bpm.model.bpmn.instance.operaton.OperatonProperties; +import org.operaton.bpm.model.bpmn.instance.operaton.OperatonProperty; +import org.operaton.bpm.model.bpmn.instance.operaton.OperatonTaskListener; +import org.operaton.bpm.model.xml.instance.ModelElementInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -647,28 +647,28 @@ file, getDefinitionName(), getDefinitionVersion(), VERSION_PLACEHOLDER_PATTERN_S { ExtensionElements ext = getOrCreateExtensionElements(process); - CamundaProperties properties = ext.getChildElementsByType(CamundaProperties.class).stream() + OperatonProperties properties = ext.getChildElementsByType(OperatonProperties.class).stream() .findFirst().orElseGet(() -> { - CamundaProperties p = ext.getModelInstance().newInstance(CamundaProperties.class); + OperatonProperties p = ext.getModelInstance().newInstance(OperatonProperties.class); ext.addChildElement(p); return p; }); - CamundaProperty property = properties.getCamundaProperties().stream() - .filter(p -> MODEL_ATTRIBUTE_PROCESS_API_VERSION.equals(p.getCamundaName())).findFirst() + OperatonProperty property = properties.getOperatonProperties().stream() + .filter(p -> MODEL_ATTRIBUTE_PROCESS_API_VERSION.equals(p.getOperatonName())).findFirst() .orElseGet(() -> { - CamundaProperty p = properties.getModelInstance().newInstance(CamundaProperty.class); + OperatonProperty p = properties.getModelInstance().newInstance(OperatonProperty.class); properties.addChildElement(p); return p; }); - property.setCamundaName(MODEL_ATTRIBUTE_PROCESS_API_VERSION); - property.setCamundaValue(String.valueOf(processPluginApiVersion)); + property.setOperatonName(MODEL_ATTRIBUTE_PROCESS_API_VERSION); + property.setOperatonValue(String.valueOf(processPluginApiVersion)); - if (process.getCamundaHistoryTimeToLiveString() == null - || process.getCamundaHistoryTimeToLiveString().isBlank()) + if (process.getOperatonHistoryTimeToLiveString() == null + || process.getOperatonHistoryTimeToLiveString().isBlank()) { if (draft) logger.info("Setting process history time to live for process {} from {} to {}", @@ -676,7 +676,7 @@ file, getDefinitionName(), getDefinitionVersion(), VERSION_PLACEHOLDER_PATTERN_S else logger.debug("Setting process history time to live for process {} from {} to {}", process.getId(), getJarFile().toString(), DEFAULT_PROCESS_HISTORY_TIME_TO_LIVE); - process.setCamundaHistoryTimeToLiveString(DEFAULT_PROCESS_HISTORY_TIME_TO_LIVE); + process.setOperatonHistoryTimeToLiveString(DEFAULT_PROCESS_HISTORY_TIME_TO_LIVE); } }); @@ -735,7 +735,7 @@ private boolean isValid(BpmnFileAndModel fileAndModel) if (!getDefinitionResourceVersion().equals(processKeyAndVersion.getVersion())) { logger.warn( - "Camunda version tag of process in '{}' does not match process plugin version (tag: {} vs. plugin: {})", + "Operaton version tag of process in '{}' does not match process plugin version (tag: {} vs. plugin: {})", fileAndModel.file(), processKeyAndVersion.getVersion(), getDefinitionVersion()); return false; } @@ -748,7 +748,7 @@ private boolean isValid(BpmnFileAndModel fileAndModel) return true; } - // TODO filter BPMN Models that use UserTasks but either do not declare a camunda formKey or do not contain the + // TODO filter BPMN Models that use UserTasks but either do not declare a operaton formKey or do not contain the // matching questionnaire resource private Stream filterBpmnModelsWithNotAvailableBeans(List models, ApplicationContext applicationContext) @@ -774,12 +774,12 @@ private boolean beanAvailable(ModelElementInstance parent, Process process, Appl { // service tasks boolean serviceTasksOk = parent.getChildElementsByType(ServiceTask.class).stream().filter(Objects::nonNull) - .allMatch(t -> beanAvailable(process, t.getId(), t.getCamundaClass(), serviceTaskInterface, + .allMatch(t -> beanAvailable(process, t.getId(), t.getOperatonClass(), serviceTaskInterface, applicationContext)); // message send tasks boolean sendTasksOk = parent.getChildElementsByType(SendTask.class).stream().filter(Objects::nonNull) - .allMatch(t -> beanAvailable(process, t.getId(), t.getCamundaClass(), messageSendTaskInterface, + .allMatch(t -> beanAvailable(process, t.getId(), t.getOperatonClass(), messageSendTaskInterface, applicationContext) && taskFieldsAvailable(process, "SendTask", t.getId(), t.getExtensionElements())); @@ -787,16 +787,16 @@ private boolean beanAvailable(ModelElementInstance parent, Process process, Appl boolean userTasksTaskListenersOk = parent.getChildElementsByType(UserTask.class).stream() .filter(Objects::nonNull) .allMatch(t -> t.getChildElementsByType(ExtensionElements.class).stream().filter(Objects::nonNull) - .flatMap(e -> e.getChildElementsByType(CamundaTaskListener.class).stream()) - .filter(Objects::nonNull).allMatch(l -> beanAvailable(process, t.getId(), l.getCamundaClass(), + .flatMap(e -> e.getChildElementsByType(OperatonTaskListener.class).stream()) + .filter(Objects::nonNull).allMatch(l -> beanAvailable(process, t.getId(), l.getOperatonClass(), userTaskListenerInterface, applicationContext))); // all elements: execution listeners boolean allElementsExecutionListenersOk = parent.getChildElementsByType(FlowNode.class).stream() .filter(Objects::nonNull) .allMatch(n -> n.getChildElementsByType(ExtensionElements.class).stream().filter(Objects::nonNull) - .flatMap(e -> e.getChildElementsByType(CamundaExecutionListener.class).stream()) - .filter(Objects::nonNull).allMatch(l -> beanAvailable(process, n.getId(), l.getCamundaClass(), + .flatMap(e -> e.getChildElementsByType(OperatonExecutionListener.class).stream()) + .filter(Objects::nonNull).allMatch(l -> beanAvailable(process, n.getId(), l.getOperatonClass(), executionListenerInterface, applicationContext))); // message intermediate throw events @@ -806,7 +806,7 @@ private boolean beanAvailable(ModelElementInstance parent, Process process, Appl e -> e.getEventDefinitions().stream().filter(Objects::nonNull) .filter(def -> def instanceof MessageEventDefinition)) .map(def -> (MessageEventDefinition) def) - .allMatch(def -> beanAvailable(process, def.getId(), def.getCamundaClass(), + .allMatch(def -> beanAvailable(process, def.getId(), def.getOperatonClass(), messageIntermediateThrowEventInterface, applicationContext) && taskFieldsAvailable(process, "IntermediateThrowEvent", def.getId(), def.getExtensionElements())); @@ -815,7 +815,7 @@ && taskFieldsAvailable(process, "IntermediateThrowEvent", def.getId(), boolean endEventsOk = parent.getChildElementsByType(EndEvent.class).stream().filter(Objects::nonNull) .allMatch(e -> e.getEventDefinitions().stream().filter(Objects::nonNull) .filter(def -> def instanceof MessageEventDefinition).map(def -> (MessageEventDefinition) def) - .allMatch(def -> beanAvailable(process, def.getId(), def.getCamundaClass(), + .allMatch(def -> beanAvailable(process, def.getId(), def.getOperatonClass(), messageEndEventInterface, applicationContext) && taskFieldsAvailable(process, "MessageEndEvent", e.getId(), def.getExtensionElements()))); @@ -831,20 +831,20 @@ && taskFieldsAvailable(process, "MessageEndEvent", e.getId(), public boolean taskFieldsAvailable(Process process, String elementType, String elementId, ExtensionElements extensionElements) { - Collection fields = extensionElements == null ? List.of() - : extensionElements.getChildElementsByType(CamundaField.class); + Collection fields = extensionElements == null ? List.of() + : extensionElements.getChildElementsByType(OperatonField.class); String instantiatesCanonical = null; String messageName = null; String profile = null; - for (CamundaField field : fields) + for (OperatonField field : fields) { - if ("profile".equals(field.getCamundaName())) + if ("profile".equals(field.getOperatonName())) profile = field.getTextContent(); - else if ("messageName".equals(field.getCamundaName())) + else if ("messageName".equals(field.getOperatonName())) messageName = field.getTextContent(); - else if ("instantiatesCanonical".equals(field.getCamundaName())) + else if ("instantiatesCanonical".equals(field.getOperatonName())) instantiatesCanonical = field.getTextContent(); } @@ -861,7 +861,7 @@ else if ("instantiatesCanonical".equals(field.getCamundaName())) .collect(Collectors.joining(", ")); logger.warn("Mandatory fields in {} with id {} of process {}|{} not defined: {} missing", elementType, - elementId, process.getId(), process.getCamundaVersionTag(), message); + elementId, process.getId(), process.getOperatonVersionTag(), message); } return instantiatesCanonical != null && !instantiatesCanonical.isBlank() && messageName != null @@ -875,7 +875,7 @@ private boolean beanAvailable(Process process, String elementId, String classNam return true; ProcessIdAndVersion processKeyAndVersion = new ProcessIdAndVersion(process.getId(), - process.getCamundaVersionTag()); + process.getOperatonVersionTag()); Class serviceClass = loadClass(processKeyAndVersion, elementId, expectedInterface, className); if (serviceClass == null) diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPluginFactory.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPluginFactory.java index 6aaa9a0ef..371a9d6b4 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPluginFactory.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/AbstractProcessPluginFactory.java @@ -65,7 +65,7 @@ public ProcessPlugin load(Path pluginPath) { try { - URLClassLoader pluginClassLoader = new URLClassLoader(pluginPath.getFileName().toString(), + ClassLoader pluginClassLoader = createPluginClassLoader(pluginPath.getFileName().toString(), new URL[] { toUrl(pluginPath) }, apiClassLoader); List> definitions = ServiceLoader.load(processPluginDefinitionType, pluginClassLoader).stream() @@ -99,8 +99,13 @@ else if (definitions.size() > 1) } } + protected URLClassLoader createPluginClassLoader(String name, URL[] urls, ClassLoader parent) + { + return new URLClassLoader(name, urls, parent); + } + protected abstract ProcessPlugin createProcessPlugin(Object processPluginDefinition, boolean draft, Path jarFile, - URLClassLoader pluginClassLoader); + ClassLoader pluginClassLoader); private URL toUrl(Path p) { diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/BpmnFileAndModel.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/BpmnFileAndModel.java index a427aa97b..62d648cc6 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/BpmnFileAndModel.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/BpmnFileAndModel.java @@ -2,7 +2,7 @@ import java.nio.file.Path; -import org.camunda.bpm.model.bpmn.BpmnModelInstance; +import org.operaton.bpm.model.bpmn.BpmnModelInstance; public final record BpmnFileAndModel(int processPluginApiVersion, boolean draft, String file, BpmnModelInstance model, Path jar) diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessIdAndVersion.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessIdAndVersion.java index 6ad1e37e7..1c0946d98 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessIdAndVersion.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessIdAndVersion.java @@ -5,9 +5,9 @@ import java.util.Objects; import java.util.stream.Collectors; -import org.camunda.bpm.engine.repository.ProcessDefinition; -import org.camunda.bpm.model.bpmn.BpmnModelInstance; -import org.camunda.bpm.model.bpmn.instance.Process; +import org.operaton.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.model.bpmn.BpmnModelInstance; +import org.operaton.bpm.model.bpmn.instance.Process; public class ProcessIdAndVersion implements Comparable { @@ -42,7 +42,7 @@ public static ProcessIdAndVersion fromModel(BpmnModelInstance model) Objects.requireNonNull(model, "model"); Process process = model.getModelElementsByType(Process.class).stream().findFirst().get(); - return new ProcessIdAndVersion(process.getId(), process.getCamundaVersionTag()); + return new ProcessIdAndVersion(process.getId(), process.getOperatonVersionTag()); } private final String id; diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPlugin.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPlugin.java index 36f70eb78..21b06fa97 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPlugin.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPlugin.java @@ -5,13 +5,13 @@ import java.util.Map; import java.util.stream.Stream; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.delegate.JavaDelegate; -import org.camunda.bpm.engine.delegate.TaskListener; -import org.camunda.bpm.engine.delegate.VariableScope; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; -import org.camunda.bpm.engine.impl.variable.serializer.TypedValueSerializer; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.delegate.VariableScope; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.impl.variable.serializer.TypedValueSerializer; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; import org.springframework.context.ApplicationContext; import dev.dsf.bpe.api.logging.PluginMdc; diff --git a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPluginFactory.java b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPluginFactory.java index ff01e8589..a58024940 100644 --- a/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPluginFactory.java +++ b/dsf-bpe/dsf-bpe-process-api/src/main/java/dev/dsf/bpe/api/plugin/ProcessPluginFactory.java @@ -3,7 +3,7 @@ import java.nio.file.Path; import java.util.stream.Stream; -import org.camunda.bpm.engine.impl.variable.serializer.TypedValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.TypedValueSerializer; import dev.dsf.bpe.api.listener.ListenerFactory; diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 0d20343c6..9fa9a9baa 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -153,12 +153,22 @@ - org.camunda.bpm - camunda-engine + org.operaton.bpm + operaton-engine - org.camunda.bpm - camunda-engine-spring + org.operaton.bpm + operaton-engine-spring + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProvider.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProvider.java index 39a99db34..58c0da325 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProvider.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProvider.java @@ -2,11 +2,11 @@ import java.util.List; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.delegate.JavaDelegate; -import org.camunda.bpm.engine.delegate.TaskListener; -import org.camunda.bpm.engine.delegate.VariableScope; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.delegate.VariableScope; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; import dev.dsf.bpe.api.plugin.ProcessIdAndVersion; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProviderImpl.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProviderImpl.java index 726321237..85cd8127b 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProviderImpl.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/DelegateProviderImpl.java @@ -5,11 +5,11 @@ import java.util.Map; import java.util.Objects; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.delegate.JavaDelegate; -import org.camunda.bpm.engine.delegate.TaskListener; -import org.camunda.bpm.engine.delegate.VariableScope; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.delegate.VariableScope; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactory.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactory.java index d1ca28892..f96d9b946 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactory.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactory.java @@ -1,6 +1,6 @@ package dev.dsf.bpe.camunda; -import org.camunda.bpm.engine.impl.variable.serializer.VariableSerializerFactory; +import org.operaton.bpm.engine.impl.variable.serializer.VariableSerializerFactory; public interface FallbackSerializerFactory extends VariableSerializerFactory, ProcessPluginConsumer { diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactoryImpl.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactoryImpl.java index 9d87ce537..0f22724ab 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactoryImpl.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/FallbackSerializerFactoryImpl.java @@ -6,12 +6,12 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.camunda.bpm.engine.impl.variable.serializer.AbstractTypedValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.TypedValueSerializer; -import org.camunda.bpm.engine.impl.variable.serializer.ValueFields; -import org.camunda.bpm.engine.variable.impl.value.UntypedValueImpl; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.engine.variable.value.TypedValue; +import org.operaton.bpm.engine.impl.variable.serializer.AbstractTypedValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.TypedValueSerializer; +import org.operaton.bpm.engine.impl.variable.serializer.ValueFields; +import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.engine.variable.value.TypedValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParse.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParse.java index 00ecdea33..0b6d39ee5 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParse.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParse.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.delegate.TaskListener; -import org.camunda.bpm.engine.impl.bpmn.behavior.ClassDelegateActivityBehavior; -import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParse; -import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParser; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; -import org.camunda.bpm.engine.impl.pvm.process.ActivityImpl; -import org.camunda.bpm.engine.impl.pvm.process.ScopeImpl; -import org.camunda.bpm.engine.impl.task.TaskDefinition; -import org.camunda.bpm.engine.impl.util.xml.Element; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.impl.bpmn.behavior.ClassDelegateActivityBehavior; +import org.operaton.bpm.engine.impl.bpmn.parser.BpmnParse; +import org.operaton.bpm.engine.impl.bpmn.parser.BpmnParser; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.impl.pvm.process.ActivityImpl; +import org.operaton.bpm.engine.impl.pvm.process.ScopeImpl; +import org.operaton.bpm.engine.impl.task.TaskDefinition; +import org.operaton.bpm.engine.impl.util.xml.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ public void parseServiceTaskLike(ActivityImpl activity, String elementName, Elem if (activity.getActivityBehavior() instanceof ClassDelegateActivityBehavior) { - String className = serviceTaskElement.attributeNS(CAMUNDA_BPMN_EXTENSIONS_NS, PROPERTYNAME_CLASS); + String className = serviceTaskElement.attributeNS(OPERATON_BPMN_EXTENSIONS_NS, PROPERTYNAME_CLASS); List fieldDeclarations = parseFieldDeclarations(serviceTaskElement); logger.debug("Modifying {} for {} in BPMN element with id '{}'", diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParseFactory.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParseFactory.java index 879674a17..9fbb2dc12 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParseFactory.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionBpmnParseFactory.java @@ -1,8 +1,8 @@ package dev.dsf.bpe.camunda; -import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParse; -import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParser; -import org.camunda.bpm.engine.impl.cfg.BpmnParseFactory; +import org.operaton.bpm.engine.impl.bpmn.parser.BpmnParse; +import org.operaton.bpm.engine.impl.bpmn.parser.BpmnParser; +import org.operaton.bpm.engine.impl.cfg.BpmnParseFactory; public class MultiVersionBpmnParseFactory implements BpmnParseFactory { diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java index 395edb6b8..efc101fc5 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateActivityBehavior.java @@ -2,18 +2,18 @@ import java.util.List; -import org.camunda.bpm.engine.ProcessEngineException; -import org.camunda.bpm.engine.delegate.JavaDelegate; -import org.camunda.bpm.engine.impl.bpmn.behavior.ClassDelegateActivityBehavior; -import org.camunda.bpm.engine.impl.bpmn.behavior.ServiceTaskJavaDelegateActivityBehavior; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; -import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity; -import org.camunda.bpm.engine.impl.pvm.delegate.ActivityBehavior; -import org.camunda.bpm.engine.impl.pvm.delegate.ActivityExecution; -import org.camunda.bpm.model.bpmn.instance.EndEvent; -import org.camunda.bpm.model.bpmn.instance.IntermediateThrowEvent; -import org.camunda.bpm.model.bpmn.instance.SendTask; -import org.camunda.bpm.model.bpmn.instance.ServiceTask; +import org.operaton.bpm.engine.ProcessEngineException; +import org.operaton.bpm.engine.delegate.JavaDelegate; +import org.operaton.bpm.engine.impl.bpmn.behavior.ClassDelegateActivityBehavior; +import org.operaton.bpm.engine.impl.bpmn.behavior.ServiceTaskJavaDelegateActivityBehavior; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.impl.persistence.entity.ExecutionEntity; +import org.operaton.bpm.engine.impl.pvm.delegate.ActivityBehavior; +import org.operaton.bpm.engine.impl.pvm.delegate.ActivityExecution; +import org.operaton.bpm.model.bpmn.instance.EndEvent; +import org.operaton.bpm.model.bpmn.instance.IntermediateThrowEvent; +import org.operaton.bpm.model.bpmn.instance.SendTask; +import org.operaton.bpm.model.bpmn.instance.ServiceTask; import dev.dsf.bpe.api.plugin.ProcessIdAndVersion; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateExecutionListener.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateExecutionListener.java index 4da882e9a..03ca7c583 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateExecutionListener.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateExecutionListener.java @@ -2,14 +2,14 @@ import java.util.List; -import org.camunda.bpm.engine.ProcessEngineException; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.impl.bpmn.delegate.ExecutionListenerInvocation; -import org.camunda.bpm.engine.impl.bpmn.listener.ClassDelegateExecutionListener; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; -import org.camunda.bpm.engine.impl.context.Context; -import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity; +import org.operaton.bpm.engine.ProcessEngineException; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.impl.bpmn.delegate.ExecutionListenerInvocation; +import org.operaton.bpm.engine.impl.bpmn.listener.ClassDelegateExecutionListener; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.impl.context.Context; +import org.operaton.bpm.engine.impl.persistence.entity.ExecutionEntity; import dev.dsf.bpe.api.plugin.ProcessIdAndVersion; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateTaskListener.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateTaskListener.java index 92b8b5b32..b3b0643b9 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateTaskListener.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionClassDelegateTaskListener.java @@ -2,14 +2,14 @@ import java.util.List; -import org.camunda.bpm.engine.ProcessEngineException; -import org.camunda.bpm.engine.delegate.DelegateTask; -import org.camunda.bpm.engine.delegate.TaskListener; -import org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration; -import org.camunda.bpm.engine.impl.context.Context; -import org.camunda.bpm.engine.impl.persistence.entity.TaskEntity; -import org.camunda.bpm.engine.impl.task.delegate.TaskListenerInvocation; -import org.camunda.bpm.engine.impl.task.listener.ClassDelegateTaskListener; +import org.operaton.bpm.engine.ProcessEngineException; +import org.operaton.bpm.engine.delegate.DelegateTask; +import org.operaton.bpm.engine.delegate.TaskListener; +import org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration; +import org.operaton.bpm.engine.impl.context.Context; +import org.operaton.bpm.engine.impl.persistence.entity.TaskEntity; +import org.operaton.bpm.engine.impl.task.delegate.TaskListenerInvocation; +import org.operaton.bpm.engine.impl.task.listener.ClassDelegateTaskListener; import dev.dsf.bpe.api.plugin.ProcessIdAndVersion; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java index 7ef3eab84..dbd66dc16 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/camunda/MultiVersionSpringProcessEngineConfiguration.java @@ -1,7 +1,7 @@ package dev.dsf.bpe.camunda; -import org.camunda.bpm.engine.impl.telemetry.dto.TelemetryDataImpl; -import org.camunda.bpm.engine.spring.SpringProcessEngineConfiguration; +import org.operaton.bpm.engine.impl.telemetry.dto.TelemetryDataImpl; +import org.operaton.bpm.engine.spring.SpringProcessEngineConfiguration; public class MultiVersionSpringProcessEngineConfiguration extends SpringProcessEngineConfiguration { diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DebugLoggingBpmnParseListener.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DebugLoggingBpmnParseListener.java index 72cb7a26e..96b45c26c 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DebugLoggingBpmnParseListener.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DebugLoggingBpmnParseListener.java @@ -1,18 +1,16 @@ package dev.dsf.bpe.listener; -import org.camunda.bpm.engine.delegate.DelegateExecution; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.impl.bpmn.parser.AbstractBpmnParseListener; -import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParseListener; -import org.camunda.bpm.engine.impl.pvm.process.ActivityImpl; -import org.camunda.bpm.engine.impl.pvm.process.ScopeImpl; -import org.camunda.bpm.engine.impl.util.xml.Element; +import org.operaton.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.impl.bpmn.parser.BpmnParseListener; +import org.operaton.bpm.engine.impl.pvm.process.ActivityImpl; +import org.operaton.bpm.engine.impl.pvm.process.ScopeImpl; +import org.operaton.bpm.engine.impl.util.xml.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; -public class DebugLoggingBpmnParseListener extends AbstractBpmnParseListener - implements BpmnParseListener, InitializingBean +public class DebugLoggingBpmnParseListener implements BpmnParseListener, InitializingBean { private static final class ExecutionListenerLogger implements ExecutionListener { diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DefaultBpmnParseListener.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DefaultBpmnParseListener.java index b11d3d939..46bb5d854 100755 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DefaultBpmnParseListener.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/listener/DefaultBpmnParseListener.java @@ -8,15 +8,15 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.camunda.bpm.engine.delegate.ExecutionListener; -import org.camunda.bpm.engine.impl.bpmn.parser.AbstractBpmnParseListener; -import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParse; -import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity; -import org.camunda.bpm.engine.impl.pvm.process.ActivityImpl; -import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl; -import org.camunda.bpm.engine.impl.pvm.process.ScopeImpl; -import org.camunda.bpm.engine.impl.util.xml.Element; -import org.camunda.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.engine.delegate.ExecutionListener; +import org.operaton.bpm.engine.impl.bpmn.parser.BpmnParse; +import org.operaton.bpm.engine.impl.bpmn.parser.BpmnParseListener; +import org.operaton.bpm.engine.impl.persistence.entity.ExecutionEntity; +import org.operaton.bpm.engine.impl.pvm.process.ActivityImpl; +import org.operaton.bpm.engine.impl.pvm.process.ProcessDefinitionImpl; +import org.operaton.bpm.engine.impl.pvm.process.ScopeImpl; +import org.operaton.bpm.engine.impl.util.xml.Element; +import org.operaton.bpm.engine.repository.ProcessDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +25,7 @@ import dev.dsf.bpe.api.plugin.ProcessPlugin; import dev.dsf.bpe.camunda.ProcessPluginConsumer; -public class DefaultBpmnParseListener extends AbstractBpmnParseListener implements ProcessPluginConsumer +public class DefaultBpmnParseListener implements BpmnParseListener, ProcessPluginConsumer { private static final Logger logger = LoggerFactory.getLogger(DefaultBpmnParseListener.class); diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/BpmnProcessStateChangeServiceImpl.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/BpmnProcessStateChangeServiceImpl.java index 40a1c4346..b2a845aeb 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/BpmnProcessStateChangeServiceImpl.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/plugin/BpmnProcessStateChangeServiceImpl.java @@ -10,10 +10,10 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.camunda.bpm.engine.RepositoryService; -import org.camunda.bpm.engine.repository.Deployment; -import org.camunda.bpm.engine.repository.DeploymentBuilder; -import org.camunda.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.engine.RepositoryService; +import org.operaton.bpm.engine.repository.Deployment; +import org.operaton.bpm.engine.repository.DeploymentBuilder; +import org.operaton.bpm.engine.repository.ProcessDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/CamundaConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/OperatonConfig.java similarity index 93% rename from dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/CamundaConfig.java rename to dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/OperatonConfig.java index 585247742..42bde716e 100755 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/CamundaConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/OperatonConfig.java @@ -4,11 +4,11 @@ import java.util.List; import org.apache.commons.dbcp2.BasicDataSource; -import org.camunda.bpm.engine.ProcessEngine; -import org.camunda.bpm.engine.impl.jobexecutor.DefaultJobExecutor; -import org.camunda.bpm.engine.impl.persistence.StrongUuidGenerator; -import org.camunda.bpm.engine.spring.ProcessEngineFactoryBean; -import org.camunda.bpm.engine.spring.SpringProcessEngineConfiguration; +import org.operaton.bpm.engine.ProcessEngine; +import org.operaton.bpm.engine.impl.jobexecutor.DefaultJobExecutor; +import org.operaton.bpm.engine.impl.persistence.StrongUuidGenerator; +import org.operaton.bpm.engine.spring.ProcessEngineFactoryBean; +import org.operaton.bpm.engine.spring.SpringProcessEngineConfiguration; import org.postgresql.Driver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -28,7 +28,7 @@ import dev.dsf.bpe.listener.DefaultBpmnParseListener; @Configuration -public class CamundaConfig +public class OperatonConfig { @Autowired private PropertiesConfig propertiesConfig; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PluginConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PluginConfig.java index bab7f4dbe..520ddbb86 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PluginConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PluginConfig.java @@ -35,7 +35,7 @@ public class PluginConfig private DaoConfig daoConfig; @Autowired - private CamundaConfig camundaConfig; + private OperatonConfig operatonConfig; @Autowired private List processPluginFactories; @@ -63,7 +63,7 @@ public ProcessPluginLoader processPluginLoader() @Bean public BpmnProcessStateChangeService bpmnProcessStateChangeService() { - return new BpmnProcessStateChangeServiceImpl(camundaConfig.processEngine().getRepositoryService(), + return new BpmnProcessStateChangeServiceImpl(operatonConfig.processEngine().getRepositoryService(), daoConfig.processStateDao(), ProcessIdAndVersion.fromStrings(propertiesConfig.getProcessExcluded()), ProcessIdAndVersion.fromStrings(propertiesConfig.getProcessRetired())); } @@ -80,8 +80,8 @@ public FhirResourceHandler fhirResourceHandler() public ProcessPluginManager processPluginManager() { return new ProcessPluginManagerImpl( - List.of(camundaConfig.delegateProvider(), camundaConfig.fallbackSerializerFactory(), - camundaConfig.defaultBpmnParseListener()), + List.of(operatonConfig.delegateProvider(), operatonConfig.fallbackSerializerFactory(), + operatonConfig.defaultBpmnParseListener()), processPluginLoader(), bpmnProcessStateChangeService(), fhirResourceHandler(), propertiesConfig.getDsfServerBaseUrl(), dsfClientConfig.clientProvider().getWebserviceClient(), propertiesConfig.getFhirServerRequestMaxRetries(), propertiesConfig.getFhirServerRetryDelay()); diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PostStartupConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PostStartupConfig.java index d2e91ce17..8d3a6a0a6 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PostStartupConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/PostStartupConfig.java @@ -19,7 +19,7 @@ public class PostStartupConfig private WebsocketConfig fhirConfig; @Autowired - private CamundaConfig camundaConfig; + private OperatonConfig operatonConfig; @EventListener({ ContextRefreshedEvent.class }) public void onContextRefreshedEvent() @@ -29,7 +29,7 @@ public void onContextRefreshedEvent() logger.info("Deploying process plugins [Done]"); logger.info("Starting process engine ..."); - camundaConfig.processEngineConfiguration().getJobExecutor().start(); + operatonConfig.processEngineConfiguration().getJobExecutor().start(); logger.info("Starting process engine [Done]"); fhirConfig.fhirConnectorTask().connect(); diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebserviceConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebserviceConfig.java index ee9d07b63..cd08ee0d6 100755 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebserviceConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebserviceConfig.java @@ -3,7 +3,7 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.camunda.bpm.engine.ProcessEngine; +import org.operaton.bpm.engine.ProcessEngine; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebsocketConfig.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebsocketConfig.java index 3627013a3..4fb8f8b97 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebsocketConfig.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/WebsocketConfig.java @@ -26,7 +26,7 @@ public class WebsocketConfig private DaoConfig daoConfig; @Autowired - private CamundaConfig camundaConfig; + private OperatonConfig operatonConfig; @Autowired private FhirConfig fhirConfig; @@ -40,9 +40,9 @@ public class WebsocketConfig @Bean public ResourceHandler taskHandler() { - return new TaskHandler(camundaConfig.processEngine().getRepositoryService(), + return new TaskHandler(operatonConfig.processEngine().getRepositoryService(), pluginConfig.processPluginManager(), fhirConfig.fhirContext(), - camundaConfig.processEngine().getRuntimeService(), + operatonConfig.processEngine().getRuntimeService(), dsfClientConfig.clientProvider().getWebserviceClient()); } @@ -65,9 +65,9 @@ public LocalFhirConnector fhirConnectorTask() @Bean public ResourceHandler questionnaireResponseHandler() { - return new QuestionnaireResponseHandler(camundaConfig.processEngine().getRepositoryService(), + return new QuestionnaireResponseHandler(operatonConfig.processEngine().getRepositoryService(), pluginConfig.processPluginManager(), fhirConfig.fhirContext(), - camundaConfig.processEngine().getTaskService()); + operatonConfig.processEngine().getTaskService()); } @Bean diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/AbstractResourceHandler.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/AbstractResourceHandler.java index 9447b0ada..48d618806 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/AbstractResourceHandler.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/AbstractResourceHandler.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.Optional; -import org.camunda.bpm.engine.RepositoryService; -import org.camunda.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.engine.RepositoryService; +import org.operaton.bpm.engine.repository.ProcessDefinition; import org.springframework.beans.factory.InitializingBean; import ca.uhn.fhir.context.FhirContext; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/QuestionnaireResponseHandler.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/QuestionnaireResponseHandler.java index e7eb69f54..f058233f8 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/QuestionnaireResponseHandler.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/QuestionnaireResponseHandler.java @@ -6,13 +6,13 @@ import java.util.Optional; import java.util.stream.Collectors; -import org.camunda.bpm.engine.RepositoryService; -import org.camunda.bpm.engine.TaskService; -import org.camunda.bpm.engine.repository.ProcessDefinition; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; import org.hl7.fhir.r4.model.QuestionnaireResponse; import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseStatus; import org.hl7.fhir.r4.model.StringType; +import org.operaton.bpm.engine.RepositoryService; +import org.operaton.bpm.engine.TaskService; +import org.operaton.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java index 03055145d..e30faa85e 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/subscription/TaskHandler.java @@ -12,24 +12,24 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.camunda.bpm.engine.MismatchingMessageCorrelationException; -import org.camunda.bpm.engine.ProcessEngineException; -import org.camunda.bpm.engine.RepositoryService; -import org.camunda.bpm.engine.RuntimeService; -import org.camunda.bpm.engine.repository.ProcessDefinition; -import org.camunda.bpm.engine.runtime.MessageCorrelationBuilder; -import org.camunda.bpm.engine.runtime.ProcessInstance; -import org.camunda.bpm.engine.runtime.ProcessInstanceQuery; -import org.camunda.bpm.engine.variable.value.PrimitiveValue; -import org.camunda.bpm.model.bpmn.BpmnModelInstance; -import org.camunda.bpm.model.bpmn.instance.MessageEventDefinition; -import org.camunda.bpm.model.bpmn.instance.StartEvent; import org.hl7.fhir.r4.model.CodeableConcept; import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.Task; import org.hl7.fhir.r4.model.Task.ParameterComponent; import org.hl7.fhir.r4.model.Task.TaskStatus; +import org.operaton.bpm.engine.MismatchingMessageCorrelationException; +import org.operaton.bpm.engine.ProcessEngineException; +import org.operaton.bpm.engine.RepositoryService; +import org.operaton.bpm.engine.RuntimeService; +import org.operaton.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.engine.runtime.MessageCorrelationBuilder; +import org.operaton.bpm.engine.runtime.ProcessInstance; +import org.operaton.bpm.engine.runtime.ProcessInstanceQuery; +import org.operaton.bpm.engine.variable.value.PrimitiveValue; +import org.operaton.bpm.model.bpmn.BpmnModelInstance; +import org.operaton.bpm.model.bpmn.instance.MessageEventDefinition; +import org.operaton.bpm.model.bpmn.instance.StartEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/ProcessService.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/ProcessService.java index f4a58a3b5..7d732903d 100755 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/ProcessService.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/ProcessService.java @@ -14,10 +14,10 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.camunda.bpm.engine.RepositoryService; -import org.camunda.bpm.engine.repository.Deployment; -import org.camunda.bpm.engine.repository.ProcessDefinition; -import org.camunda.bpm.model.bpmn.BpmnModelInstance; +import org.operaton.bpm.engine.RepositoryService; +import org.operaton.bpm.engine.repository.Deployment; +import org.operaton.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.model.bpmn.BpmnModelInstance; import org.springframework.beans.factory.InitializingBean; import org.thymeleaf.context.Context; diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/RootService.java b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/RootService.java index bd85aabd1..3f8a5c989 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/RootService.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/webservice/RootService.java @@ -6,11 +6,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.camunda.bpm.engine.RepositoryService; -import org.camunda.bpm.engine.RuntimeService; -import org.camunda.bpm.engine.repository.ProcessDefinition; -import org.camunda.bpm.engine.runtime.ActivityInstance; -import org.camunda.bpm.engine.runtime.ProcessInstance; +import org.operaton.bpm.engine.RepositoryService; +import org.operaton.bpm.engine.RuntimeService; +import org.operaton.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.engine.runtime.ActivityInstance; +import org.operaton.bpm.engine.runtime.ProcessInstance; import org.springframework.beans.factory.InitializingBean; import org.thymeleaf.context.Context; diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v1/allowed-bpe-classes.list b/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v1/allowed-bpe-classes.list index 6507bbc08..7943c40f5 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v1/allowed-bpe-classes.list +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v1/allowed-bpe-classes.list @@ -10,14 +10,14 @@ org.apache.commons.lang3 org.apache.commons.text org.apache.http org.bouncycastle -org.camunda.bpm.engine.delegate -org.camunda.bpm.engine.impl.el.FixedValue -org.camunda.bpm.engine.impl.util.ClassDelegateUtil -org.camunda.bpm.engine.impl.variable.serializer -org.camunda.bpm.engine.ProcessEngine -org.camunda.bpm.engine.RuntimeService -org.camunda.bpm.engine.variable -org.camunda.bpm.model.bpmn.instance +org.operaton.bpm.engine.delegate +org.operaton.bpm.engine.impl.el.FixedValue +org.operaton.bpm.engine.impl.util.ClassDelegateUtil +org.operaton.bpm.engine.impl.variable.serializer +org.operaton.bpm.engine.ProcessEngine +org.operaton.bpm.engine.RuntimeService +org.operaton.bpm.engine.variable +org.operaton.bpm.model.bpmn.instance org.joda.time org.glassfish.jersey org.slf4j.Logger diff --git a/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v2/allowed-bpe-classes.list b/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v2/allowed-bpe-classes.list index f84ce3f1a..17a5c6e7a 100644 --- a/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v2/allowed-bpe-classes.list +++ b/dsf-bpe/dsf-bpe-server/src/main/resources/bpe/api/v2/allowed-bpe-classes.list @@ -14,15 +14,15 @@ org.apache.commons.lang3 org.apache.commons.text org.apache.http org.bouncycastle -org.camunda.bpm.engine.delegate -org.camunda.bpm.engine.impl.bpmn.parser.FieldDeclaration -org.camunda.bpm.engine.impl.el.FixedValue -org.camunda.bpm.engine.impl.util.ClassDelegateUtil -org.camunda.bpm.engine.impl.variable.serializer -org.camunda.bpm.engine.ProcessEngine -org.camunda.bpm.engine.RuntimeService -org.camunda.bpm.engine.variable -org.camunda.bpm.model.bpmn.instance +org.operaton.bpm.engine.delegate +org.operaton.bpm.engine.impl.bpmn.parser.FieldDeclaration +org.operaton.bpm.engine.impl.el.FixedValue +org.operaton.bpm.engine.impl.util.ClassDelegateUtil +org.operaton.bpm.engine.impl.variable.serializer +org.operaton.bpm.engine.ProcessEngine +org.operaton.bpm.engine.RuntimeService +org.operaton.bpm.engine.variable +org.operaton.bpm.model.bpmn.instance org.glassfish.jersey org.slf4j.Logger org.slf4j.LoggerFactory diff --git a/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/subscription/TaskHandlerTest.java b/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/subscription/TaskHandlerTest.java index 01b148548..61c6a4bc4 100644 --- a/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/subscription/TaskHandlerTest.java +++ b/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/subscription/TaskHandlerTest.java @@ -8,14 +8,6 @@ import java.util.Optional; import java.util.UUID; -import org.camunda.bpm.engine.RepositoryService; -import org.camunda.bpm.engine.RuntimeService; -import org.camunda.bpm.engine.repository.ProcessDefinition; -import org.camunda.bpm.engine.repository.ProcessDefinitionQuery; -import org.camunda.bpm.engine.runtime.MessageCorrelationBuilder; -import org.camunda.bpm.engine.runtime.ProcessInstance; -import org.camunda.bpm.engine.runtime.ProcessInstanceQuery; -import org.camunda.bpm.engine.variable.Variables; import org.hl7.fhir.r4.model.ResourceType; import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.Task; @@ -28,6 +20,14 @@ import org.mockito.Mockito; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; +import org.operaton.bpm.engine.RepositoryService; +import org.operaton.bpm.engine.RuntimeService; +import org.operaton.bpm.engine.repository.ProcessDefinition; +import org.operaton.bpm.engine.repository.ProcessDefinitionQuery; +import org.operaton.bpm.engine.runtime.MessageCorrelationBuilder; +import org.operaton.bpm.engine.runtime.ProcessInstance; +import org.operaton.bpm.engine.runtime.ProcessInstanceQuery; +import org.operaton.bpm.engine.variable.Variables; import ca.uhn.fhir.context.FhirContext; import dev.dsf.bpe.api.Constants; diff --git a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/AbstractTest.java b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/AbstractTest.java index 9d9903d11..2919fa271 100644 --- a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/AbstractTest.java +++ b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/AbstractTest.java @@ -2,9 +2,9 @@ import java.util.function.Consumer; -import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.delegate.DelegateExecution; import org.hl7.fhir.r4.model.StringType; +import org.operaton.bpm.engine.delegate.BpmnError; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.test.PluginTestExecutor; import dev.dsf.bpe.v1.ProcessPluginApi; diff --git a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/ApiTest.java b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/ApiTest.java index 8fd904ce2..58984ea32 100644 --- a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/ApiTest.java +++ b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/ApiTest.java @@ -2,8 +2,8 @@ import static dev.dsf.bpe.test.PluginTestExecutor.expectNotNull; -import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.BpmnError; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.test.PluginTest; import dev.dsf.bpe.v1.ProcessPluginApi; diff --git a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/TestActivitySelector.java b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/TestActivitySelector.java index 5aed4698d..e27efbb47 100644 --- a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/TestActivitySelector.java +++ b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/service/TestActivitySelector.java @@ -1,7 +1,7 @@ package dev.dsf.bpe.test.service; -import org.camunda.bpm.engine.delegate.BpmnError; -import org.camunda.bpm.engine.delegate.DelegateExecution; +import org.operaton.bpm.engine.delegate.BpmnError; +import org.operaton.bpm.engine.delegate.DelegateExecution; import dev.dsf.bpe.v1.ProcessPluginApi; import dev.dsf.bpe.v1.activity.AbstractServiceDelegate; diff --git a/dsf-maven/dsf-maven-plugin/pom.xml b/dsf-maven/dsf-maven-plugin/pom.xml index 4df720c21..ab356cb49 100644 --- a/dsf-maven/dsf-maven-plugin/pom.xml +++ b/dsf-maven/dsf-maven-plugin/pom.xml @@ -53,8 +53,8 @@ - org.camunda.bpm.model - camunda-bpmn-model + org.operaton.bpm.model + operaton-bpmn-model org.springframework diff --git a/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/config/ConfigDocGenerator.java b/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/config/ConfigDocGenerator.java index 334da7a5e..40ef47766 100644 --- a/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/config/ConfigDocGenerator.java +++ b/dsf-maven/dsf-maven-plugin/src/main/java/dev/dsf/maven/config/ConfigDocGenerator.java @@ -28,9 +28,9 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.camunda.bpm.model.bpmn.Bpmn; -import org.camunda.bpm.model.bpmn.instance.BaseElement; -import org.camunda.bpm.model.bpmn.instance.Process; +import org.operaton.bpm.model.bpmn.Bpmn; +import org.operaton.bpm.model.bpmn.instance.BaseElement; +import org.operaton.bpm.model.bpmn.instance.Process; import org.reflections.Reflections; import org.reflections.scanners.Scanners; import org.reflections.util.ClasspathHelper; diff --git a/pom.xml b/pom.xml index e10d5e64a..5a5d133c8 100755 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.2.0 6.2.10 2.20.0 - 7.23.0 + 1.0.0-beta-5 5.1.0 8.4.0 6.5.27 @@ -444,19 +444,19 @@ - org.camunda.bpm - camunda-engine - ${camunda.version} + org.operaton.bpm + operaton-engine + ${operaton.version} - org.camunda.bpm - camunda-engine-spring - ${camunda.version} + org.operaton.bpm + operaton-engine-spring + ${operaton.version} - org.camunda.bpm.model - camunda-bpmn-model - ${camunda.version} + org.operaton.bpm.model + operaton-bpmn-model + ${operaton.version} @@ -471,6 +471,12 @@ 4.3.0 + + org.ow2.asm + asm + 9.8 + + org.apache.maven