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.

Sign up for GitHub

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

Release v0.9.0 #672

Merged
merged 2 commits into from
Nov 28, 2022
Merged

Release v0.9.0 #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
998e7bc
fix build issues on master and WIP hedis test fix
Capt-Mac Nov 28, 2022
ba0cc6c
update hedis bundle with beneficiary instead of policyholder
Capt-Mac Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-core</artifactId>
Expand All @@ -14,7 +13,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-external</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>

<dependency>
Expand Down
1 change: 1 addition & 0 deletions core/src/test/java/org/opencds/cqf/ruler/ExampleServerDstu3IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class ExampleServerDstu3IT {
@LocalServerPort
private int port;


@BeforeEach
void beforeEach() {
ourCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER);
Expand Down
6 changes: 3 additions & 3 deletions example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
<relativePath>../</relativePath>
</parent>

Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-core</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-test</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion external/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-external</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions plugin/case-reporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-case-reporting</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>

</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions plugin/cds-hooks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-cds-hooks</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cr</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-security</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cpg</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions plugin/cpg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-cpg</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>

<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-security</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
<scope>test</scope>
</dependency>

Expand Down
5 changes: 2 additions & 3 deletions plugin/cql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-cql</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ LibraryLoaderFactory libraryLoaderFactory(
}

return new CacheAwareLibraryLoaderDecorator(
new TranslatingLibraryLoader(modelManager, lcp, cqlTranslatorOptions), globalLibraryCache) {
new TranslatingLibraryLoader(modelManager, lcp, cqlTranslatorOptions, null), globalLibraryCache) {
// TODO: This is due to a bug with the ELM annotations which prevent options
// from matching the way they should
@Override
Expand Down
7 changes: 3 additions & 4 deletions plugin/cr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>
<artifactId>cqf-ruler-cr</artifactId>
<dependencies>
Expand All @@ -28,7 +27,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/r4/provider/DataOperationProviderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void testR4LibraryFhirQueryPattern() {
"http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-fhirQueryPattern")
.getValueAsPrimitive().getValueAsString();
assertEquals(
"Coverage?policy-holder=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591",
"Coverage?beneficiary=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591",
query);
}
break;
Expand Down Expand Up @@ -208,7 +208,7 @@ void testR4MeasureFhirQueryPattern() {
"http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-fhirQueryPattern")
.getValueAsPrimitive().getValueAsString();
assertEquals(
"Coverage?policy-holder=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591",
"Coverage?beneficiary=Patient/{{context.patientId}}&type:in=http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.114222.4.11.3591",
query);
}
break;
Expand Down
18 changes: 9 additions & 9 deletions plugin/cr/src/test/resources/BCSEHEDISMY2022-bundle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18043,7 +18043,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-7-93",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-7"
},
"period": {
Expand All @@ -18068,7 +18068,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-7-94",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-7"
},
"period": {
Expand All @@ -18093,7 +18093,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-7-95",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-7"
},
"period": {
Expand Down Expand Up @@ -18156,7 +18156,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-9-93",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-9"
},
"period": {
Expand All @@ -18181,7 +18181,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-9-94",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-9"
},
"period": {
Expand All @@ -18206,7 +18206,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-9-95",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-9"
},
"period": {
Expand Down Expand Up @@ -18269,7 +18269,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-23-93",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-23"
},
"period": {
Expand Down Expand Up @@ -18372,7 +18372,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-65-93",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-65"
},
"period": {
Expand Down Expand Up @@ -18441,7 +18441,7 @@
"resource": {
"resourceType": "Coverage",
"id": "Coverage-21-93",
"policyHolder": {
"beneficiary": {
"reference": "Patient/Patient-21"
},
"period": {
Expand Down
2 changes: 1 addition & 1 deletion plugin/dev-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-dev-tools</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-plugin</artifactId>
Expand All @@ -25,12 +25,12 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-core</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-external</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>

<dependency>
Expand All @@ -50,7 +50,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-test</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions plugin/ra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-ra</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cr</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</dependency>
</dependencies>
</project>
5 changes: 2 additions & 3 deletions plugin/sdc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-sdc</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions plugin/security/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
</parent>

<artifactId>cqf-ruler-security</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-dev-tools</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading