Merge remote-tracking branch 'origin/develop_2' into

issue/301_Upgrade_Dependencies

Author: hhund

.github/workflows/codeql.yml

@@ -1,10 +1,12 @@
-name: Java 21 CodeQL
+name: DSF 2.x CodeQL
 
 on:
   push:
-    branches: develop_2
+    branches: [ "develop_2", "hotfix/2*", "release/2*" ]
   pull_request:
-    branches: develop_2
+    branches: [ "develop_2", "hotfix/2*", "release/2*" ]
+  schedule:
+    - cron: '11 15 * * 0' # Sundays, 15:11
 
 jobs:
   analyze:
@@ -39,7 +41,7 @@ jobs:
 
     - name: Compile with Maven
       if: ${{ matrix.language == 'java-kotlin' }}
-      run: mvn --batch-mode --fail-at-end --threads 1C -Dmaven.javadoc.skip=true -Dimpsort.skip=true -Dformatter.skip=true -Dgpg.skip -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests clean package
+      run: mvn --batch-mode --fail-at-end --threads 1C -Dimpsort.skip=true -Dformatter.skip=true -Denforcer.skip -Dmaven.buildNumber.skip=true -Dexec.skip=true -DskipTests -DskipShadePlugin=true -P!generate-source-and-javadoc-jars clean package
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3

.github/workflows/maven-build.yml

@@ -1,6 +1,6 @@
-name: Java 21 CI Build with Maven
+name: DSF 2.x Java CI Build with Maven
 
-on: 
+on:
   pull_request:
     branches: develop_2
 
@@ -18,4 +18,4 @@ jobs:
         java-version: 21
         cache: 'maven'
     - name: Build with Maven
-      run: mvn --batch-mode --fail-at-end -DforkCount=2 -Dgpg.skip clean verify
+      run: mvn --batch-mode --fail-at-end -DforkCount=2 clean verify

.github/workflows/maven-publish.yml

@@ -1,4 +1,4 @@
-name: Java 21 CI Publish with Maven
+name: DSF 2.x Java CI Publish with Maven
 
 on:
   pull_request:
@@ -25,4 +25,4 @@ jobs:
       - name: Publish with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn --batch-mode --fail-at-end -DforkCount=2 -Dgpg.skip clean deploy
+        run: mvn --batch-mode --fail-at-end -DforkCount=2 clean deploy

.gitignore

@@ -9,9 +9,15 @@
 
 **/*.iml
 
+## dev setup cert folder and files, folder and files generated by dsf-maven-plugin 
+cert
+cert/**
+
 ###
 # dsf-bpe ignores
 ###
+dsf-bpe/dsf-bpe-server-jetty/cert/*.crt
+dsf-bpe/dsf-bpe-server-jetty/cert/*.key
 dsf-bpe/dsf-bpe-server-jetty/conf/config.properties
 dsf-bpe/dsf-bpe-server-jetty/docker/api/v1/*.jar
 dsf-bpe/dsf-bpe-server-jetty/docker/api/v2/*.jar
@@ -74,10 +80,10 @@ dsf-docker-test-setup-3dic-ttp/secrets/dic2.key
 dsf-docker-test-setup-3dic-ttp/secrets/dic3.crt
 dsf-docker-test-setup-3dic-ttp/secrets/dic3.key
 dsf-docker-test-setup-3dic-ttp/secrets/issuing_ca.crt
-dsf-docker-test-setup-3dic-ttp/secrets/keycloak.crt
+dsf-docker-test-setup-3dic-ttp/secrets/keycloak.chain.crt
 dsf-docker-test-setup-3dic-ttp/secrets/keycloak.key.plain
 dsf-docker-test-setup-3dic-ttp/secrets/keycloak_trust_store.jks
-dsf-docker-test-setup-3dic-ttp/secrets/localhost.crt
+dsf-docker-test-setup-3dic-ttp/secrets/localhost.chain.crt
 dsf-docker-test-setup-3dic-ttp/secrets/localhost.key.plain
 dsf-docker-test-setup-3dic-ttp/secrets/root_ca.crt
 dsf-docker-test-setup-3dic-ttp/secrets/ttp.crt
@@ -88,6 +94,8 @@ dsf-docker-test-setup-3dic-ttp/docker-compose.override.yml
 ###
 # dsf-fhir ignores
 ###
+dsf-fhir/dsf-fhir-server-jetty/cert/*.crt
+dsf-fhir/dsf-fhir-server-jetty/cert/*.key
 dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
 dsf-fhir/dsf-fhir-server-jetty/conf/config.properties
 dsf-fhir/dsf-fhir-server-jetty/docker/ca/*.pem

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/plugin/ProcessPluginImpl.java

@@ -163,13 +163,19 @@ else if (filename.endsWith(XML_SUFFIX))
 						&& BpmnMessage.Codes.MESSAGE_NAME.equals(c.getCode())))
 				.count() == 1;
 
+		Function<StructureDefinition, Optional<String>> getStructureDefinitionBaseDefinition = s -> s
+				.hasBaseDefinitionElement() && s.getBaseDefinitionElement().hasValue()
+						? Optional.of(s.getBaseDefinitionElement().getValue())
+						: Optional.empty();
+
 		return new ProcessPluginFhirConfig<>(ActivityDefinition.class, CodeSystem.class, Library.class, Measure.class,
 				NamingSystem.class, Questionnaire.class, StructureDefinition.class, Task.class, ValueSet.class,
 				OrganizationIdentifier.SID, TaskIdentifier.SID, TaskStatus.DRAFT.toCode(), BpmnMessage.URL,
 				BpmnMessage.Codes.MESSAGE_NAME, parseResource, encodeResource, getResourceName, hasMetadataResourceUrl,
 				hasMetadataResourceVersion, getMetadataResourceVersion, getActivityDefinitionUrl, NamingSystem::hasName,
 				getTaskInstantiatesCanonical, getTaskIdentifierValue, isTaskStatusDraft, getRequester, getRecipient,
-				Task::hasInput, hasTaskInputMessageName, Task::hasOutput);
+				Task::hasInput, hasTaskInputMessageName, Task::hasOutput, getStructureDefinitionBaseDefinition,
+				StructureDefinition::setBaseDefinition);
 	}
 
 	private IParser newXmlParser()

dsf-bpe/dsf-bpe-process-api-v1-impl/src/test/java/dev/dsf/bpe/v1/plugin/ProcessPluginImplTest.java

@@ -316,7 +316,7 @@ public void testInitializeAndValidateResources() throws Exception
 		List<BpmnFileAndModel> models = plugin.getProcessModels();
 		assertEquals(1, models.size());
 		BpmnFileAndModel bpmnFileAndModel = models.get(0);
-		BpmnModelInstance model = bpmnFileAndModel.getModel();
+		BpmnModelInstance model = bpmnFileAndModel.model();
 		assertNotNull(model);
 
 		Collection<Process> processes = model.getModelElementsByType(Process.class);

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractMessageDelegate.java

@@ -1,15 +1,18 @@
 package dev.dsf.bpe.v2.activity;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import dev.dsf.bpe.v2.ProcessPluginApi;
 import dev.dsf.bpe.v2.activity.values.SendTaskValues;
 
 public class AbstractMessageDelegate<D> extends AbstractProcessPluginDelegate<D>
 {
 	protected final SendTaskValues sendTaskValues;
 
-	public AbstractMessageDelegate(ProcessPluginApi api, D delegate, SendTaskValues sendTaskValues)
+	public AbstractMessageDelegate(ProcessPluginApi api, ObjectMapper objectMapper, D delegate,
+			SendTaskValues sendTaskValues)
 	{
-		super(api, delegate);
+		super(api, objectMapper, delegate);
 
 		this.sendTaskValues = sendTaskValues;
 	}

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/AbstractProcessPluginDelegate.java

@@ -2,16 +2,29 @@
 
 import java.util.Objects;
 
+import org.camunda.bpm.engine.delegate.DelegateExecution;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import dev.dsf.bpe.v2.ProcessPluginApi;
+import dev.dsf.bpe.v2.variables.Variables;
+import dev.dsf.bpe.v2.variables.VariablesImpl;
 
 public abstract class AbstractProcessPluginDelegate<D>
 {
 	protected final ProcessPluginApi api;
+	protected final ObjectMapper objectMapper;
 	protected final D delegate;
 
-	public AbstractProcessPluginDelegate(ProcessPluginApi api, D delegate)
+	public AbstractProcessPluginDelegate(ProcessPluginApi api, ObjectMapper objectMapper, D delegate)
 	{
 		this.api = Objects.requireNonNull(api, "api");
+		this.objectMapper = Objects.requireNonNull(objectMapper, "objectMapper");
 		this.delegate = Objects.requireNonNull(delegate, "delegate");
 	}
+
+	protected Variables createVariables(DelegateExecution execution)
+	{
+		return new VariablesImpl(execution, objectMapper);
+	}
 }

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/ExecutionListenerDelegate.java

@@ -2,22 +2,24 @@
 
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import dev.dsf.bpe.v2.ProcessPluginApi;
 import dev.dsf.bpe.v2.error.ExecutionListenerErrorHandler;
-import dev.dsf.bpe.v2.variables.VariablesImpl;
+import dev.dsf.bpe.v2.variables.Variables;
 
 public class ExecutionListenerDelegate extends AbstractProcessPluginDelegate<ExecutionListener>
 		implements org.camunda.bpm.engine.delegate.ExecutionListener
 {
-	public ExecutionListenerDelegate(ProcessPluginApi api, ExecutionListener delegate)
+	public ExecutionListenerDelegate(ProcessPluginApi api, ObjectMapper objectMapper, ExecutionListener delegate)
 	{
-		super(api, delegate);
+		super(api, objectMapper, delegate);
 	}
 
 	@Override
 	public void notify(DelegateExecution execution) throws Exception
 	{
-		final VariablesImpl variables = new VariablesImpl(execution);
+		Variables variables = createVariables(execution);
 
 		try
 		{

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/activity/MessageEndEventDelegate.java

@@ -3,22 +3,25 @@
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import dev.dsf.bpe.v2.ProcessPluginApi;
 import dev.dsf.bpe.v2.activity.values.SendTaskValues;
 import dev.dsf.bpe.v2.error.MessageEndEventErrorHandler;
-import dev.dsf.bpe.v2.variables.VariablesImpl;
+import dev.dsf.bpe.v2.variables.Variables;
 
 public class MessageEndEventDelegate extends AbstractMessageDelegate<MessageEndEvent> implements JavaDelegate
 {
-	public MessageEndEventDelegate(ProcessPluginApi api, MessageEndEvent delegate, SendTaskValues sendTask)
+	public MessageEndEventDelegate(ProcessPluginApi api, ObjectMapper objectMapper, MessageEndEvent delegate,
+			SendTaskValues sendTask)
 	{
-		super(api, delegate, sendTask);
+		super(api, objectMapper, delegate, sendTask);
 	}
 
 	@Override
 	public void execute(DelegateExecution execution) throws Exception
 	{
-		final VariablesImpl variables = new VariablesImpl(execution);
+		Variables variables = createVariables(execution);
 
 		try
 		{