Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SQL on FHIR view runner #1775

Open
wants to merge 366 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 167 commits
Commits
Show all changes
366 commits
Select commit Hold shift + click to select a range
0957184
Terminology: Reimplementing 'property()' with columnar approach.
piotrszul Oct 24, 2023
ca4fb0c
Refactoring: Implementing FHIRPahts for boolean, Quantity and Coding …
piotrszul Oct 24, 2023
080f7e6
Adding impure results to Extract view filtrs.
piotrszul Oct 24, 2023
670cada
Implementing support for ExtractResultType in ExtractView.
piotrszul Oct 25, 2023
22937a8
Fixing small issues in extract.
piotrszul Nov 9, 2023
14004ec
Refactoring: Basing collections on ColumnCtx.
piotrszul Nov 9, 2023
e63aa62
Fixing issues after rebase.
piotrszul Dec 8, 2023
fcaf04e
WIP: Basic reverse resolve implementation
piotrszul Dec 11, 2023
1d36d32
Refactoring: Removing type parametrization from FhirPath
piotrszul Dec 12, 2023
5aa4cd3
Implemented reverseResolve join resolver.
piotrszul Dec 12, 2023
2b05222
Implemented basic dependency resolver.
piotrszul Dec 12, 2023
0f77864
Implemented basic reverse join resolver aware of column dependencies …
piotrszul Dec 14, 2023
3214cf0
Refactoring: making DataSource the dependence of FhirPathExecutor.
piotrszul Dec 14, 2023
5427406
Refactoring: Reimplemented ParserTest with the new approach.
piotrszul Dec 14, 2023
455e156
Fixing issues with ParserTest.
piotrszul Dec 14, 2023
2a4f781
Adding resolve join() root.
piotrszul Dec 18, 2023
20058fd
Creating versions of FhirpathExecutor for single and muliple resources.
piotrszul Jan 4, 2024
a9c8312
Reimplementing View execution on FHIRpath executor.
piotrszul Jan 6, 2024
1aeab87
Fixing small issues to make the Compliance view tests pass.
piotrszul Jan 6, 2024
6d8b470
Updating the SQLViews to the most recent specification including the …
piotrszul Jan 9, 2024
d8743ff
Making the SQL View test insensitive to the order of rows in the result.
piotrszul Jan 9, 2024
8b40550
Adding a python example for a FHIR View API.
piotrszul Jan 9, 2024
8ac6862
Merge branch 'main' into issue/1759
johngrimes Jan 11, 2024
d9095c9
Update version to 6.5.0-SNAPSHOT
johngrimes Jan 11, 2024
fa6c5b9
Adding support for the empty collection literal '{}'
piotrszul Jan 11, 2024
ca46b55
Improving the implementation of 'join()' to accept a singular string …
piotrszul Jan 11, 2024
09532ed
Update resourceKey and referenceKey function tests
johngrimes Jan 15, 2024
3781fd6
Update where function and element tests
johngrimes Jan 15, 2024
454bfa5
Add ability to disable view test
johngrimes Jan 15, 2024
de0e8ca
Update union test
johngrimes Jan 15, 2024
42ad5d4
Update unnesting tests
johngrimes Jan 15, 2024
cafd640
Add constant test
johngrimes Jan 15, 2024
ffd3812
Update sql-on-fhir to point to aehrc union branch
johngrimes Jan 19, 2024
81ea7c7
Delete redundant implementation-specific union test
johngrimes Jan 19, 2024
fb1fef0
Initial version of the StructProduct operation.
piotrszul Jan 20, 2024
e257be7
Adding a function to generate optional from lists (empty optional for…
piotrszul Jan 23, 2024
478c1f6
WIP: Adding new column based view implementation.
piotrszul Jan 23, 2024
52fc1b8
Updated pointer to sql-on-fhir module to
piotrszul Jan 23, 2024
44c4e9c
Implemented eval() for StructProduct expression.
piotrszul Jan 25, 2024
7d04578
Improve type specifier namespace and search semantics
johngrimes Feb 3, 2024
f95cd00
Move static inner classes out of MixedCollection
johngrimes Feb 3, 2024
804a7a5
Move MixedCollection and subclasses into package
johngrimes Feb 3, 2024
6f7c39b
Move NullCtx out of ColumnCtx
johngrimes Feb 3, 2024
770047b
Make ofType work on any type of collection
johngrimes Feb 3, 2024
6f7129c
Change ofType test to use FHIR types
johngrimes Feb 3, 2024
424845c
Fix ForEachSelectionX to support nested forEach statements
johngrimes Feb 5, 2024
edac7aa
Add test for nested forEachOrNull
johngrimes Feb 5, 2024
66c34a4
Fix expression for forEachOrNull
johngrimes Feb 5, 2024
6584724
Apply Prettier formatting to test files
johngrimes Feb 12, 2024
b146e0c
Change path to look for SQL on FHIR tests
johngrimes Feb 13, 2024
2eda056
Print out test definition if there is a parsing error
johngrimes Feb 13, 2024
a9dd586
Add logging when no expectation found for test
johngrimes Feb 13, 2024
1fd3788
Log names of tests as they are run
johngrimes Feb 13, 2024
0b5cbe7
Initial implementation of boundary functions
johngrimes Feb 20, 2024
80bd773
Add comments and improve readability of traversal code within Collection
johngrimes Feb 20, 2024
8cb0a5c
Add comments to BaseNodeDefinition traversal code
johngrimes Feb 20, 2024
f4a4850
Rename ColumnCtx to ColumnRepresentation
johngrimes Feb 20, 2024
7fc6065
Remove unused base vectorize implementation
johngrimes Feb 20, 2024
8aac290
Rename classes and add Javadoc
johngrimes Feb 21, 2024
f9ed3b7
Rename getCtx to getColumn
johngrimes Feb 21, 2024
88fee28
Add DecimalRepresentation
johngrimes Feb 21, 2024
fc74a04
Get low boundary test for decimal test passing
johngrimes Feb 22, 2024
07b7683
Get high decimal boundary test passing
johngrimes Feb 22, 2024
d9753fa
Get high and low boundary tests for date times working
johngrimes Feb 22, 2024
92d028e
Get high and low boundary tests for dates working
johngrimes Feb 22, 2024
ecb52d0
Get high and low boundary tests for times working
johngrimes Feb 22, 2024
4cde64d
Improve error message for unsupported types in boundary functions
johngrimes Feb 22, 2024
0b745d2
Fix problem with unnesting on traversal
johngrimes Feb 23, 2024
0ab911f
Handle assertion of empty result
johngrimes Feb 23, 2024
ccbdbbb
Point sql-on-fhir to AEHRC version
johngrimes Feb 23, 2024
e190dae
Implement indexer expression
johngrimes Feb 25, 2024
2510716
Remove unnecessary configuration to JSON reader
johngrimes Feb 26, 2024
dcc2585
Fix union concatenation when some results are singular
johngrimes Feb 27, 2024
00392e1
Rename context classes
johngrimes Feb 28, 2024
d32b2c1
Point sql-on-fhir to origin
johngrimes Feb 28, 2024
c117881
Get constant tests passing
johngrimes Mar 5, 2024
f3ee24a
Added Extension for JSON test report generation to `FhirViewComplianc…
piotrszul Mar 5, 2024
7a50c58
Point sql-on-fhir to origin
johngrimes Mar 7, 2024
3b62734
Fix issues with Javadoc
johngrimes Mar 7, 2024
9211142
Add ability to pass raw JSON to Python view method
johngrimes Mar 10, 2024
3e99ce9
Add upload of SQL on FHIR test report to S3
johngrimes Mar 18, 2024
affa824
Update pointer to SQL on FHIR spec
johngrimes Mar 18, 2024
81bb8af
Hook ExtractQueryExecutor up to existing query machinery
johngrimes Mar 20, 2024
ce39623
Get the first few ExtractQueryTests passing
johngrimes Mar 20, 2024
8c1dec9
Fix Python view method for non-JSON usage
johngrimes Mar 25, 2024
8acce5f
Rename ForEachSelect to ColumnSelect
johngrimes Mar 25, 2024
60e9e5c
Fix inspections in FhirViewExecutor
johngrimes Mar 25, 2024
154d708
Improve documentation within FhirViewExecutor
johngrimes Mar 25, 2024
f61cebf
Refactor projection abstraction and get most view tests passing
johngrimes Mar 26, 2024
8c65f21
Update comments within FhirViewExecutor
johngrimes Mar 26, 2024
6e1ca15
Add additional stub method to ExtractQueryExecutor
johngrimes Mar 27, 2024
43cd4a7
Fix handling of repeating elements in column evaluation
johngrimes Mar 28, 2024
51afcca
Remove unnecessary aliasing from ValueFunctions.ifArray and unnest
johngrimes Apr 7, 2024
b3181f1
Add column type checking
johngrimes Apr 9, 2024
1208386
Cast all numeric types in expected and actual results to decimal
johngrimes Apr 9, 2024
9cae518
Fix problem with integer values in view definition being accepted as …
johngrimes Apr 12, 2024
5328f91
Add support for expectColumns assertions in view tests
johngrimes Apr 17, 2024
72bdd7a
Add basic implementation of ExtractQueryExecutor based on Projection
johngrimes Apr 18, 2024
4be8d43
Handle grouping of prefixes within extract query planning
johngrimes Apr 18, 2024
2c7e41b
Add support for ProjectionConstraint to ExtractQueryExecutor
johngrimes Apr 18, 2024
f401d97
Expand ExtractTest#simple and make assertions
johngrimes Apr 18, 2024
c10b84f
Update version to 7.1.0-SNAPSHOT
johngrimes May 29, 2024
ea11c2e
Remove Task from unsupported resources
johngrimes Jun 10, 2024
c0041ca
Remove dependency on hive-serde
johngrimes Jun 10, 2024
9ceecfb
Ignore lib/python/bin directory
johngrimes Jun 10, 2024
3bb87c1
Normalize date times before comparison
johngrimes Jun 19, 2024
6359423
Normalize times before comparison
johngrimes Jun 19, 2024
82acfd2
Fix problem with conversion of timestamp to milliseconds
johngrimes Jun 19, 2024
ea5e330
Combine index and purpose pages
johngrimes Jun 19, 2024
ae9ef2b
Update boundary functions implementation
johngrimes Jun 25, 2024
4208d11
Fix signature and docs for decimal boundary UDFs
johngrimes Jun 25, 2024
2e4c349
Update date boundary UDFs to use precision parameter
johngrimes Jun 25, 2024
d04dd25
Update datetime boundary UDFs to use precision parameter
johngrimes Jun 25, 2024
56f666a
Update time boundary UDFs to use precision parameter
johngrimes Jun 25, 2024
8ed4738
Get SQL on FHIR constant tests passing
johngrimes Jun 25, 2024
8bc2635
Add complex types to all open types option in encoders
johngrimes Jun 26, 2024
0bfce97
Move all open types out to constant
johngrimes Jun 26, 2024
0f4f1c3
Remove explain on every view test
johngrimes Jun 26, 2024
aba6f1a
Use boundary functions to normalize datetimes and times in tests
johngrimes Jun 26, 2024
f952c1f
Add more decimal boundary tests
johngrimes Jun 26, 2024
9fdc18c
Add missing Javadoc to FhirViewExecutor
johngrimes Jun 28, 2024
46cf0ba
Add missing Javadoc to GroupingSelection
johngrimes Jun 28, 2024
1ab2315
Update SQL on FHIR pointer to AEHRC merged master
johngrimes Jun 28, 2024
db70cbd
Add missing Javadoc to ColumnSelection
johngrimes Jun 28, 2024
bc74022
Extract building of collections iterator out to a separate method
johngrimes Jun 28, 2024
e2de777
Add missing Javadoc to UnionSelection
johngrimes Jun 28, 2024
b492e02
Add missing Javadoc to UnnestingSelection
johngrimes Jun 28, 2024
e1d5fee
Add missing Javadoc to ProjectionClause
johngrimes Jun 28, 2024
848fa8a
Remove unused vectorize overload within ColumnRepresentation
johngrimes Jun 28, 2024
5d88c6f
Remove unused explode and explodeOuter methods from ColumnRepresentation
johngrimes Jun 28, 2024
ca9491d
Improve documentation for ColumnRepresentation.transform
johngrimes Jun 28, 2024
d0bd129
Add comments to ArrayOrSingularRepresentation
johngrimes Jun 28, 2024
2fc258d
Rename ArrayOrSingularRepresentation to DefaultRepresentation
johngrimes Jun 28, 2024
6122e79
Add documentation to DecimalRepresentation
johngrimes Jun 28, 2024
3ba2fe8
Add documentation to BinaryRepresentation
johngrimes Jun 28, 2024
9a9fba2
Add static import within NullRepresentation
johngrimes Jun 28, 2024
96eb4b3
Remove unused GetClassFromContained class from Expressions.scala
johngrimes Jun 28, 2024
8baf5ae
Add more documentation to Expressions.scala
johngrimes Jun 28, 2024
bd7aba6
Inline Collection.getExtensionMap
johngrimes Jun 28, 2024
41a79d9
Remove out of date backport comment on Expressions.scala
johngrimes Jun 28, 2024
4326295
Add documentation to Collection and remove unused methods
johngrimes Jun 28, 2024
225338b
Add documentation to BooleanCollection and remove BooleanCollection.f…
johngrimes Jun 28, 2024
745e13b
Make decision on Coding and remove comment from CodingCollection.from…
johngrimes Jun 28, 2024
22f1eeb
Make internal build method in DateCollection private
johngrimes Jun 28, 2024
2be70e6
Fix documentation within DateTimeCollection
johngrimes Jun 28, 2024
18098e8
Add Javadoc to DecimalCollection
johngrimes Jun 28, 2024
7c16970
Add Javadoc to IntegerCollection
johngrimes Jun 28, 2024
07d6133
Fix Javadoc within QuantityCollection
johngrimes Jun 28, 2024
5cddfa0
Fix Javadoc to ResourceCollection
johngrimes Jun 28, 2024
5766ac3
Fix Javadoc within StringCollection
johngrimes Jul 1, 2024
aaa6564
Change TimeCollection constructor to protected
johngrimes Jul 1, 2024
4d1559e
Add Javadoc to MixedResourceCollection
johngrimes Jul 1, 2024
4e3abf9
Add documentation to function registry classes
johngrimes Jul 1, 2024
ca9fd81
Remove unused Arguments class
johngrimes Jul 1, 2024
27df2f0
Add documentation to BoundaryFunctions
johngrimes Jul 1, 2024
c20bbc1
Remove unused MixedCollection.buildResource
johngrimes Jul 1, 2024
f613ae6
Add documentation to CollectionExpression
johngrimes Jul 1, 2024
a77bb1b
Rename FhirViewFunctions to JoinKeyFunctions
johngrimes Jul 1, 2024
f033630
Refactor implementation of getResourceKey and getReferenceKey
johngrimes Jul 1, 2024
6618776
Fix Javadoc within NamedFunction and remove unused method
johngrimes Jul 1, 2024
03c7d96
Remove StandardFunctions.reverseResolve
johngrimes Jul 1, 2024
e637b78
Rename FhirpathFunction to FhirPathFunction
johngrimes Jul 1, 2024
f572d8b
Update SQL on FHIR to point back to origin master
johngrimes Jul 1, 2024
5b5ec87
Document and rename existence functions
johngrimes Jul 1, 2024
89e5e1a
Update documentation for JoinKeyFunctions
johngrimes Jul 1, 2024
7b3f4bf
Extract and document filtering and projection functions
johngrimes Jul 1, 2024
54f3405
Move empty and exists to ExistenceFunctions and document
johngrimes Jul 1, 2024
40d5a76
Extract and document extension function within FhirFunctions
johngrimes Jul 1, 2024
2a7c88f
Move extension constants to FhirFunctions
johngrimes Jul 1, 2024
681fabc
Extract join function to StringFunctions and document
johngrimes Jul 1, 2024
b11bdf9
Extract first function to SubsettingFunctions and document
johngrimes Jul 1, 2024
54224e1
Extract count function to ExistenceFunctions and document
johngrimes Jul 1, 2024
2b15d19
Move isTypeSpecifierFunction to InvocationVisitor
johngrimes Jul 1, 2024
77ec4ec
Move toString to ConversionFunctions and document
johngrimes Jul 1, 2024
46f88a6
Update StaticFunctionRegistry
johngrimes Jul 1, 2024
81018bf
Improve documentation in TerminologyFunctions
johngrimes Jul 2, 2024
74b4e3b
Improve documentation for TypeSpecifier
johngrimes Jul 2, 2024
5d0a59f
Improve documentation for ExtractQueryExecutor
johngrimes Jul 2, 2024
a316d67
Remove unused method StorageConfiguration.forDatabase
johngrimes Jul 2, 2024
fcd44de
Improve documentation for annotations
johngrimes Jul 2, 2024
655a9fa
Rename comparator classes
johngrimes Jul 2, 2024
1dd4347
Move comparison classes into the operator package
johngrimes Jul 2, 2024
45f80eb
Remove unused tests, will replace with a new testing regime
johngrimes Jul 2, 2024
6e5dd98
Remove unused classes and move annotations into theme packages
johngrimes Jul 2, 2024
19a80f7
Refactor and document MethodDefinedFunction and FunctionParameterReso…
johngrimes Jul 4, 2024
3d615a6
Refactor and document MethodDefinedOperator
johngrimes Jul 4, 2024
ff1b148
Move function providers into their own package
johngrimes Jul 4, 2024
5dd33a0
Refactor and document collection operations
johngrimes Jul 4, 2024
e9c1663
Go back to using the FHIR core boundary functions implementation
johngrimes Jul 8, 2024
1c4ecf6
Update boundary function tests and get passing
johngrimes Jul 8, 2024
c16a7e0
Update boundary function tests and get passing
johngrimes Jul 8, 2024
1efd254
Merge remote-tracking branch 'origin/issue/1759' into issue/1759
johngrimes Jul 8, 2024
fc4cd27
Replace javax.annotation.Nonnull with jakarta.annotation.Nonnull
johngrimes Jul 8, 2024
48ecd83
Replace javax.annotation.Nullable with jakarta.annotation.Nullable
johngrimes Jul 8, 2024
bc4a204
Merge branch 'refs/heads/main' into issue/1759
johngrimes Jul 8, 2024
21afbf8
Add serial annotations to boundary UDFs
johngrimes Jul 15, 2024
2429ea1
Update implementation and tests to match discussion in Zulip
johngrimes Jul 15, 2024
150330d
Remove unnecessary constant and make isHigh parameter final
johngrimes Jul 15, 2024
22dcc20
Add more comments to boundary function implementation
johngrimes Jul 15, 2024
3e6ab11
Update boundary functions implementation to use significant figures
johngrimes Jul 16, 2024
5f09f33
Update DecimalBoundaryFunction to account for half-up rounding
johngrimes Jul 22, 2024
84f90ad
Update pointer to SQL on FHIR master
johngrimes Jul 22, 2024
37a999d
Fix imports within DataSinkBuilder
johngrimes Aug 6, 2024
105f43b
Fix TerminologyFunctions import
johngrimes Oct 29, 2024
1b38ccf
Update SQL on FHIR pointer
johngrimes Nov 14, 2024
2349940
Fixing encoding tests (synchronizing unsupported resource types) and …
piotrszul Nov 15, 2024
21cdd77
Adding default values of pathling.strorage properties for test relyin…
piotrszul Nov 18, 2024
ff28f7c
Adding Fhirepath test to explore resolve/reverseResolve issues.
piotrszul Nov 18, 2024
5244a33
Adding Fhirpath tests for resolve() ManyToOne an ManyToMany
piotrszul Nov 19, 2024
a404150
Refactoring: Extracting the simple reverseResolve functionality.
piotrszul Nov 19, 2024
0b6334e
Refactoring: Adding reverseResolve() decomposition from a fhirPath.
piotrszul Nov 20, 2024
d9807b6
Adding manual support for reverseResolve with leading expression.
piotrszul Nov 20, 2024
ded3a34
Adding support for reverserResolve with leading (where) expressions.
piotrszul Nov 20, 2024
9ef5996
Adding support for mulitple aggregations in the in the reverseResolve…
piotrszul Nov 21, 2024
ec27771
Refactoring: cleaning up the implementation of reverseResolve aggrega…
piotrszul Nov 21, 2024
814b9bd
Updating reverseResolve() test with more data instances.
piotrszul Nov 21, 2024
26b87f7
Adding test cased for nested reverseResolve and multiple reverse reso…
piotrszul Nov 21, 2024
ad2f5bf
Refactoring: automated detection of reverse resolve
piotrszul Nov 22, 2024
6297991
Working implementation of nested reverseResolve for value access aggr…
piotrszul Nov 25, 2024
9e1f69b
Working implementation of nested reverseResolve for both value accees…
piotrszul Nov 26, 2024
87ad073
POC implementation of many-one resolve with fixed reference resource …
piotrszul Nov 26, 2024
0ea6616
Refactoring: taking column aliases from ResoveRoot.
piotrszul Nov 26, 2024
7113445
Refactoring: adding automatic determination of referenced resource type.
piotrszul Nov 27, 2024
be1b942
Adding working implementation of toMany resolve().
piotrszul Nov 27, 2024
ea2f4b4
Proof of concept for purification approach.
piotrszul Nov 29, 2024
19178a2
REFACTORING: Unifying purification for pure FhirPath expressions.
piotrszul Dec 2, 2024
0f61aad
POC: Nested reverseResolve to values.
piotrszul Dec 2, 2024
f124cc3
POC: Nested reverseResolve to aggregate function (also coincidentally…
piotrszul Dec 2, 2024
68116fb
REFACTORING: Cleaning up reverseResolve() POC
piotrszul Dec 2, 2024
4a4fe07
Adding implementation of resolve() to simple value on pure paths.
piotrszul Dec 3, 2024
c525254
Adding implementation of nested resolve() to x-to-one references.
piotrszul Dec 3, 2024
3fdb1bb
Adding implementation of resolve in where clause.
piotrszul Dec 6, 2024
53e86ea
Adding implementation of aggregation for resolve().
piotrszul Dec 6, 2024
0c0b40d
Adding implementation of aggregation for resolve().
piotrszul Dec 6, 2024
4cf654a
REFACTORING: removing the old implementation.
piotrszul Dec 6, 2024
0ee9b96
REFACTORING: Extracting resolving executor implementation from the Fh…
piotrszul Dec 9, 2024
a9ab28f
REFACTORING: Connecting ParserTest to ResolvingFhirPath evaluator imp…
piotrszul Dec 9, 2024
8965a1b
Fixing the implementation of 'in' and 'contains' operators.
piotrszul Dec 9, 2024
cc53d99
Fixing the (remaining) extensions of expectation files for ParserTest…
piotrszul Dec 9, 2024
4124c2e
Fixing the type checking for Combine operator to use FHIRpath types.
piotrszul Dec 9, 2024
0332687
Adding working implementation of iif() function.
piotrszul Dec 9, 2024
1b13478
Fixing issues in parsing of type specifiers.
piotrszul Dec 10, 2024
f6a8072
REFACTORING: cleaning up up FhirPathTest
piotrszul Dec 10, 2024
8d30c1c
Fixing the math operations on QuantityCollection by passing through t…
piotrszul Dec 10, 2024
6a950ba
Fixing the variable resolution in FhirPathContext.
piotrszul Dec 10, 2024
9dc62cb
Adding reference type checking for reverseResolve and a failing test …
piotrszul Dec 10, 2024
5e7b4f8
Fixing column representation of CodingLiteral to include explicit SQL…
piotrszul Dec 11, 2024
feda8b7
Disabling some ParserTest not related to resolve() implementation.
piotrszul Dec 11, 2024
08e4c40
Fixing the ofType() implementation for choices.
piotrszul Dec 11, 2024
77a9f03
POC of ofType() for mixed resource paths.
piotrszul Dec 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ ij_json_keep_indents_on_empty_lines = false
ij_json_keep_line_breaks = true
ij_json_space_after_colon = true
ij_json_space_after_comma = true
ij_json_space_before_colon = true
ij_json_space_before_colon = false
ij_json_space_before_comma = false
ij_json_spaces_within_braces = true
ij_json_spaces_within_brackets = false
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ _version.py
metastore_db
derby.log
spark-warehouse
.*.crc


#R
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "sql-on-fhir"]
path = sql-on-fhir
url = https://github.com/FHIR/sql-on-fhir-v2.git
2 changes: 1 addition & 1 deletion deployment/helm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>au.csiro.pathling</groupId>
<artifactId>pathling</artifactId>
<version>6.4.2</version>
<version>6.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>helm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion encoders/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>au.csiro.pathling</groupId>
<artifactId>pathling</artifactId>
<version>6.4.2</version>
<version>6.5.0-SNAPSHOT</version>
</parent>
<artifactId>encoders</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Set;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import au.csiro.pathling.encoders.FhirEncoders;
import lombok.Builder;
import lombok.Data;

Expand Down Expand Up @@ -59,19 +60,5 @@ public class EncodingConfiguration {
*/
@NotNull
@Builder.Default
private Set<String> openTypes = Set.of(
"boolean",
"code",
"date",
"dateTime",
"decimal",
"integer",
"string",
"Coding",
"CodeableConcept",
"Address",
"Identifier",
"Reference"
);

private Set<String> openTypes = FhirEncoders.STANDARD_OPEN_TYPES;
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,25 @@
*/
public class FhirEncoders {

/**
* The reasonable default set of open types to encode with extension values.
*/
public static final Set<String> STANDARD_OPEN_TYPES = Set.of(
"boolean",
"code",
"date",
"dateTime",
"decimal",
"integer",
"string",
"Coding",
"CodeableConcept",
"Address",
"Identifier",
"Reference"
);


/**
* Cache of Encoders instances.
*/
Expand Down Expand Up @@ -308,6 +327,15 @@ public Builder withOpenTypes(final Set<String> openTypes) {
return this;
}

/**
* Sets the reasonable default list of types to be encoded for open types, such as extensions.
*
* @return this builder
*/
public Builder withStandardOenTypes() {
return withOpenTypes(STANDARD_OPEN_TYPES);
}

/**
* Switches on/off the support for extensions in encoders.
*
Expand Down
Loading
Loading