diff --git a/codex-process-data-transfer/pom.xml b/codex-process-data-transfer/pom.xml
index 85631dd3..b99561df 100644
--- a/codex-process-data-transfer/pom.xml
+++ b/codex-process-data-transfer/pom.xml
@@ -8,7 +8,7 @@
de.netzwerk-universitaetsmedizin.codex
codex-processes-ap1
- 0.2.1
+ 0.2.2
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java
index 209766ba..6997c3c4 100644
--- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java
+++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/DataTransferProcessPluginDefinition.java
@@ -20,7 +20,7 @@
public class DataTransferProcessPluginDefinition implements ProcessPluginDefinition
{
- public static final String VERSION = "0.2.1";
+ public static final String VERSION = "0.2.2";
@Override
public String getName()
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/ApacheRestfulClientFactoryWithTlsConfig.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/ApacheRestfulClientFactoryWithTlsConfig.java
index 61d9ea27..ae682c4f 100644
--- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/ApacheRestfulClientFactoryWithTlsConfig.java
+++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/ApacheRestfulClientFactoryWithTlsConfig.java
@@ -29,6 +29,8 @@
import org.apache.http.impl.client.ProxyAuthenticationStrategy;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.ssl.SSLContexts;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.rest.api.RequestTypeEnum;
@@ -39,6 +41,8 @@
public class ApacheRestfulClientFactoryWithTlsConfig extends RestfulClientFactory
{
+ private static final Logger logger = LoggerFactory.getLogger(ApacheRestfulClientFactoryWithTlsConfig.class);
+
private HttpClient myHttpClient;
private HttpHost myProxy;
@@ -59,6 +63,8 @@ public ApacheRestfulClientFactoryWithTlsConfig(FhirContext fhirContext, KeyStore
@Override
protected synchronized ApacheHttpClient getHttpClient(String theServerBase)
{
+ logger.info("Returning new ApacheHttpClient for ServerNase {}", theServerBase);
+
return new ApacheHttpClient(getNativeHttpClient(), new StringBuilder(theServerBase), null, null, null, null);
}
@@ -91,7 +97,7 @@ public HttpClient getNativeHttpClient()
.setProxy(myProxy).build();
HttpClientBuilder builder = HttpClients.custom().setConnectionManager(connectionManager)
- .setDefaultRequestConfig(defaultRequestConfig).disableCookieManagement();
+ .setSSLContext(sslContext).setDefaultRequestConfig(defaultRequestConfig).disableCookieManagement();
if (myProxy != null && StringUtils.isNotBlank(getProxyUsername())
&& StringUtils.isNotBlank(getProxyPassword()))
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FhirClientFactory.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FhirClientFactory.java
index 3f44dcf1..c9fcc4cd 100644
--- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FhirClientFactory.java
+++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FhirClientFactory.java
@@ -3,7 +3,6 @@
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Date;
-import java.util.List;
import java.util.UUID;
import java.util.stream.Stream;
@@ -70,16 +69,7 @@ public void storeBundle(Bundle bundle)
public PseudonymList getPseudonymsWithNewData(DateWithPrecision exportFrom, Date exportTo)
{
logger.warn("Returning demo pseudonyms for {}", localIdentifierValue);
-
- List pseudonyms;
- if ("charite-tmptst.de".equals(localIdentifierValue))
- pseudonyms = Arrays.asList("dic_berlin/dic_CT6E6", "dic_berlin/dic_9LDA5");
- else if ("klinikum.uni-heidelberg.de".equals(localIdentifierValue))
- pseudonyms = Arrays.asList("dic_heidelberg/dic_3YKQW", "dic_heidelberg/dic_RPRM3");
- else
- pseudonyms = Arrays.asList("foo/bar", "baz/qux");
-
- return new PseudonymList(pseudonyms);
+ return new PseudonymList(Arrays.asList("dic_foo/bar", "dic_foo/baz"));
}
@Override
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClient.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClient.java
index 8c9398bf..20734c39 100644
--- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClient.java
+++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClient.java
@@ -10,4 +10,6 @@ public interface FttpClient
* @return
*/
Optional getCrrPseudonym(String dicSourceAndPseudonym);
+
+ void testConnection();
}
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java
index 45ad69d7..ee36cfdf 100644
--- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java
+++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientFactory.java
@@ -22,14 +22,16 @@
import org.apache.commons.codec.binary.Hex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
-import ca.uhn.fhir.context.FhirContext;
import de.rwh.utils.crypto.CertificateHelper;
import de.rwh.utils.crypto.io.CertificateReader;
import de.rwh.utils.crypto.io.PemIo;
-public class FttpClientFactory
+public class FttpClientFactory implements InitializingBean
{
+ private static final Logger logger = LoggerFactory.getLogger(FttpClientFactory.FttpClientStub.class);
+
private static final class FttpClientStub implements FttpClient
{
private static final Logger logger = LoggerFactory.getLogger(FttpClientStub.class);
@@ -59,9 +61,14 @@ public Optional getCrrPseudonym(String dicSourceAndPseudonym)
return Optional.empty();
}
}
+
+ @Override
+ public void testConnection()
+ {
+ logger.warn("Stub implementation, no connection test performed");
+ }
}
- private final FhirContext fhirContext;
private final Path trustStorePath;
private final Path certificatePath;
private final Path privateKeyPath;
@@ -70,14 +77,9 @@ public Optional getCrrPseudonym(String dicSourceAndPseudonym)
private final String fttpStudy;
private final String fttpTarget;
- public FttpClientFactory(FhirContext fhirContext, Path trustStorePath, Path certificatePath, Path privateKeyPath,
- String fttpServerBase, String fttpApiKey, String fttpStudy, String fttpTarget)
+ public FttpClientFactory(Path trustStorePath, Path certificatePath, Path privateKeyPath, String fttpServerBase,
+ String fttpApiKey, String fttpStudy, String fttpTarget)
{
- if (fhirContext != null)
- this.fhirContext = fhirContext;
- else
- this.fhirContext = FhirContext.forR4();
-
this.trustStorePath = trustStorePath;
this.certificatePath = certificatePath;
this.privateKeyPath = privateKeyPath;
@@ -88,6 +90,23 @@ public FttpClientFactory(FhirContext fhirContext, Path trustStorePath, Path cert
this.fttpTarget = fttpTarget;
}
+ @Override
+ public void afterPropertiesSet() throws Exception
+ {
+ try
+ {
+ logger.info(
+ "Testing connection to fTTP with {trustStorePath: {}, certificatePath: {}, privateKeyPath: {}, fttpServerBase: {}, fttpApiKey: {}, fttpStudy: {}, fttpTarget: {}}",
+ trustStorePath, certificatePath, privateKeyPath, fttpServerBase, fttpApiKey, fttpStudy, fttpTarget);
+
+ getFttpClient().testConnection();
+ }
+ catch (Exception e)
+ {
+ logger.error("Error while testing connection to fTTP", e);
+ }
+ }
+
public FttpClient getFttpClient()
{
if (configured())
@@ -105,12 +124,15 @@ private boolean configured()
protected FttpClient createFttpClient()
{
+ logger.debug("Reading trust-store from {}", trustStorePath.toString());
KeyStore trustStore = readTrustStore(trustStorePath);
char[] keyStorePassword = UUID.randomUUID().toString().toCharArray();
+
+ logger.debug("Creating key-store from {} and {}", certificatePath.toString(), privateKeyPath.toString());
KeyStore keyStore = readKeyStore(certificatePath, privateKeyPath, keyStorePassword);
- return new FttpClientImpl(fhirContext, trustStore, keyStore, keyStorePassword, fttpServerBase, fttpApiKey,
- fttpStudy, fttpTarget);
+ return new FttpClientImpl(trustStore, keyStore, keyStorePassword, fttpServerBase, fttpApiKey, fttpStudy,
+ fttpTarget);
}
private KeyStore readTrustStore(Path trustPath)
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientImpl.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientImpl.java
index da84ff1f..4b8823e1 100644
--- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientImpl.java
+++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/FttpClientImpl.java
@@ -8,6 +8,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.hl7.fhir.r4.model.CapabilityStatement;
import org.hl7.fhir.r4.model.Parameters;
import org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent;
import org.hl7.fhir.r4.model.StringType;
@@ -21,6 +22,7 @@
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.client.api.IRestfulClientFactory;
import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;
+import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
public class FttpClientImpl implements FttpClient, InitializingBean
{
@@ -34,11 +36,10 @@ public class FttpClientImpl implements FttpClient, InitializingBean
private final String fttpTarget;
private final String fttpApiKey;
- public FttpClientImpl(FhirContext fhirContext, KeyStore trustStore, KeyStore keyStore, char[] keyStorePassword,
- String fttpServerBase, String fttpApiKey, String fttpStudy, String fttpTarget)
+ public FttpClientImpl(KeyStore trustStore, KeyStore keyStore, char[] keyStorePassword, String fttpServerBase,
+ String fttpApiKey, String fttpStudy, String fttpTarget)
{
- clientFactory = createClientFactory(fhirContext, trustStore, keyStore, keyStorePassword);
- clientFactory.setServerValidationMode(ServerValidationModeEnum.NEVER);
+ clientFactory = createClientFactory(trustStore, keyStore, keyStorePassword);
this.fttpServerBase = fttpServerBase;
this.fttpApiKey = fttpApiKey;
@@ -46,15 +47,19 @@ public FttpClientImpl(FhirContext fhirContext, KeyStore trustStore, KeyStore key
this.fttpTarget = fttpTarget;
}
- protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(FhirContext fhirContext, KeyStore trustStore,
- KeyStore keyStore, char[] keyStorePassword)
+ protected ApacheRestfulClientFactoryWithTlsConfig createClientFactory(KeyStore trustStore, KeyStore keyStore,
+ char[] keyStorePassword)
{
- Objects.requireNonNull(fhirContext, "fhirContext");
Objects.requireNonNull(trustStore, "trustStore");
Objects.requireNonNull(keyStore, "keyStore");
Objects.requireNonNull(keyStorePassword, "keyStorePassword");
- return new ApacheRestfulClientFactoryWithTlsConfig(fhirContext, trustStore, keyStore, keyStorePassword);
+ FhirContext fhirContext = FhirContext.forR4();
+ ApacheRestfulClientFactoryWithTlsConfig hapiClientFactory = new ApacheRestfulClientFactoryWithTlsConfig(
+ fhirContext, trustStore, keyStore, keyStorePassword);
+ hapiClientFactory.setServerValidationMode(ServerValidationModeEnum.NEVER);
+ fhirContext.setRestfulClientFactory(hapiClientFactory);
+ return hapiClientFactory;
}
@Override
@@ -76,6 +81,7 @@ public Optional getCrrPseudonym(String dicSourceAndPseudonym)
try
{
IGenericClient client = clientFactory.newGenericClient(fttpServerBase);
+ client.registerInterceptor(new LoggingInterceptor());
Parameters parameters = client.operation().onServer().named("request-psn-workflow")
.withParameters(createParameters(dicSourceAndPseudonym)).accept(Constants.CT_FHIR_XML_NEW)
@@ -125,4 +131,14 @@ protected Optional getPseudonym(Parameters params)
return Optional.empty();
}
+
+ @Override
+ public void testConnection()
+ {
+ IGenericClient client = clientFactory.newGenericClient(fttpServerBase);
+ CapabilityStatement statement = client.capabilities().ofType(CapabilityStatement.class).execute();
+
+ logger.info("Connection test OK {} - {}", statement.getSoftware().getName(),
+ statement.getSoftware().getVersion());
+ }
}
diff --git a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/TransferDataConfig.java b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/TransferDataConfig.java
index b6d0f3b9..a6afadf3 100644
--- a/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/TransferDataConfig.java
+++ b/codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/TransferDataConfig.java
@@ -134,8 +134,8 @@ public FttpClientFactory fttpClientFactory()
Path certificatePath = checkExists(fttpCertificate);
Path privateKeyPath = checkExists(fttpPrivateKey);
- return new FttpClientFactory(fhirContext, trustStorePath, certificatePath, privateKeyPath, fttpServerBase,
- fttpApiKey, fttpStudy, fttpTarget);
+ return new FttpClientFactory(trustStorePath, certificatePath, privateKeyPath, fttpServerBase, fttpApiKey,
+ fttpStudy, fttpTarget);
}
@Bean
diff --git a/codex-process-data-transfer/src/main/resources/bpe/receive.bpmn b/codex-process-data-transfer/src/main/resources/bpe/receive.bpmn
index 61b02c94..189a6e57 100644
--- a/codex-process-data-transfer/src/main/resources/bpe/receive.bpmn
+++ b/codex-process-data-transfer/src/main/resources/bpe/receive.bpmn
@@ -1,6 +1,6 @@
-
+
Flow_1gyqorb
diff --git a/codex-process-data-transfer/src/main/resources/bpe/send.bpmn b/codex-process-data-transfer/src/main/resources/bpe/send.bpmn
index 96d2d2d9..65308071 100644
--- a/codex-process-data-transfer/src/main/resources/bpe/send.bpmn
+++ b/codex-process-data-transfer/src/main/resources/bpe/send.bpmn
@@ -1,6 +1,6 @@
-
+
Flow_1km61ly
@@ -22,7 +22,7 @@
dataTranslate
- 0.2.1
+ 0.2.2
startDataTranslate
http://netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-translate
diff --git a/codex-process-data-transfer/src/main/resources/bpe/translate.bpmn b/codex-process-data-transfer/src/main/resources/bpe/translate.bpmn
index c11900a0..dec8a90c 100644
--- a/codex-process-data-transfer/src/main/resources/bpe/translate.bpmn
+++ b/codex-process-data-transfer/src/main/resources/bpe/translate.bpmn
@@ -1,6 +1,6 @@
-
+
Flow_185r1m5
@@ -25,7 +25,7 @@
dataReceive
- 0.2.1
+ 0.2.2
startDataReceive
http://netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-receive
diff --git a/codex-process-data-transfer/src/main/resources/bpe/trigger.bpmn b/codex-process-data-transfer/src/main/resources/bpe/trigger.bpmn
index 58c95b86..7f35d544 100644
--- a/codex-process-data-transfer/src/main/resources/bpe/trigger.bpmn
+++ b/codex-process-data-transfer/src/main/resources/bpe/trigger.bpmn
@@ -1,6 +1,6 @@
-
+
Flow_0jy9ipp
Flow_015mo33
@@ -9,7 +9,7 @@
dataSend
- 0.2.1
+ 0.2.2
startDataSend
http://netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/task-start-data-send
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-receive.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-receive.xml
index 382c73fd..08a178db 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-receive.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-receive.xml
@@ -53,7 +53,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-send.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-send.xml
index cd86c222..a1eff9ac 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-send.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-send.xml
@@ -53,7 +53,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-translate.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-translate.xml
index 137e5114..909b7d91 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-translate.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-translate.xml
@@ -53,7 +53,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-trigger.xml b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-trigger.xml
index ca58cbc5..62ad696d 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-trigger.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/ActivityDefinition/num-codex-data-trigger.xml
@@ -90,7 +90,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/CodeSystem/num-codex-data-transfer.xml b/codex-process-data-transfer/src/main/resources/fhir/CodeSystem/num-codex-data-transfer.xml
index 6fbc33b6..b90a1cf5 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/CodeSystem/num-codex-data-transfer.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/CodeSystem/num-codex-data-transfer.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-crr-pseudonym-identifier.xml b/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-crr-pseudonym-identifier.xml
index 22e28f2b..c3931b8a 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-crr-pseudonym-identifier.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-crr-pseudonym-identifier.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-dic-pseudonym-identifier.xml b/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-dic-pseudonym-identifier.xml
index e3f2e12a..63279c4c 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-dic-pseudonym-identifier.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/NamingSystem/num-codex-dic-pseudonym-identifier.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml
index 81985c7c..d7ac0d48 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-receive.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml
index be16cf4c..9888e694 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-send.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml
index 1e55745d..373711d4 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-translate.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml
index db6d87fb..6a1f058c 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-start-data-trigger.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-stop-data-trigger.xml b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-stop-data-trigger.xml
index 2b9645e6..1d67803e 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-stop-data-trigger.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/StructureDefinition/num-codex-task-stop-data-trigger.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/codex-process-data-transfer/src/main/resources/fhir/ValueSet/num-codex-data-transfer.xml b/codex-process-data-transfer/src/main/resources/fhir/ValueSet/num-codex-data-transfer.xml
index c1225377..608887c3 100644
--- a/codex-process-data-transfer/src/main/resources/fhir/ValueSet/num-codex-data-transfer.xml
+++ b/codex-process-data-transfer/src/main/resources/fhir/ValueSet/num-codex-data-transfer.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSend.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSend.xml
index 7b1d5d45..8323f5e5 100644
--- a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSend.xml
+++ b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataSend.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -56,7 +56,7 @@
-
+
\ No newline at end of file
diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataTrigger.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataTrigger.xml
index f06195bf..b12a4c9d 100644
--- a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataTrigger.xml
+++ b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStartDataTrigger.xml
@@ -2,10 +2,10 @@
-
+
-
+
@@ -50,6 +50,6 @@
-
+
-->
\ No newline at end of file
diff --git a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStopDataTrigger.xml b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStopDataTrigger.xml
index c182548a..5b867333 100644
--- a/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStopDataTrigger.xml
+++ b/codex-process-data-transfer/src/test/resources/fhir/Task/TaskStopDataTrigger.xml
@@ -2,10 +2,10 @@
-
+
-
+
diff --git a/codex-process-data-transfer/src/test/resources/log4j2.xml b/codex-process-data-transfer/src/test/resources/log4j2.xml
index 7099ff83..736faa29 100644
--- a/codex-process-data-transfer/src/test/resources/log4j2.xml
+++ b/codex-process-data-transfer/src/test/resources/log4j2.xml
@@ -51,6 +51,7 @@
+