Merge remote-tracking branch 'origin/issue/317_Endpoint_Thumbprints'

into develop_2

Author: hhund

.gitignore

@@ -80,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

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/plugin/ProcessPluginImpl.java

@@ -185,13 +185,19 @@ else if (filename.endsWith(XML_SUFFIX))
 		Predicate<Task> hasTaskInputMessageName = t -> t.getInput().stream()
 				.filter(i -> i.getType().getCoding().stream().anyMatch(BpmnMessage::isMessageName)).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.SYSTEM,
 				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()