From 3068eb38c456a2dc54504dea6633b2a7e8227687 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Wed, 29 Jun 2022 14:03:52 -0700 Subject: [PATCH] Rel 6 0 mb 2 (#3747) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * adding version.yaml, updating version in pom.xml * It is possible to write to a resource in a partition the user is not authorized to. (#3397) * fixed * remove sout * add msg.code * fix failed tests * fix equal sign * update msg code * extract method * Fix up code numbers * Clean changelog Co-authored-by: Tadgh * Revert final artifact version * add graphql test (#3585) * added graphql birthdate test * fix variable name * typo * 3506 mdm log enhancement (#3543) * Providing Fixme's to be reworked at a later time. * Adding // FIXME Anna to assist our Austrian friend. * Adding logging test as a first step in addressing issue #2822. * hapifhir#3506 part 2: enhance logging for (un)successful MDM matching hapifhir#3506 part 2: enhance logging for (un)successful MDM matching * Update MdmMatchLinkSvc.java #3506 move "narrowed down" log to different place * #3506 added scores and tests #3506 added scores and tests * #3506 formatting #3506 formatting * #3506 create changelog file #3506 create changelog file * #3506 fix typo #3506 fix typo * #3506 fix part 3, minor formatting #3506 fix part 3, minor formatting * #3506 fix tests #3506 fix tests Co-authored-by: Etienne Poirier Co-authored-by: Anna * mdm matching (#3579) * Added fix for https://github.com/hapifhir/hapi-fhir-jpaserver-starter… (#3551) * Added fix for https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/328 * Update HapiFhirJpaMigrationTasks.java Corrected ordering * Update HapiFhirJpaMigrationTasks.java Moving index status to be last operation * Revert "Update HapiFhirJpaMigrationTasks.java" This reverts commit 37bfd3e66e4f4dc76de135c1fe108ccbf9e3690c. * Moved to bottom Co-authored-by: Jens Kristian Villadsen * begin with failing test * fixed * changelog * add jira tag * Update to 6 1 (#3582) * added changelog folder, upped version * version enum * add a few more unit tests to assert proper NO_MATCH exclusion * revert merge master doh! bad reflexes * revert merge origin master * unrevert revert. ugh what a pain * merge recovery. fix poms. * merge recovery. more reverting * merge recovery. more reverting * merge recovery. more reverting * Revert "merge recovery. fix poms." This reverts commit ae6e0ddb06bdcb424f9c4637eb0a987bc112b115. * more revert revert reversions * more revert revert reversions * pre-review cleanup Co-authored-by: Jens Kristian Villadsen Co-authored-by: Jens Kristian Villadsen Co-authored-by: Mark Iantorno * Fix regression of 3411 - _lastUpdated gets clobbered during $reindex job (#3586) * When chunking for the reindex job, don't clobber the lastUpdated if provided by the caller. * License * Ks 20220508 log colour (#3592) * don't use colours when output is redirected to a file * change log * Added fix for https://github.com/hapifhir/hapi-fhir-jpaserver-starter… (#3551) (#3594) * Added fix for https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/328 * Update HapiFhirJpaMigrationTasks.java Corrected ordering * Update HapiFhirJpaMigrationTasks.java Moving index status to be last operation * Revert "Update HapiFhirJpaMigrationTasks.java" This reverts commit 37bfd3e66e4f4dc76de135c1fe108ccbf9e3690c. * Moved to bottom Co-authored-by: Jens Kristian Villadsen Co-authored-by: Jens Kristian Villadsen Co-authored-by: Jens Kristian Villadsen * 3584 case sensitive string elasticsearch (#3596) * Fix for case-sensitive search with newer elasticsearch * Test and fix ascii normalization too * more test cases * comments * Docs update empi usecase (#3598) * Update diagram for use case 5 * Add new page for database support * Licnese * Mb norm fix (#3604) * Normalize query since wildcard searches aren't normalized in elastic * Handle batch2 job cancellation (#3603) * Handle batch2 job cancellation * Add CANCELLED status * Remove unuseful test Co-authored-by: juan.marchionatto * Add batch2 interfaces to obtain recent instances (#3601) Co-authored-by: juan.marchionatto * changelog folder * Documentation change, added warning log and change log for ticket (#3609) Co-authored-by: Steven Li * fix ne for lastUpdated search param (#3589) * init/wip * add implementation, add tests * add checks and some refactoring * refactor and simplify tests * refactor * get rid of some of the warnings * add changelog * remove my todos * redo ne logic to account for less precise dates * add tests * refactoring * rename to follow convention Co-authored-by: Justin_Dar * Version bump * Add skip of checkstyle to upload * Typo * upping version enum, upping version number, 6.0.1 * Group Bulk Export rules exiting too early. (#3643) * Implementation, test, changelog * Add jira link * adding backport in yaml for 3642 * adding folder for 6.0.1 release * pom changes to publish checkstyle to sonatype * bad version in pom file * Make FulltextSearchSvcImpl optional bean for ValuesetOperationProvider * AUtomcplete error code * updating comment indicating final erorr code * Bump error code * fixing version enum so release docs generate correctly, adding additional changelog for 3650 * 3684 subscription for delivering delete events formatted wrong (#3685) * Fixed issue with delivering delete events Subscriptions * Extracted deliverer class name to a constant, now shared across tests and interceptor class * Added change log and doc changes * moved the constant to a more appropriate place Co-authored-by: Steven Li * Version bump * Add version enum * Version enum and folder * duplicate import * duplicate import Co-authored-by: markiantorno Co-authored-by: katiesmilecdr <88786813+katiesmilecdr@users.noreply.github.com> Co-authored-by: Ken Stevens Co-authored-by: alackerbauer <33912849+alackerbauer@users.noreply.github.com> Co-authored-by: Etienne Poirier Co-authored-by: Anna Co-authored-by: Jens Kristian Villadsen Co-authored-by: Jens Kristian Villadsen Co-authored-by: michaelabuckley Co-authored-by: jmarchionatto <60409882+jmarchionatto@users.noreply.github.com> Co-authored-by: juan.marchionatto Co-authored-by: StevenXLi Co-authored-by: Steven Li Co-authored-by: jdar8 <69840459+jdar8@users.noreply.github.com> Co-authored-by: Justin_Dar --- .../src/main/java/ca/uhn/fhir/util/VersionEnum.java | 2 ++ .../resources/ca/uhn/hapi/fhir/changelog/6_0_1/changes.yaml | 1 + .../resources/ca/uhn/hapi/fhir/changelog/6_0_1/upgrade.md | 0 .../resources/ca/uhn/hapi/fhir/changelog/6_0_1/version.yaml | 3 +++ .../resources/ca/uhn/hapi/fhir/changelog/6_0_2/upgrade.md | 0 .../resources/ca/uhn/hapi/fhir/changelog/6_0_2/version.yaml | 3 +++ .../changelog/6_1_0/3642-group-bulk-export-failure.yaml | 1 + .../changelog/6_1_0/3650-application-context-loading.yaml | 6 ++++++ .../src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java | 1 + 9 files changed, 17 insertions(+) create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/changes.yaml create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/upgrade.md create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/version.yaml create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_2/upgrade.md create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_2/version.yaml create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3650-application-context-loading.yaml diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java index 66c6218cac5..8485c11d2ca 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java @@ -90,6 +90,8 @@ public enum VersionEnum { V5_7_1, V5_7_2, V6_0_0, + V6_0_1, + V6_0_2, V6_1_0 ; diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/changes.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/changes.yaml new file mode 100644 index 00000000000..ed97d539c09 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/changes.yaml @@ -0,0 +1 @@ +--- diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/upgrade.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/upgrade.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/version.yaml new file mode 100644 index 00000000000..8062cd852ab --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_1/version.yaml @@ -0,0 +1,3 @@ +--- +release-date: "2022-05-25" +codename: "Tanuki" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_2/upgrade.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_2/upgrade.md new file mode 100644 index 00000000000..e69de29bb2d diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_2/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_2/version.yaml new file mode 100644 index 00000000000..01a1ec1f110 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_0_2/version.yaml @@ -0,0 +1,3 @@ +--- +release-date: "2022-06-14" +codename: "Tanuki" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3642-group-bulk-export-failure.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3642-group-bulk-export-failure.yaml index fcae08f5138..9e8a5bf7f0c 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3642-group-bulk-export-failure.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3642-group-bulk-export-failure.yaml @@ -1,6 +1,7 @@ --- type: fix issue: 3642 +backport: 6.0.1 jira: SMILE-4383 title: "Previously, the RuleBuilder's rules surrounding Group Bulk Export would return failures too early in the case of multiple permissions. This has been corrected, and the rule will no longer prematurely return a DENY verdict, instead opting to delegate to future rules." diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3650-application-context-loading.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3650-application-context-loading.yaml new file mode 100644 index 00000000000..750ab17bea6 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_0/3650-application-context-loading.yaml @@ -0,0 +1,6 @@ +--- +type: fix +issue: 3650 +backport: 6.0.1 +title: "Removed a strict dependency on a FullTextSVC. This was causing HAPI to fail to boot when Lucene/ElasticSearch was +not enabled." diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java index 676c7c3b61b..9d28d8feaab 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java @@ -164,6 +164,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.left; import static org.apache.commons.lang3.StringUtils.trim; + /* * #%L * HAPI FHIR JPA Server