From 2a2f288ffa32857a35fb55ca6f91b35851b65aed Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 25 Sep 2022 16:30:57 -0400 Subject: [PATCH 1/5] Adding Android compliance check on the engine, engine.fhir and engine.jackson --- engine.fhir/pom.xml | 12 ++++++++++++ engine.jackson/pom.xml | 22 ++++++++++++++++++++++ engine/pom.xml | 12 ++++++++++++ 3 files changed, 46 insertions(+) diff --git a/engine.fhir/pom.xml b/engine.fhir/pom.xml index 665075ff8..3a445f609 100644 --- a/engine.fhir/pom.xml +++ b/engine.fhir/pom.xml @@ -175,6 +175,18 @@ true + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.22 + + + net.sf.androidscents.signature + android-api-level-26 + 8.0.0_r2 + + + org.apache.maven.plugins maven-javadoc-plugin diff --git a/engine.jackson/pom.xml b/engine.jackson/pom.xml index de4b923fd..3cfd8f762 100644 --- a/engine.jackson/pom.xml +++ b/engine.jackson/pom.xml @@ -77,6 +77,16 @@ elm-jackson test + + + + + xerces + xercesImpl + 2.12.2 + provided + true + @@ -112,6 +122,18 @@ + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.22 + + + net.sf.androidscents.signature + android-api-level-26 + 8.0.0_r2 + + + diff --git a/engine/pom.xml b/engine/pom.xml index 2c96fc9b4..322dee285 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -142,6 +142,18 @@ true + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.22 + + + net.sf.androidscents.signature + android-api-level-26 + 8.0.0_r2 + + + org.jacoco jacoco-maven-plugin From 6733341147d54b26f9d1c4e87d9e30d7f162bd39 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Sun, 25 Sep 2022 18:24:21 -0400 Subject: [PATCH 2/5] Correctly using plugin management --- engine.fhir/pom.xml | 18 ++++++------------ engine.jackson/pom.xml | 14 ++++++-------- engine/pom.xml | 18 ++++++------------ pom.xml | 21 +++++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/engine.fhir/pom.xml b/engine.fhir/pom.xml index 1c1b49926..038fe5f3b 100644 --- a/engine.fhir/pom.xml +++ b/engine.fhir/pom.xml @@ -113,6 +113,12 @@ + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + @@ -164,18 +170,6 @@ true - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.22 - - - net.sf.androidscents.signature - android-api-level-26 - 8.0.0_r2 - - - org.apache.maven.plugins maven-javadoc-plugin diff --git a/engine.jackson/pom.xml b/engine.jackson/pom.xml index 9eeba880a..a4d5ffa15 100644 --- a/engine.jackson/pom.xml +++ b/engine.jackson/pom.xml @@ -77,6 +77,12 @@ + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + @@ -113,14 +119,6 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.22 - - - net.sf.androidscents.signature - android-api-level-26 - 8.0.0_r2 - - diff --git a/engine/pom.xml b/engine/pom.xml index dd239b6d7..7dde95bc0 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -65,6 +65,12 @@ + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + @@ -130,18 +136,6 @@ true - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.22 - - - net.sf.androidscents.signature - android-api-level-26 - 8.0.0_r2 - - - org.jacoco jacoco-maven-plugin diff --git a/pom.xml b/pom.xml index 5241101c9..fb2053349 100644 --- a/pom.xml +++ b/pom.xml @@ -556,6 +556,27 @@ maven-jxr-plugin 3.2.0 + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.22 + + + net.sf.androidscents.signature + android-api-level-26 + 8.0.0_r2 + + + + + check-android-26-compliance + test + + check + + + + From d83f49873d8607fbfb87431271f8173430338f3c Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 3 Oct 2022 14:04:14 -0400 Subject: [PATCH 3/5] Fixing Test case --- .../opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java index 1c001133e..35f24d03e 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java @@ -291,7 +291,7 @@ public void createInstanceTests() { @Test public void contextPathTests() { - ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); String path = (String)resolver.getContextPath("Patient", "Patient"); assertNotNull(path); From 43564ce90c5ab9c006b0bdeb3723abf05d47f26a Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 3 Oct 2022 14:05:00 -0400 Subject: [PATCH 4/5] Using Assert equals and not assertTrue(equals(x)) --- .../engine/fhir/model/TestDstu3ModelResolver.java | 13 +++++++------ .../cql/engine/fhir/model/TestR4ModelResolver.java | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java index c3ccb7a90..8d84c7ea1 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java @@ -1,5 +1,6 @@ package org.opencds.cqf.cql.engine.fhir.model; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; @@ -218,7 +219,7 @@ public void contextPathTests() { String path = (String) resolver.getContextPath("Patient", "Patient"); assertNotNull(path); - assertTrue(path.equals("id")); + assertEquals(path, "id"); path = (String) resolver.getContextPath(null, "Encounter"); assertNull(path); @@ -230,22 +231,22 @@ public void contextPathTests() { path = (String) resolver.getContextPath("Patient", "Condition"); assertNotNull(path); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); path = (String) resolver.getContextPath("Patient", "Appointment"); assertNotNull(path); - assertTrue(path.equals("participant.actor")); + assertEquals(path, "participant.actor"); path = (String) resolver.getContextPath("Patient", "Account"); assertNotNull(path); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); path = (String) resolver.getContextPath("Patient", "Encounter"); assertNotNull(path); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); path = (String) resolver.getContextPath("Patient", "MedicationStatement"); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); // Issue 527 - https://github.com/DBCG/cql_engine/issues/527 path = (String) resolver.getContextPath("Unfiltered", "MedicationStatement"); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java index 35f24d03e..652931d8b 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java @@ -2,6 +2,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; @@ -307,25 +308,25 @@ public void contextPathTests() { path = (String)resolver.getContextPath("Patient", "Condition"); assertNotNull(path); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); path = (String)resolver.getContextPath("Patient", "Appointment"); assertNotNull(path); - assertTrue(path.equals("participant.actor")); + assertEquals(path, "participant.actor"); path = (String)resolver.getContextPath("Patient", "Account"); assertNotNull(path); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); path = (String)resolver.getContextPath("Patient", "Encounter"); assertNotNull(path); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); path = (String)resolver.getContextPath("Patient", "ValueSet"); assertNull(path); path = (String)resolver.getContextPath("Patient", "MedicationStatement"); - assertTrue(path.equals("subject")); + assertEquals(path, "subject"); // Issue 527 - https://github.com/DBCG/cql_engine/issues/527 path = (String)resolver.getContextPath("Unfiltered", "MedicationStatement"); From ff3a59cc5bf5208706e607ca7c4b8b541fe0e931 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 3 Oct 2022 14:05:12 -0400 Subject: [PATCH 5/5] Fixing #621 --- .../cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java | 4 ++++ .../cqf/cql/engine/fhir/model/R4FhirModelResolver.java | 4 ++++ .../cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java | 3 +++ .../cqf/cql/engine/fhir/model/TestR4ModelResolver.java | 3 +++ 4 files changed, 14 insertions(+) diff --git a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java index f2f15dfda..0b6e60f2c 100644 --- a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java +++ b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java @@ -318,6 +318,10 @@ public Object getContextPath(String contextType, String targetType) { return "subject"; } + if (contextType.equals("Patient") && targetType.equals("Task")) { + return "for"; + } + return super.getContextPath(contextType, targetType); } } \ No newline at end of file diff --git a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java index e547fa3fa..94fa2b2aa 100644 --- a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java +++ b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java @@ -356,6 +356,10 @@ public Object getContextPath(String contextType, String targetType) { return "subject"; } + if (contextType.equals("Patient") && targetType.equals("Task")) { + return "for"; + } + return super.getContextPath(contextType, targetType); } } \ No newline at end of file diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java index 8d84c7ea1..a12916163 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java @@ -248,6 +248,9 @@ public void contextPathTests() { path = (String) resolver.getContextPath("Patient", "MedicationStatement"); assertEquals(path, "subject"); + path = (String) resolver.getContextPath("Patient", "Task"); + assertEquals(path, "for"); + // Issue 527 - https://github.com/DBCG/cql_engine/issues/527 path = (String) resolver.getContextPath("Unfiltered", "MedicationStatement"); assertNull(path); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java index 652931d8b..a085a850b 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java @@ -328,6 +328,9 @@ public void contextPathTests() { path = (String)resolver.getContextPath("Patient", "MedicationStatement"); assertEquals(path, "subject"); + path = (String)resolver.getContextPath("Patient", "Task"); + assertEquals(path, "for"); + // Issue 527 - https://github.com/DBCG/cql_engine/issues/527 path = (String)resolver.getContextPath("Unfiltered", "MedicationStatement"); assertNull(path);