Build #371

Plan branch:
More details of the release in https://wiki.openmrs.org/x/i4DTAw

Build: #371 was successful Changes by Mike Seaton

Code commits

Git

  • Mike Seaton

    Mike Seaton 6b2cd4279a49378c3e47d98a2b51bb07f0067446

    REPORT-685 - Expand CompositionCohortDefinitions to other types of Queries.  Refactored the CompositionCohortDefinition and CohortExpressionParser to create a new abstract base class for any CompositionQuery and CompositionQueryEvaluator, re-implemented the CompositionCohortDefinition/Evaluator using this mechanism, and added a CompositionEncounterQuery/Evaluator.  Also added some unit tests for both, which were not previously present.

    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/CompositionCohortDefinition.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/CompositionCohortDefinitionEvaluator.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/util/CohortExpressionParser.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/main/java/org/openmrs/module/reporting/query/CompositionQuery.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/main/java/org/openmrs/module/reporting/query/QueryUtil.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/main/java/org/openmrs/module/reporting/query/encounter/definition/CompositionEncounterQuery.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/main/java/org/openmrs/module/reporting/query/encounter/evaluator/CompositionEncounterQueryEvaluator.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/main/java/org/openmrs/module/reporting/query/evaluator/CompositionQueryEvaluator.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/CompositionCohortDefinitionEvaluatorTest.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)
    • api/src/test/java/org/openmrs/module/reporting/query/encounter/evaluator/CompositionEncounterQueryEvaluatorTest.java (version 6b2cd4279a49378c3e47d98a2b51bb07f0067446)