Merge pull request #250 from srdc/integrate-onfhir-definitions-micros…

…ervices Integrate onfhir definitions microservices
srdc · Nov 18, 2024 · 2621866 · 2621866
2 parents 030aa8e + 1573e6c
commit 2621866
Show file tree

Hide file tree

Showing 75 changed files with 124 additions and 1,623 deletions.
diff --git a/pom.xml b/pom.xml
@@ -118,6 +118,7 @@
         <akka-http.version>10.5.3</akka-http.version>
         <reflections.version>0.10.2</reflections.version>
         <opencsv.version>5.8</opencsv.version>
+        <onfhir-definitions-microservices.version>1.0-SNAPSHOT</onfhir-definitions-microservices.version>
     </properties>
 
     <build>
@@ -480,6 +481,23 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- onFHIR Definitions Microservices -->
+            <dependency>
+                <groupId>io.onfhir</groupId>
+                <artifactId>onfhir-fhirpath-functions</artifactId>
+                <version>${onfhir-definitions-microservices.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.onfhir</groupId>
+                <artifactId>onfhir-resource-definitions</artifactId>
+                <version>${onfhir-definitions-microservices.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.onfhir</groupId>
+                <artifactId>onfhir-definition-commons</artifactId>
+                <version>${onfhir-definitions-microservices.version}</version>
+            </dependency>
+
             <!-- Testkit for Akka Http-->
             <dependency>
                 <groupId>com.typesafe.akka</groupId>

diff --git a/tofhir-common/pom.xml b/tofhir-common/pom.xml
@@ -64,5 +64,10 @@
             <groupId>io.onfhir</groupId>
             <artifactId>onfhir-path_${scala.binary.version}</artifactId>
         </dependency>
+        <!-- onFHIR Definitions Common-->
+        <dependency>
+            <groupId>io.onfhir</groupId>
+            <artifactId>onfhir-definition-commons</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/tofhir-common/src/main/scala/io/tofhir/common/model/Json4sSupport.scala b/tofhir-common/src/main/scala/io/tofhir/common/model/Json4sSupport.scala
diff --git a/tofhir-common/src/main/scala/io/tofhir/common/model/JsonFormats.scala b/tofhir-common/src/main/scala/io/tofhir/common/model/JsonFormats.scala
diff --git a/tofhir-common/src/main/scala/io/tofhir/common/model/SchemaDefinition.scala b/tofhir-common/src/main/scala/io/tofhir/common/model/SchemaDefinition.scala
diff --git a/tofhir-common/src/main/scala/io/tofhir/common/model/SimpleStructureDefinition.scala b/tofhir-common/src/main/scala/io/tofhir/common/model/SimpleStructureDefinition.scala
diff --git a/tofhir-common/src/main/scala/io/tofhir/common/util/HashUtil.scala b/tofhir-common/src/main/scala/io/tofhir/common/util/HashUtil.scala
diff --git a/tofhir-common/src/main/scala/io/tofhir/common/util/JavaDateTimeSerializers.scala b/tofhir-common/src/main/scala/io/tofhir/common/util/JavaDateTimeSerializers.scala
diff --git a/tofhir-common/src/main/scala/io/tofhir/common/util/SchemaUtil.scala b/tofhir-common/src/main/scala/io/tofhir/common/util/SchemaUtil.scala
@@ -1,7 +1,7 @@
 package io.tofhir.common.util
 
 import io.onfhir.api.Resource
-import io.tofhir.common.model.{SchemaDefinition, SimpleStructureDefinition}
+import io.onfhir.definitions.common.model.{SchemaDefinition, SimpleStructureDefinition}
 import org.json4s.JArray
 import org.json4s.JsonDSL._
 

diff --git a/tofhir-engine/src/main/scala/io/tofhir/engine/cli/command/ExtractRedCapSchemas.scala b/tofhir-engine/src/main/scala/io/tofhir/engine/cli/command/ExtractRedCapSchemas.scala
@@ -1,7 +1,7 @@
 package io.tofhir.engine.cli.command
 
 import io.onfhir.api.Resource
-import io.tofhir.common.model.Json4sSupport.formats
+import io.onfhir.definitions.common.model.Json4sSupport.formats
 import io.tofhir.engine.config.ToFhirConfig
 import io.tofhir.engine.util.redcap.RedCapUtil
 import io.tofhir.engine.util.{CsvUtil, FileUtils}

diff --git a/tofhir-engine/src/main/scala/io/tofhir/engine/data/read/FhirServerDataSourceReader.scala b/tofhir-engine/src/main/scala/io/tofhir/engine/data/read/FhirServerDataSourceReader.scala
@@ -1,5 +1,6 @@
 package io.tofhir.engine.data.read
 
+import io.onfhir.client.model.{BasicAuthenticationSettings, BearerTokenAuthorizationSettings, FixedTokenAuthenticationSettings}
 import io.onfhir.spark.reader.FhirApiReader.OPTIONS
 import io.tofhir.engine.model._
 import org.apache.spark.sql.types.StructType

diff --git a/tofhir-engine/src/main/scala/io/tofhir/engine/data/write/FhirRepositoryWriter.scala b/tofhir-engine/src/main/scala/io/tofhir/engine/data/write/FhirRepositoryWriter.scala
@@ -7,7 +7,7 @@ import io.onfhir.api.client.{FHIRTransactionBatchBundle, FhirBatchTransactionReq
 import io.onfhir.api.model.OutcomeIssue
 import io.onfhir.api.util.FHIRUtil
 import io.onfhir.client.OnFhirNetworkClient
-import io.tofhir.common.model.Json4sSupport.formats
+import io.onfhir.definitions.common.model.Json4sSupport.formats
 import io.tofhir.engine.Execution
 import io.tofhir.engine.config.ToFhirConfig
 import io.tofhir.engine.model._

diff --git a/tofhir-engine/src/main/scala/io/tofhir/engine/mapping/FhirMappingService.scala b/tofhir-engine/src/main/scala/io/tofhir/engine/mapping/FhirMappingService.scala
@@ -4,7 +4,7 @@ import io.onfhir.api.Resource
 import io.onfhir.expression.{FhirExpression, FhirExpressionException}
 import io.onfhir.path.{FhirPathEvaluator, IFhirPathFunctionLibraryFactory}
 import io.onfhir.template.FhirTemplateExpressionHandler
-import io.tofhir.common.model.Json4sSupport.formats
+import io.onfhir.definitions.common.model.Json4sSupport.formats
 import io.tofhir.engine.mapping.fhirPath.FhirMappingFunctionsFactory
 import io.tofhir.engine.mapping.service.IntegratedServiceFactory
 import io.tofhir.engine.model._