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

Bump CQL Translator/Evaluator to 2.4 #1771

Merged
merged 21 commits into from
Jan 10, 2023

Conversation

vitorpamplona
Copy link
Collaborator

@vitorpamplona vitorpamplona commented Dec 19, 2022

Description

  1. Moves the CQL Evaluator from 2.1 to 2.4 and the translator from 2.1 to 2.4.
  2. Adjusts test cases to match the changes in the CQL-Translator
  3. Removes the old antlr fix due to the fix being applied in this version of the Translator.
  4. Forces Jackson 2.14.1 due to this bug: Gradle module metadata for 2.13.4.1 references non-existent jackson-bom 2.13.4.1 FasterXML/jackson-databind#3627. This will be fixed in the next version of HAPI/Translator/Evaluator combo, somewhere in January/February. PR: BugFix: Upgrading Jackson to 2.14.1 hapifhir/hapi-fhir#4308
  5. Adjusts generateCarePlan to return IBaseResource to prepare for R5.
  6. Forces the use of FHIR Core 5.6.36 and HAPI 6.0.1 due to isBase64 is not available on Android (Use java.util.Base64) hapifhir/org.hl7.fhir.core#1046
  7. Forces Caffeine 2.9.1 while we wait for HAPI 6.3.

Alternative(s) considered
Have you considered any alternatives? And if so, why have you chosen the approach in this PR?

Type
Choose one: Code health

Screenshots (if applicable)

Checklist

  • I have read and acknowledged the Code of conduct.
  • I have read the Contributing page.
  • I have signed the Google Individual CLA, or I am covered by my company's Corporate CLA.
  • I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
  • I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the style guide of this project.
  • I have run ./gradlew check and ./gradlew connectedCheck to test my changes locally.
  • I have built and run the demo app(s) to verify my change fixes the issue and/or does not break the demo app(s).

@vitorpamplona
Copy link
Collaborator Author

:( We are going to need HAPI 6.3 to push this forward (We need that caffeine/guava modules shipped to Maven central)

@vitorpamplona
Copy link
Collaborator Author

This is now ready to be reviewed. @jingtang10 @omarismail94 @ktarasenko @pld

We need this for a more stable plan definition release.

Copy link
Collaborator

@jingtang10 jingtang10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vitorpamplona thanks for working this out this is great. why do we need hapi 6.3?

fyi @brynrhodes

benchmark/build.gradle.kts Outdated Show resolved Hide resolved
buildSrc/src/main/kotlin/Dependencies.kt Show resolved Hide resolved
@jingtang10 jingtang10 removed their assignment Dec 23, 2022
@codecov
Copy link

codecov bot commented Dec 23, 2022

Codecov Report

Merging #1771 (5d0f25b) into master (e3ff70b) will increase coverage by 41.82%.
The diff coverage is n/a.

❗ Current head 5d0f25b differs from pull request most recent head be8c1f0. Consider uploading reports for the commit be8c1f0 to get more accurate results

@@              Coverage Diff              @@
##             master    #1771       +/-   ##
=============================================
+ Coverage          0   41.82%   +41.82%     
- Complexity        0      383      +383     
=============================================
  Files             0      153      +153     
  Lines             0     5513     +5513     
  Branches          0      991      +991     
=============================================
+ Hits              0     2306     +2306     
- Misses            0     2838     +2838     
- Partials          0      369      +369     
Impacted Files Coverage Δ
...a/com/google/android/fhir/workflow/FhirOperator.kt 0.00% <ø> (ø)
...hir/datacapture/QuestionnaireItemViewHolderType.kt 100.00% <0.00%> (ø)
...com/google/android/fhir/index/entities/UriIndex.kt 0.00% <0.00%> (ø)
...e/validation/QuestionnaireResponseItemValidator.kt 92.30% <0.00%> (ø)
...oid/fhir/search/filter/DateParamFilterCriterion.kt 88.09% <0.00%> (ø)
...m/google/android/fhir/index/entities/TokenIndex.kt 100.00% <0.00%> (ø)
...src/main/java/com/google/android/fhir/MoreDates.kt 100.00% <0.00%> (ø)
...d/fhir/search/filter/StringParamFilterCriterion.kt 100.00% <0.00%> (ø)
...roid/fhir/datacapture/utilities/MoreEnumeration.kt 0.00% <0.00%> (ø)
...om/google/android/fhir/db/impl/ResourceDatabase.kt 100.00% <0.00%> (ø)
... and 144 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@vitorpamplona
Copy link
Collaborator Author

Hey @jingtang10 take a look on this one again.

why do we need hapi 6.3?

Hapi 6.3 is when Smile ships the service loaders to get rid of Caffeine. It should come out soon.

@vitorpamplona vitorpamplona merged commit 9fe7c81 into google:master Jan 10, 2023
@vitorpamplona vitorpamplona deleted the Evaluator2_4 branch January 10, 2023 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants