Merge pull request #13 from medizininformatik-initiative/update-sq-sc…

…hema Update sq schema
medizininformatik-initiative · Sep 29, 2023 · 095aa64 · 095aa64
2 parents d7384f3 + 60a0c3c
commit 095aa64
Show file tree

Hide file tree

Showing 8 changed files with 340 additions and 82 deletions.
diff --git a/docker/aktin-client/.env b/docker/aktin-client/.env
@@ -22,3 +22,4 @@ LOG_LEVEL_FEASIBILITY=FINE
 HARD_RATE_LIMIT_NREQUESTS=2
 HARD_RATE_LIMIT_RESET_MINUTES=1
 OBFUSCATOR_EPSILON=0.28
+CQL_SOCKET_TIMEOUT_MS=60000
diff --git a/docker/aktin-client/sysproc.properties b/docker/aktin-client/sysproc.properties
@@ -21,6 +21,7 @@ process.args=${PROCESS_ARGS}
 plugin.feasibility.cql.fhirbaseurl=${CQL_FHIR_BASE_URL}
 plugin.feasibility.cql.fhiruser=${CQL_FHIR_USER}
 plugin.feasibility.cql.fhirpw=${CQL_FHIR_PW}
+plugin.feasibility.cql.sockettimeout=${CQL_SOCKET_TIMEOUT_MS}
 plugin.feasibility.flare.url=${FLARE_URL}
 plugin.feasibility.flare.user=${FLARE_USER}
 plugin.feasibility.flare.pw=${FLARE_PW}

diff --git a/pom.xml b/pom.xml
@@ -112,6 +112,18 @@
       <version>2.14.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <version>2.14.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>32.1.2-jre</version>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/src/main/java/feasibility/FeasibilityExecutionPlugin.java b/src/main/java/feasibility/FeasibilityExecutionPlugin.java
@@ -48,12 +48,15 @@ protected void loadConfig(Properties properties) throws IOException{
 
 		String fhirUserCql = properties.getProperty("plugin.feasibility.cql.fhiruser");
 		String fhirPwCql = properties.getProperty("plugin.feasibility.cql.fhirpw");
+		int socketTimeout = Integer.valueOf(properties.getProperty("plugin.feasibility.cql.sockettimeout"));
 
 		if(! fhirUserCql.equals("") && ! fhirPwCql.equals("")) {
 			IClientInterceptor authInterceptor = new BasicAuthInterceptor(fhirUserCql, fhirPwCql);
 			genFhirClient.registerInterceptor(authInterceptor);
 		}
 
+		fhirContext.getRestfulClientFactory().setSocketTimeout(socketTimeout);
+
 		this.cqlExecutor = new CqlExecutor(
 				new FhirConnector(fhirContext.newRestfulGenericClient(fhirBaseUrl)),
 				new FhirHelper(fhirContext)

diff --git a/src/main/java/feasibilityValidator/SqValidator.java b/src/main/java/feasibilityValidator/SqValidator.java
@@ -1,6 +1,5 @@
 package feasibilityValidator;
 
-import feasibility.CqlExecutor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;