Update StaticFunctionRegistry

aehrc · Jul 1, 2024 · 46f88a6 · 46f88a6
1 parent 77ec4ec
commit 46f88a6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 171 deletions.
diff --git a/fhirpath/src/main/java/au/csiro/pathling/fhirpath/function/StandardFunctions.java b/fhirpath/src/main/java/au/csiro/pathling/fhirpath/function/StandardFunctions.java
diff --git a/fhirpath/src/main/java/au/csiro/pathling/fhirpath/function/SumFunction.java b/fhirpath/src/main/java/au/csiro/pathling/fhirpath/function/SumFunction.java
diff --git a/fhirpath/src/main/java/au/csiro/pathling/fhirpath/function/UntilFunction.java b/fhirpath/src/main/java/au/csiro/pathling/fhirpath/function/UntilFunction.java
diff --git a/...th/src/main/java/au/csiro/pathling/fhirpath/function/registry/StaticFunctionRegistry.java b/...th/src/main/java/au/csiro/pathling/fhirpath/function/registry/StaticFunctionRegistry.java
@@ -1,12 +1,17 @@
 package au.csiro.pathling.fhirpath.function.registry;
 
+import au.csiro.pathling.fhirpath.function.BooleanLogicFunctions;
 import au.csiro.pathling.fhirpath.function.BoundaryFunctions;
+import au.csiro.pathling.fhirpath.function.ConversionFunctions;
+import au.csiro.pathling.fhirpath.function.ExistenceFunctions;
+import au.csiro.pathling.fhirpath.function.FhirFunctions;
+import au.csiro.pathling.fhirpath.function.FilteringAndProjectionFunctions;
 import au.csiro.pathling.fhirpath.function.JoinKeyFunctions;
 import au.csiro.pathling.fhirpath.function.NamedFunction;
-import au.csiro.pathling.fhirpath.function.StandardFunctions;
-import au.csiro.pathling.fhirpath.function.TerminologyFunctions;
-import au.csiro.pathling.fhirpath.function.UntilFunction;
+import au.csiro.pathling.fhirpath.function.StringFunctions;
+import au.csiro.pathling.fhirpath.function.SubsettingFunctions;
 import au.csiro.pathling.fhirpath.function.WrappedFunction;
+import au.csiro.pathling.terminology.TerminologyFunctions;
 import com.google.common.collect.ImmutableMap.Builder;
 
 /**
@@ -25,11 +30,16 @@ public class StaticFunctionRegistry extends InMemoryFunctionRegistry<NamedFuncti
    */
   public StaticFunctionRegistry() {
     super(new Builder<String, NamedFunction>()
-        .put("until", new UntilFunction())
-        .putAll(WrappedFunction.mapOf(StandardFunctions.class))
+        .putAll(WrappedFunction.mapOf(BooleanLogicFunctions.class))
         .putAll(WrappedFunction.mapOf(BoundaryFunctions.class))
-        .putAll(WrappedFunction.mapOf(TerminologyFunctions.class))
+        .putAll(WrappedFunction.mapOf(ConversionFunctions.class))
+        .putAll(WrappedFunction.mapOf(ExistenceFunctions.class))
+        .putAll(WrappedFunction.mapOf(FhirFunctions.class))
+        .putAll(WrappedFunction.mapOf(FilteringAndProjectionFunctions.class))
         .putAll(WrappedFunction.mapOf(JoinKeyFunctions.class))
+        .putAll(WrappedFunction.mapOf(StringFunctions.class))
+        .putAll(WrappedFunction.mapOf(SubsettingFunctions.class))
+        .putAll(WrappedFunction.mapOf(TerminologyFunctions.class))
         .build());
   }