Skip to content

Commit

Permalink
Dev (#48)
Browse files Browse the repository at this point in the history
* updated dockerfile to use root user before creating directory

* Updated hapi-fhir dependency version to 6.2.5 (#44)

* reverted dockerfile which was earlier modified to test build issue on jenkins

* Added newline in Dockerfile

* 6.4.0 (#47)

* registering ValueSetOperationProvider

* Upgrade to 5.7.0-PRE4-SNAPSHOT for testing

* Share elasticsearch configuration

* Fixed compile issues

* Fix misconfiguration

modelConfig is part of DaoConfig and should not have a separate lifecycle.

* Bump to 5.7.0-PRE8-SNAPSHOT

* Typo fix in README

* Add configuration flag to enable storing of resources in lucene index (#304)

* Add configuration flag to enable storing of resources in lucene index

* Fix build issue

* Fix code review suggestions

Co-authored-by: Jaison B <[email protected]>

* Add ES native aggregation builder for lastN

* Revert "Add ES native aggregation builder for lastN"

This reverts commit 5312f78b956d4ad4863580035972263586d616c3.

* bump version

* Update for 5.7.x changes

* Fix h2 dialect, replace mail dep

* Bump postgresql from 42.2.23 to 42.2.25

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.23 to 42.2.25.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.25)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* bump Hapi PRE version

* Bump to Hapi 6.0-SNAPSHOT and register the ValueSet provider.

* Version bump to 5.7.0 and a few other components now draw the version from parent

* Update application.yaml

Momentarily added `allow-circular-references: true`

* bump to real version

* Bump version

* Remove search coord thread pool

* Added instructions about removing Hibernate dialect

To fix the problem raised in [this](https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/318) issue.

* Bump HAPI-FHIR version

* Move to newlines

* fix to work with latest hapi-fhir

* Feature/update docker support (#319)

* Updated docker image according to discussion on https://github.com/hapifhir/hapi-fhir-jpaserver-starter/pull/305

* Added doc

* Added corrections according to comments

* Update Dockerfile

* Update build-images.yaml

Updated to default to distroless

* add dao_scheduling_enabled configuration property (#324)

* added reindexProvider to Config (#326)

* Update application.yaml

* Update application.yaml

Roll back - mistake from my side

* Bump hapi-fhir version to 'PRE5' (#329)

* Add actuator

* Bump to PRE8

* disable springboot actuator endpoints other than 'health' for security reasons (#338)

Co-authored-by: Craig McClendon <[email protected]>

* Bump to PRE9

* Update application.yaml (#345)

* add support for ms sql server (#347)

* Fix comments in Demo that lead to 404 (#348)

Co-authored-by: dotasek <[email protected]>

* updated helm chart to use v5.7.0 and latest PostgreSQL sub-chart (#346)

* Update application.yaml

Reverted to sane defaults

* Bump to PRE10

* Updated to HAPI FHIR version 5.7.2 (#349)

* Revert accidental default activation of experimental lucene indexing

* Add disclaimer for advanced_lucene_indexing

added warning to     advanced_lucene_indexing: false property

* Bump to hapi PRE11

* Expose Prometheus metrics (#355)

* Add: of-type modifier option in application.yaml (#363)

Co-authored-by: Alejandro Medina <[email protected]>

* Fix applying supported_resource_types option with list that already includes SearchParameter (#365)

* Bump pom and minimum java version

* Bump ES version

* hibernate search application properties updates.

* make lastN test pass

* Remove value set provider as it causes a boot failure without lucene

* Fix reindex provider

* Bump java version for test

* Bump to pre-01

* fix build

* Re-add valuesetoperation provider

* Disable lucene by default

* Re-add valueset operation provider

* adding smoke test files

* adding base documentation

* wip

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* bumping to non-snapshot version (#377)

* updated helm chart to use latest v6.0.1 version of the image (#382)

* updated helm chart to use latest v6.0.1 version of the image

* updated workflow to run against multiple k8s versions

* add BinaryAccessProvider to BaseJpaRestfulServer

* Update src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java

Co-authored-by: Kevin Dougan SmileCDR <[email protected]>

* Applying fix from upstream for h2 Binaries

This issue is already fixed upstream. Can be removed with next hapi version upgrade.
https://github.com/hapifhir/hapi-fhir/pull/3676

* removed wrong and duplicated config entry

`daoconfig_client_id_strategy`does not resolve and is a duplicate of `client_id_strategy`

* Added OpenTelemetry Java Agent JAR to container image (#391)

Closes #387

* changes to pom.xml to enable publishing

* fixed directory of the .war in tomcat-based image

* bulk data instrumentation included

* bulk data instrumentation turned off by default

* updated opentelemetry-java-instrumentation JAR to 1.16.0

* Better support for ARM

java17 regular doesn't have ARM, java17-debian11 does

* Updated Otel Java agent to 1.17.0

* Updated hapi-fhir to 6.1.0

* Minor Helm chart dependency updates and security improvements

* Don't run maven CI on changes to the helm chart

* updated helm chart to use version 6.1.0 of the image

* added appProperties.getInline_resource_storage_below_size() (#420)

* added appProperties.getInline_resource_storage_below_size()

* indentations

* Feat/restructuring (#422)

* Did restructuring and made repo validation interceptor an optional bean instead as it makes it more clean

* Moved construction of FHIR servlet into a bean for better reuse of others that would like to depend directly on this library

* Disabled default validation enabled

* Extract IG loading (#426)

* added back lost config entry: allowed_bundle_types (#427)

* added back lost config entry

* disabled entry

* Bump snakeyaml from 1.30 to 1.31

Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.30 to 1.31.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-1.31..snakeyaml-1.30)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix: configuration of cors

Refs: #430

* Proper close DB connection after dialect was resolved (#435)

* removed duplicated and wrong subscription code (#440)

* fixed SubscriptionDebugLogInterceptor adding logic

* switch to postgres db (#444)

* revering to H2 (#449)

* Tracking Hapi 6.2-PRE releases (#408)

* Tracking branch for 6.1 pre-releases.

* Update to 6.1.0-PRE3-SNAPSHOT

* Adjust for hapi-fhir namespace changes and version

* Adjust version to include new hapi-fhir HSearch fast path feature

* Bump hapi PRE

* Update to PRE16

* Adjust configuration class name to HAPI-FHIR HSearch namespace consolidation.
Add commented out sample properties for lucene and elastic.
Move batch.job.enabled property under spring: prefix to have it considered.

* Adjust enumeration renaming

* Repoint FHIR 6.2.0-PRE1-SNAPSHOT

* Add missing Bean to starter configuration

* Update to hapi-fhir 6.2.0-PRE2-SNAPSHOT

* Update application-integrationtest.yaml and rename it as application.yaml to make test configuration independent of prod.

* Update to hapi-fhir 6.2.0-PRE5-SNAPSHOT

* Update dep

* Bump version fix failures

* Remove dead import

* Fix up

* remove batch refs

Co-authored-by: Michael Buckley <[email protected]>
Co-authored-by: michaelabuckley <[email protected]>
Co-authored-by: juan.marchionatto <[email protected]>
Co-authored-by: Tadgh <[email protected]>

* Added hibernate.dialect for Postgress to Readme (#451)

* fixes for support of R4B / 6.2.0 (#455)

* upping hapi version to 6.2.1

* Updated Helm chart to use image 6.2.1 and latest PostgreSQL (#458)

* Bumped version (#462)

* allow interceptors to be registered via properties

* Update pom.xml to reference hapi-fhir 6.3.6-SNAPSHOT.  This hapi-fhir release contains a fix for POSTing an XML resource with comments results in a fhir_comments error (#465)

* Update pom.xml to reference hapi-fhir 6.3.4-SNAPSHOT.  This also involves renaming websocket dependencies whose names have changed since 6.2.2 (ex websocket-api to websocket-jetty-api).

* Update pom to reference logback 1.2.10 explicitly to resolve the missing StaticLoggerBinder errors.

* Fix logback issue by pulling the same logback version as hapi-fhir and setting the following system property at boot: org.springframework.boot.logging.LoggingSystem=none.   Also, fix the hapi-fhir-jpaserver-base dependency error by setting this in application.yaml: allow-bean-definition-overriding: true

* Set allow-bean-definition-overriding: true on test application.yaml as well.

* Remove lines in ExampleServerR4BIT that causes an implementation guide version error.

* Upgrade to 6.3.6-SNAPSHOT and once again disable allow-bean-definition-overriding.  Also remove the Bean for IMdmLinkDoa from StartJpaConfig and the Bean for ITermCodeSystemStorageSvc in FhirServerConfigDstu2.

* Explicitly use logback 1.2.10 for both logback-classic and logback-core to resolve StaticBinderLogger not found errors.  Also, remove explici logger disabling code in Application.java.

* Restore Application.java as well as both application.yaml files to the same as master.

* Feature/static files (#456)

* Added mapping

* Added documentation

* Remove old junit4 usage.

* Revert "Update pom.xml to reference hapi-fhir 6.3.6-SNAPSHOT.  This hapi-fhir release contains a fix for POSTing an XML resource with comments results in a fhir_comments error (#465)" (#476)

This reverts commit 9a513cd1845723c630565ac2b124d74e56491006.

* Restore rolled back changes to ExampleServerR4BIT that pass unnecessary properties that will cause problems when using hapi-fhir 6.3.6-SNAPSHOT. (#479)

* First commit to restore hapi-fhir 6.3.6-SNAPSHOT changes.  Add static code blocks to Application.java as well as all tests to System.setProperty("org.springframework.boot.logging.LoggingSystem", "none");

* Feature/index default (#475)

* Added default

* Refactored the default resolution

* Updated Helm chart to use hapi fhir image 6.2.2 (#472)

* Implement a new solution:  Instead of static code blocks disabling logging, rollback slf4j-api, logback-classic, and logback-core to older versions.   It's the addition of the rollback for slf4j-api that seems to restore logging.

* Fix tests for websocket

* Update pipeline to run integration tests.

* Initial IPS + Cql to Cr migration

* Allow Enabling IPS via config

* typo

* CQL to CR

* HAPI FHIR bump

* docs: Updated README.md. Discontinue mysql

* removed mysql-connector-java dependency since no longer supported and due to CVE-2022-3171 in transitive dependency on protobuf-java-3.19.4

* docs: Fix postgresql typo in docker-compose

* docs: Explicitly set hibnerate.search.enabled to false if database is postgresql

* refactor: Separate unrelated settings and documentation

* docs: Explicitly set hibernate.search.enabled to false if database is postgress in docker-compose instructions

* docs: Revert dislaimer in postgres

* Bump Hapi

* Fix Application error regarding multiple beans

* Add optional explicit ip config for smoke tests

* Revert "Add optional explicit ip config for smoke tests"

This reverts commit afcd2fc13138c5f105d81932a473d9afbf2398fe.

* Dev (#45)

* updated dockerfile to use root user before creating directory

* Updated hapi-fhir dependency version to 6.2.5 (#44)

* reverted dockerfile which was earlier modified to test build issue on jenkins

* Added newline in Dockerfile

* Changes how the capability statement is implemented (#46)

* Added custom property file

* SAP-1596 Updated custom property file to read values from env

* SAP-1687 Updated code to allow metadata request for server healthcheck (#7)

Co-authored-by: Shubham Parikh

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* Updated docker compose file with required env variables

* SAP-1656 Added enabled parameter for webservlet to enable/disable webapp (#4)

Co-authored-by: Shubham Parikh <[email protected]>

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* Updated code to read url pattern from environment. (#10)

* BT-96 Added OAuth support

* BT-96 Fixed indentation

* BT-96 Fixed spacing

* BT-96 Removed unwanted filed

* Changes in code as per PR suggestions

* added rest security extension in metadata

* Updated PR as per suggestions

* Updated README.md file to run the app with custom property file & env variables

* Updated PR as per suggestions

* Added user role validation in Oauth

* code refactor

* Updated code for using single oauth user role

* Updated code as per PR suggestions

* Updated code as pr PR siggestions

* Added suppoet of delete operation to admin only

* Refactored code

* Added custom search narrowing filter

* Updated code to work with oauth disabled

* Updated code to get claim name from environment

* change claim name env varible to proper name

* Updated code to use hard-coded claim name

* Changed custom mapper claim name to patient from subject

* Added rule builder to filter resources

* code refactor

* Update CustomAuthorizationInterceptor.java

* updated code to support operations on bundle resources

* Added consent rule to allow patch request

* Added oauth support for task resource

* Updated code to make refrence check generic method

* Updated method names

* Updated code as per PR suggestions

* Update code as per PR suggestion

* Updated code as per PR

* Added verification of clientId from token

* Added basic authentication

* Code refactor

* Added username/password check while checking is basic auth enabled

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* Updated docker compose file with required env variables

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* BT-80 Updated code to allow header x-api-key

* BT-140 set legacy sql builder based on hibernate to true

* BT-96 Fixed spacing

* BT-96 Removed unwanted filed

* Changes in code as per PR suggestions

* Added user role validation in Oauth

* code refactor

* Updated code for using single oauth user role

* Updated code as per PR suggestions

* Updated code as pr PR siggestions

* Added custom search narrowing filter

* Updated code to get claim name from environment

* Added rule builder to filter resources

* code refactor

* Added basic authentication

* Added hibernate physical_naming_strategy to use proper table names.

* updated code to use url mapping from environment

* Removed client id validation from oauth token

* fixed indentation

* PT-669 Updated dockerfile to use user dir path for build

* Sync 6.1.0 (#38)

* Bump dep version

* Remove javamail and replace with simple-java-mail

* WIP

* Remove print

* Remove bean override

* Bump version

* Add broken test

* Update for new style of container bean

* Bump for new version

* Update to 5.6.0-PRE7_NIH-SNAPSHOT and activate advanced index

* Disable default flyway processing

* Add local_base_urls configuration to feed DaoConfig.setTreatBaseUrlsAsLocal()

* Added OpenAPI / Swagger option

* Upgraded to 5.6.0
Subscription tests fail ...

* Bumped version of Spring Boot in order to fix same issue as https://github.com/Haulmont/jmix-security/issues/90

* Update application.yaml

See https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/292

* documented use of Values.extraEnv

* added options for specifying a PodDisruptionBudget

* simplified chart release workflow

the Ubuntu runner base image already includes Helm 3.7.0

* Support HTTPS

* Use default application.yaml

* registering ValueSetOperationProvider

* Upgrade to 5.7.0-PRE4-SNAPSHOT for testing

* Share elasticsearch configuration

* Fixed compile issues

* Fix misconfiguration

modelConfig is part of DaoConfig and should not have a separate lifecycle.

* Bump to 5.7.0-PRE8-SNAPSHOT

* Typo fix in README

* Add configuration flag to enable storing of resources in lucene index (#304)

* Add configuration flag to enable storing of resources in lucene index

* Fix build issue

* Fix code review suggestions

Co-authored-by: Jaison B <[email protected]>

* Add ES native aggregation builder for lastN

* Revert "Add ES native aggregation builder for lastN"

This reverts commit 5312f78b956d4ad4863580035972263586d616c3.

* bump version

* Update for 5.7.x changes

* Fix h2 dialect, replace mail dep

* Bump postgresql from 42.2.23 to 42.2.25

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.23 to 42.2.25.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.25)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* bump Hapi PRE version

* Bump to Hapi 6.0-SNAPSHOT and register the ValueSet provider.

* Version bump to 5.7.0 and a few other components now draw the version from parent

* Update application.yaml

Momentarily added `allow-circular-references: true`

* bump to real version

* Bump version

* Remove search coord thread pool

* Added instructions about removing Hibernate dialect

To fix the problem raised in [this](https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/318) issue.

* Bump HAPI-FHIR version

* Move to newlines

* fix to work with latest hapi-fhir

* Feature/update docker support (#319)

* Updated docker image according to discussion on https://github.com/hapifhir/hapi-fhir-jpaserver-starter/pull/305

* Added doc

* Added corrections according to comments

* Update Dockerfile

* Update build-images.yaml

Updated to default to distroless

* add dao_scheduling_enabled configuration property (#324)

* added reindexProvider to Config (#326)

* Update application.yaml

* Update application.yaml

Roll back - mistake from my side

* Bump hapi-fhir version to 'PRE5' (#329)

* Add actuator

* Bump to PRE8

* disable springboot actuator endpoints other than 'health' for security reasons (#338)

Co-authored-by: Craig McClendon <[email protected]>

* Bump to PRE9

* Update application.yaml (#345)

* add support for ms sql server (#347)

* Fix comments in Demo that lead to 404 (#348)

Co-authored-by: dotasek <[email protected]>

* updated helm chart to use v5.7.0 and latest PostgreSQL sub-chart (#346)

* Update application.yaml

Reverted to sane defaults

* Bump to PRE10

* Updated to HAPI FHIR version 5.7.2 (#349)

* Revert accidental default activation of experimental lucene indexing

* Add disclaimer for advanced_lucene_indexing

added warning to     advanced_lucene_indexing: false property

* Bump to hapi PRE11

* Expose Prometheus metrics (#355)

* Add: of-type modifier option in application.yaml (#363)

Co-authored-by: Alejandro Medina <[email protected]>

* Fix applying supported_resource_types option with list that already includes SearchParameter (#365)

* Bump pom and minimum java version

* Bump ES version

* hibernate search application properties updates.

* make lastN test pass

* Remove value set provider as it causes a boot failure without lucene

* Fix reindex provider

* Bump java version for test

* Bump to pre-01

* fix build

* Re-add valuesetoperation provider

* Disable lucene by default

* Re-add valueset operation provider

* adding smoke test files

* adding base documentation

* wip

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* bumping to non-snapshot version (#377)

* updated helm chart to use latest v6.0.1 version of the image (#382)

* updated helm chart to use latest v6.0.1 version of the image

* updated workflow to run against multiple k8s versions

* Tracking branch for 6.1 pre-releases.

* add BinaryAccessProvider to BaseJpaRestfulServer

* Update to 6.1.0-PRE3-SNAPSHOT

* Update src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java

Co-authored-by: Kevin Dougan SmileCDR <[email protected]>

* Adjust for hapi-fhir namespace changes and version

* Adjust version to include new hapi-fhir HSearch fast path feature

* Bump hapi PRE

* Update to PRE16

* Adjust configuration class name to HAPI-FHIR HSearch namespace consolidation.
Add commented out sample properties for lucene and elastic.
Move batch.job.enabled property under spring: prefix to have it considered.

* Bump to release

* Add missing bean

* Added custom property file

* SAP-1596 Updated custom property file to read values from env

* SAP-1687 Updated code to allow metadata request for server healthcheck (#7)

Co-authored-by: Shubham Parikh

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* BT-80 Updated code to allow header x-api-key

* Updated docker compose file with required env variables

* SAP-1656 Added enabled parameter for webservlet to enable/disable webapp (#4)

Co-authored-by: Shubham Parikh <[email protected]>

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* Updated code to read url pattern from environment. (#10)

* BT-140 set legacy sql builder based on hibernate to true

* BT-96 Added OAuth support

* BT-96 Fixed indentation

* BT-96 Fixed spacing

* BT-96 Removed unwanted filed

* Changes in code as per PR suggestions

* added rest security extension in metadata

* code refactor

* Updated PR as per suggestions

* Updated README.md file to run the app with custom property file & env variables

* Updated PR as per suggestions

* Added user role validation in Oauth

* code refactor

* Updated code for using single oauth user role

* Updated code as per PR suggestions

* Updated code as pr PR siggestions

* Added suppoet of delete operation to admin only

* Refactored code

* Added custom search narrowing filter

* Updated code to work with oauth disabled

* Updated code to get claim name from environment

* change claim name env varible to proper name

* Updated code to use hard-coded claim name

* Changed custom mapper claim name to patient from subject

* Added rule builder to filter resources

* code refactor

* Update CustomAuthorizationInterceptor.java

* updated code to support operations on bundle resources

* Added consent rule to allow patch request

* Added oauth support for task resource

* Updated code to make refrence check generic method

* Updated method names

* Updated code as per PR suggestions

* Update code as per PR suggestion

* Updated code as per PR

* Added verification of clientId from token

* Added basic authentication

* Code refactor

* Added username/password check while checking is basic auth enabled

* Added custom property file

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* Updated docker compose file with required env variables

* Update docker-compose.yml

Updated file as per suggestions

* Added custom property file

* SAP-1596 Updated custom property file to read values from env

* SAP-1667 Added interceptor for authorization (#5)

* SAP-1667 Added interceptor for authorization

* SAP-1667 Removed unused space.

* SAP-1667 Added newline at the end of the file.

Co-authored-by: Shubham Parikh <>

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* BT-96 Fixed spacing

* BT-96 Removed unwanted filed

* added rest security extension in metadata

* code refactor

* Update JpaRestfulServer.java

* Updated PR as per suggestions

* Added user role validation in Oauth

* code refactor

* Updated code for using single oauth user role

* Updated code as per PR suggestions

* Updated code as pr PR siggestions

* Added custom search narrowing filter

* Updated code to get claim name from environment

* Added rule builder to filter resources

* code refactor

* Added oauth support for task resource

* Added verification of clientId from token

* Added hibernate physical_naming_strategy to use proper table names.

* updated code to use url mapping from environment

* Removed client id validation from oauth token

* fixed indentation

* Updated fork with upstream

* Removed unwanted files

* removed unwanted imports and files merged during rebase 6.1.0

* removed unwanted imports and files merged during rebase 6.1.0

* removed unwanted imports and files merged during rebase 6.1.0

* removed unwanted imports and files merged during rebase 6.1.0

* Updated application-custom.yaml

* commented allow-bean-definition-overriding

* Sync application-custom.yaml

* commented unused hibernate settings

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Michael Buckley <[email protected]>
Co-authored-by: jkv <[email protected]>
Co-authored-by: chgl <[email protected]>
Co-authored-by: ppalacin <[email protected]>
Co-authored-by: Ally Shaban <[email protected]>
Co-authored-by: Vadim Peretokin <[email protected]>
Co-authored-by: Jaison B <[email protected]>
Co-authored-by: Jaison B <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Patrick Werner <[email protected]>
Co-authored-by: Håkan MacLean <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Joel Schneider (NMDP) <[email protected]>
Co-authored-by: craig mcclendon <[email protected]>
Co-authored-by: Craig McClendon <[email protected]>
Co-authored-by: dotasek <[email protected]>
Co-authored-by: dotasek <[email protected]>
Co-authored-by: michaelabuckley <[email protected]>
Co-authored-by: Alejandro Medina <[email protected]>
Co-authored-by: Alejandro Medina <[email protected]>
Co-authored-by: Dennis Verspuij <[email protected]>
Co-authored-by: markiantorno <[email protected]>
Co-authored-by: Ibrohim Kholilul Islam <[email protected]>
Co-authored-by: Ibrohim Kholilul Islam <[email protected]>
Co-authored-by: Kevin Dougan SmileCDR <[email protected]>
Co-authored-by: juan.marchionatto <[email protected]>
Co-authored-by: jmarchionatto <[email protected]>
Co-authored-by: Shubham Parikh <[email protected]>
Co-authored-by: Hank Wallace <[email protected]>
Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>
Co-authored-by: Shubham Parikh <[email protected]>
Co-authored-by: vpanhale <[email protected]>

* Updated docker file to use /user/app dir (#39)

* PT-689 split url (#40)

* PT-689 splitting the URL of datasource

* PT-689 splitting the URL of datasource

* PT-689 adding an easier ability to switch to another DB server

* PT-689 standardizing variable names

Co-authored-by: Vadim Dribinsky <[email protected]>

* Sync 6.2.2 (#41)

* Bump dep version

* Remove javamail and replace with simple-java-mail

* WIP

* Remove print

* Remove bean override

* Bump version

* Add broken test

* Update for new style of container bean

* Bump for new version

* Update to 5.6.0-PRE7_NIH-SNAPSHOT and activate advanced index

* Disable default flyway processing

* Add local_base_urls configuration to feed DaoConfig.setTreatBaseUrlsAsLocal()

* Added OpenAPI / Swagger option

* Upgraded to 5.6.0
Subscription tests fail ...

* Bumped version of Spring Boot in order to fix same issue as https://github.com/Haulmont/jmix-security/issues/90

* Update application.yaml

See https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/292

* documented use of Values.extraEnv

* added options for specifying a PodDisruptionBudget

* simplified chart release workflow

the Ubuntu runner base image already includes Helm 3.7.0

* Support HTTPS

* Use default application.yaml

* registering ValueSetOperationProvider

* Upgrade to 5.7.0-PRE4-SNAPSHOT for testing

* Share elasticsearch configuration

* Fixed compile issues

* Fix misconfiguration

modelConfig is part of DaoConfig and should not have a separate lifecycle.

* Bump to 5.7.0-PRE8-SNAPSHOT

* Typo fix in README

* Add configuration flag to enable storing of resources in lucene index (#304)

* Add configuration flag to enable storing of resources in lucene index

* Fix build issue

* Fix code review suggestions

Co-authored-by: Jaison B <[email protected]>

* Add ES native aggregation builder for lastN

* Revert "Add ES native aggregation builder for lastN"

This reverts commit 5312f78b956d4ad4863580035972263586d616c3.

* bump version

* Update for 5.7.x changes

* Fix h2 dialect, replace mail dep

* Bump postgresql from 42.2.23 to 42.2.25

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.23 to 42.2.25.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.25)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* bump Hapi PRE version

* Bump to Hapi 6.0-SNAPSHOT and register the ValueSet provider.

* Version bump to 5.7.0 and a few other components now draw the version from parent

* Update application.yaml

Momentarily added `allow-circular-references: true`

* bump to real version

* Bump version

* Remove search coord thread pool

* Added instructions about removing Hibernate dialect

To fix the problem raised in [this](https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/318) issue.

* Bump HAPI-FHIR version

* Move to newlines

* fix to work with latest hapi-fhir

* Feature/update docker support (#319)

* Updated docker image according to discussion on https://github.com/hapifhir/hapi-fhir-jpaserver-starter/pull/305

* Added doc

* Added corrections according to comments

* Update Dockerfile

* Update build-images.yaml

Updated to default to distroless

* add dao_scheduling_enabled configuration property (#324)

* added reindexProvider to Config (#326)

* Update application.yaml

* Update application.yaml

Roll back - mistake from my side

* Bump hapi-fhir version to 'PRE5' (#329)

* Add actuator

* Bump to PRE8

* disable springboot actuator endpoints other than 'health' for security reasons (#338)

Co-authored-by: Craig McClendon <[email protected]>

* Bump to PRE9

* Update application.yaml (#345)

* add support for ms sql server (#347)

* Fix comments in Demo that lead to 404 (#348)

Co-authored-by: dotasek <[email protected]>

* updated helm chart to use v5.7.0 and latest PostgreSQL sub-chart (#346)

* Update application.yaml

Reverted to sane defaults

* Bump to PRE10

* Updated to HAPI FHIR version 5.7.2 (#349)

* Revert accidental default activation of experimental lucene indexing

* Add disclaimer for advanced_lucene_indexing

added warning to     advanced_lucene_indexing: false property

* Bump to hapi PRE11

* Expose Prometheus metrics (#355)

* Add: of-type modifier option in application.yaml (#363)

Co-authored-by: Alejandro Medina <[email protected]>

* Fix applying supported_resource_types option with list that already includes SearchParameter (#365)

* Bump pom and minimum java version

* Bump ES version

* hibernate search application properties updates.

* make lastN test pass

* Remove value set provider as it causes a boot failure without lucene

* Fix reindex provider

* Bump java version for test

* Bump to pre-01

* fix build

* Re-add valuesetoperation provider

* Disable lucene by default

* Re-add valueset operation provider

* adding smoke test files

* adding base documentation

* wip

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* Update src/test/smoketest/SMOKE_TEST.md

Co-authored-by: Ken Stevens <[email protected]>

* bumping to non-snapshot version (#377)

* updated helm chart to use latest v6.0.1 version of the image (#382)

* updated helm chart to use latest v6.0.1 version of the image

* updated workflow to run against multiple k8s versions

* add BinaryAccessProvider to BaseJpaRestfulServer

* Update src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java

Co-authored-by: Kevin Dougan SmileCDR <[email protected]>

* Applying fix from upstream for h2 Binaries

This issue is already fixed upstream. Can be removed with next hapi version upgrade.
https://github.com/hapifhir/hapi-fhir/pull/3676

* removed wrong and duplicated config entry

`daoconfig_client_id_strategy`does not resolve and is a duplicate of `client_id_strategy`

* Added OpenTelemetry Java Agent JAR to container image (#391)

Closes #387

* changes to pom.xml to enable publishing

* fixed directory of the .war in tomcat-based image

* bulk data instrumentation included

* bulk data instrumentation turned off by default

* updated opentelemetry-java-instrumentation JAR to 1.16.0

* Better support for ARM

java17 regular doesn't have ARM, java17-debian11 does

* Updated Otel Java agent to 1.17.0

* Updated hapi-fhir to 6.1.0

* Minor Helm chart dependency updates and security improvements

* Don't run maven CI on changes to the helm chart

* updated helm chart to use version 6.1.0 of the image

* added appProperties.getInline_resource_storage_below_size() (#420)

* added appProperties.getInline_resource_storage_below_size()

* indentations

* Feat/restructuring (#422)

* Did restructuring and made repo validation interceptor an optional bean instead as it makes it more clean

* Moved construction of FHIR servlet into a bean for better reuse of others that would like to depend directly on this library

* Disabled default validation enabled

* Extract IG loading (#426)

* added back lost config entry: allowed_bundle_types (#427)

* added back lost config entry

* disabled entry

* Bump snakeyaml from 1.30 to 1.31

Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.30 to 1.31.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-1.31..snakeyaml-1.30)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix: configuration of cors

Refs: #430

* Proper close DB connection after dialect was resolved (#435)

* removed duplicated and wrong subscription code (#440)

* fixed SubscriptionDebugLogInterceptor adding logic

* switch to postgres db (#444)

* revering to H2 (#449)

* Tracking Hapi 6.2-PRE releases (#408)

* Tracking branch for 6.1 pre-releases.

* Update to 6.1.0-PRE3-SNAPSHOT

* Adjust for hapi-fhir namespace changes and version

* Adjust version to include new hapi-fhir HSearch fast path feature

* Bump hapi PRE

* Update to PRE16

* Adjust configuration class name to HAPI-FHIR HSearch namespace consolidation.
Add commented out sample properties for lucene and elastic.
Move batch.job.enabled property under spring: prefix to have it considered.

* Adjust enumeration renaming

* Repoint FHIR 6.2.0-PRE1-SNAPSHOT

* Add missing Bean to starter configuration

* Update to hapi-fhir 6.2.0-PRE2-SNAPSHOT

* Update application-integrationtest.yaml and rename it as application.yaml to make test configuration independent of prod.

* Update to hapi-fhir 6.2.0-PRE5-SNAPSHOT

* Update dep

* Bump version fix failures

* Remove dead import

* Fix up

* remove batch refs

Co-authored-by: Michael Buckley <[email protected]>
Co-authored-by: michaelabuckley <[email protected]>
Co-authored-by: juan.marchionatto <[email protected]>
Co-authored-by: Tadgh <[email protected]>

* Added hibernate.dialect for Postgress to Readme (#451)

* fixes for support of R4B / 6.2.0 (#455)

* upping hapi version to 6.2.1

* Updated Helm chart to use image 6.2.1 and latest PostgreSQL (#458)

* Bumped version (#462)

* Added custom property file

* SAP-1596 Updated custom property file to read values from env

* SAP-1687 Updated code to allow metadata request for server healthcheck (#7)

Co-authored-by: Shubham Parikh

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* Updated docker compose file with required env variables

* SAP-1656 Added enabled parameter for webservlet to enable/disable webapp (#4)

Co-authored-by: Shubham Parikh <[email protected]>

* DEV-769: Update from upstream branch (#9)

* Adding environment variables to override hapi properties file settings

* Only override existing hapi properties with env ones

* Start Release branch for 5.1.0

* Add property for multitenancy

* Get test passing

* Add repo

* Bump to current release

* Rework the JPA server class a bit

* Updating Dockerfile to use context code instead of re-cloning the hapi-fhir-jpaserver-starter project. Still re-builds the base hapi libraries, though.

* Adding .dockerignore file to improve the efficiency of docker builds

* Added support for configurable client ID strategy

* Bump mysql-connector-java from 8.0.11 to 8.0.16

Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.11 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.11...8.0.16)

Signed-off-by: dependabot[bot] <[email protected]>

* Resolve some compile errors

* Fix EMPI rules json

* Have EmpiSettings actually return an EmpiSettings bean

* Update readme

* Remove dead space

* Update property

* Update README to include Docker info

* Prepare for release

* Merge master

* Removing commands from Dockerfile that clone and build the core hapi-fhir libraries since it is not required for building hapi-fhir-jpaserver-starter; it pulls the core libraries from the maven repo regardless.

* Combining base Dockerfile with main dockerfile so that there is a single image related to hapi-jpaserver-starter

* Update Dockerfile

Added caching of maven dependency resolving

* Fix #122 - EMPI error on startup when EMPI not enabled

Co-authored-by: Peter Micuch <[email protected]>
Co-authored-by: Vladimir Nemergut <[email protected]>
Co-authored-by: jamesagnew <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: jvi <[email protected]>
Co-authored-by: Sean McIlvenna <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Tadgh <[email protected]>
Co-authored-by: Ken Stevens <[email protected]>
Co-authored-by: Jens Kristian Villadsen <[email protected]>

* Updated code to read url pattern from environment. (#10)

* BT-96 Added OAuth support

* BT-96 Fixed indentation

* BT-96 Fixed spacing

* BT-96 Removed unwanted filed

* Changes in code as per PR suggestions

* added rest security extension in metadata

* Updated PR as per suggestions

* Updated README.md file to run the app with custom property file & env variables

* Updated PR as per suggestions

* Added user role validation in Oauth

* code refactor

* Updated code for using single oauth user role

* Updated code as per PR suggestions

* Updated code as pr PR siggestions

* Added suppoet of delete operation to admin only

* Refactored code

* Added custom search narrowing filter

* Updated code to work with oauth disabled

* Updated code to get claim name from environment

* change claim name env varible to proper name

* Updated code to use hard-coded claim name

* Changed custom mapper claim name to patient from subject

* Added rule builder to filter resources

* code refactor

* Update CustomAuthorizationInterceptor.java

* updated code to support operations on bundle resources

* Added consent rule to allow patch request

* Added oauth support for task resource

* Updated code to make refrence check generic method

* Updated method names

* Updated code as per PR suggestions

* Update code as per PR suggestion

* Updated code as per PR

* Added verification of clientId from token

* Added basic authentica…
  • Loading branch information
Show file tree
Hide file tree
Showing 37 changed files with 505 additions and 139 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
with:
java-version: 17
- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B package --file pom.xml verify
8 changes: 0 additions & 8 deletions .vscode/settings.json

This file was deleted.

68 changes: 29 additions & 39 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,35 +201,11 @@ hapi-fhir/hapi-fhir-jpaserver-starter:latest

Much of this HAPI starter project can be configured using the yaml file in _src/main/resources/application.yaml_. By default, this starter project is configured to use H2 as the database.

### MySql configuration
### MySQL configuration

To configure the starter app to use MySQL, instead of the default H2, update the application.yaml file to have the following:
HAPI FHIR JPA Server does not support MySQL as it is deprecated.

```yaml
spring:
datasource:
url: 'jdbc:mysql://localhost:3306/hapi_dstu3'
username: admin
password: admin
driverClassName: com.mysql.jdbc.Driver
```
Also, make sure you are not setting the Hibernate dialect explicitly, in other words remove any lines similar to:
```
hibernate.dialect: {some none MySQL dialect}
```
On some systems, it might be necessary to override hibernate's default naming strategy. The naming strategy must be set using spring.jpa.hibernate.physical_naming_strategy.
```yaml
spring:
jpa:
hibernate.physical_naming_strategy: NAME_OF_PREFERRED_STRATEGY
```
On linux systems or when using docker mysql containers, it will be necessary to review the case-sensitive setup for
mysql schema identifiers. See https://dev.mysql.com/doc/refman/8.0/en/identifier-case-sensitivity.html. We suggest you
set `lower_case_table_names=1` during mysql startup.
See more at https://hapifhir.io/hapi-fhir/docs/server_jpa/database_support.html

### PostgreSQL configuration

Expand All @@ -238,13 +214,16 @@ To configure the starter app to use PostgreSQL, instead of the default H2, updat
```yaml
spring:
datasource:
url: 'jdbc:postgresql://localhost:5432/hapi_dstu3'
url: 'jdbc:postgresql://localhost:5432/hapi'
username: admin
password: admin
driverClassName: org.postgresql.Driver
jpa:
properties:
hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect
hibernate.search.enabled: false

# Then comment all hibernate.search.backend.*
```

Because the integration tests within the project rely on the default H2 database configuration, it is important to either explicity skip the integration tests during the build process, i.e., `mvn install -DskipTests`, or delete the tests altogether. Failure to skip or delete the tests once you've configured PostgreSQL for the datasource.driver, datasource.url, and hibernate.dialect as outlined above will result in build errors and compilation failure.
Expand Down Expand Up @@ -275,6 +254,16 @@ Because the integration tests within the project rely on the default H2 database
NOTE: MS SQL Server by default uses a case-insensitive codepage. This will cause errors with some operations - such as when expanding case-sensitive valuesets (UCUM) as there are unique indexes defined on the terminology tables for codes.
It is recommended to deploy a case-sensitive database prior to running HAPI FHIR when using MS SQL Server to avoid these and potentially other issues.

## Adding custom interceptors
Custom interceptors can be registered with the server by including the property `hapi.fhir.custom-interceptor-classes`. This will take a comma separated list of fully-qualified class names which will be registered with the server.
Interceptors will be discovered in one of two ways:

1) discovered from the Spring application context as existing Beans (can be used in conjunction with `hapi.fhir.custom-bean-packages`) or registered with Spring via other methods

or

2) classes will be instantiated via reflection if no matching Bean is found

## Customizing The Web Testpage UI

The UI that comes with this server is an exact clone of the server available at [http://hapi.fhir.org](http://hapi.fhir.org). You may skin this UI if you'd like. For example, you might change the introductory text or replace the logo with your own.
Expand Down Expand Up @@ -327,19 +316,23 @@ reached at http://localhost:8080/.
In order to use another port, change the `ports` parameter
inside `docker-compose.yml` to `8888:8080`, where 8888 is a port of your choice.

The docker compose set also includes my MySQL database, if you choose to use MySQL instead of H2, change the following
properties in application.yaml:
The docker compose set also includes PostgreSQL database, if you choose to use PostgreSQL instead of H2, change the following
properties in `src/main/resources/application.yaml`:

```yaml
spring:
datasource:
url: 'jdbc:mysql://hapi-fhir-mysql:3306/hapi'
url: 'jdbc:postgresql://hapi-fhir-postgres:5432/hapi'
username: admin
password: admin
driverClassName: com.mysql.jdbc.Driver
```
driverClassName: org.postgresql.Driver
jpa:
properties:
hibernate.dialect: ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect
hibernate.search.enabled: false
Also, make sure you are not setting the Hibernate Dialect explicitly, see more details in the section about MySQL.
# Then comment all hibernate.search.backend.*
```

## Running hapi-fhir-jpaserver directly from IntelliJ as Spring Boot
Make sure you run with the maven profile called ```boot``` and NOT also ```jetty```. Then you are ready to press debug the project directly without any extra Application Servers.
Expand Down Expand Up @@ -376,8 +369,6 @@ Run the configuration.

Point your browser (or fiddler, or what have you) to `http://localhost:8080/hapi/baseDstu3/Patient`

It is important to use MySQL5Dialect when using MySQL version 5+.

## Enabling Subscriptions

The server may be configured with subscription support by enabling properties in the [application.yaml](https://github.com/hapifhir/hapi-fhir-jpaserver-starter/blob/master/src/main/resources/application.yaml) file:
Expand All @@ -388,9 +379,9 @@ The server may be configured with subscription support by enabling properties in

- `hapi.fhir.subscription.websocket_enabled` - Enables websocket subscriptions. With this enabled, your server will accept incoming websocket connections on the following URL (this example uses the default context path and port, you may need to tweak depending on your deployment environment): [ws://localhost:8080/websocket](ws://localhost:8080/websocket)

## Enabling CQL
## Enabling Clinical Reasoning

Set `hapi.fhir.cql_enabled=true` in the [application.yaml](https://github.com/hapifhir/hapi-fhir-jpaserver-starter/blob/master/src/main/resources/application.yaml) file to enable [Clinical Quality Language](https://cql.hl7.org/) on this server.
Set `hapi.fhir.cr_enabled=true` in the [application.yaml](https://github.com/hapifhir/hapi-fhir-jpaserver-starter/blob/master/src/main/resources/application.yaml) file to enable [Clinical Quality Language](https://cql.hl7.org/) on this server.

## Enabling MDM (EMPI)

Expand Down Expand Up @@ -459,4 +450,3 @@ docker run --rm -it -p 8080:8080 \
```

You can configure the agent using environment variables or Java system properties, see <https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/> for details.

12 changes: 4 additions & 8 deletions charts/hapi-fhir-jpaserver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@ dependencies:
version: 12.1.2
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
appVersion: 6.2.1
version: 0.11.0
appVersion: 6.2.2
version: 0.11.1
annotations:
artifacthub.io/license: Apache-2.0
artifacthub.io/changes: |
# When using the list of objects option the valid supported kinds are
# added, changed, deprecated, removed, fixed, and security.
- kind: changed
description: updated HAPI FHIR JPA Server app image version to v6.2.1
description: updated HAPI FHIR JPA Server app image version to v6.2.2
- kind: changed
description: |
Reduced `startupProbe.initialDelaySeconds` to a more realistic `30` from `60`.
This should allow the server to become ready quicker and recover from failures faster.
- kind: changed
description: "⚠️ BREAKING CHANGE: updated included postgresql chart to v12, which is based on PostgreSQL 15.1"
description: updated curl used by helm tests to version to v7.87.0
4 changes: 2 additions & 2 deletions charts/hapi-fhir-jpaserver/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# HAPI FHIR JPA Server Starter Helm Chart

![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.1](https://img.shields.io/badge/AppVersion-6.2.1-informational?style=flat-square)
![Version: 0.11.1](https://img.shields.io/badge/Version-0.11.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.2](https://img.shields.io/badge/AppVersion-6.2.2-informational?style=flat-square)

This helm chart will help you install the HAPI FHIR JPA Server in a Kubernetes environment.

Expand Down Expand Up @@ -32,7 +32,7 @@ helm install --render-subchart-notes hapi-fhir-jpaserver hapifhir/hapi-fhir-jpas
| image.pullPolicy | string | `"IfNotPresent"` | image pullPolicy to use |
| image.registry | string | `"docker.io"` | registry where the HAPI FHIR server image is hosted |
| image.repository | string | `"hapiproject/hapi"` | the path inside the repository |
| image.tag | string | `"v6.2.1@sha256:8d1b4c1c8abd613f685267a3dda494d87aba4cff449eed39902a6ece2c086f3c"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. |
| image.tag | string | `"v6.2.2@sha256:9c4e8af94d81ac0049dbb589e4cd855bf78c9c13be6f6844e814c63d63545b44"` | the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image. |
| imagePullSecrets | list | `[]` | image pull secrets to use when pulling the image |
| ingress.annotations | object | `{}` | provide any additional annotations which may be required. Evaluated as a template. |
| ingress.enabled | bool | `false` | whether to create an Ingress to expose the FHIR server HTTP endpoint |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
restartPolicy: Never
containers:
- name: test-metadata-endpoint
image: docker.io/curlimages/curl:7.86.0@sha256:cfdeba7f88bb85f6c87f2ec9135115b523a1c24943976a61fbf59c4f2eafd78e
image: docker.io/curlimages/curl:7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd
command: ["curl", "--fail-with-body"]
args: ["http://{{ include "hapi-fhir-jpaserver.fullname" . }}:{{ .Values.service.port }}/fhir/metadata?_summary=true"]
{{- with .Values.restrictedContainerSecurityContext }}
Expand All @@ -32,7 +32,7 @@ spec:
exec:
command: ["true"]
- name: test-patient-endpoint
image: docker.io/curlimages/curl:7.86.0@sha256:cfdeba7f88bb85f6c87f2ec9135115b523a1c24943976a61fbf59c4f2eafd78e
image: docker.io/curlimages/curl:7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd
command: ["curl", "--fail-with-body"]
args: ["http://{{ include "hapi-fhir-jpaserver.fullname" . }}:{{ .Values.service.port }}/fhir/Patient?_count=1&_summary=true"]
{{- with .Values.restrictedContainerSecurityContext }}
Expand All @@ -53,7 +53,7 @@ spec:
exec:
command: ["true"]
- name: test-metrics-endpoint
image: docker.io/curlimages/curl:7.86.0@sha256:cfdeba7f88bb85f6c87f2ec9135115b523a1c24943976a61fbf59c4f2eafd78e
image: docker.io/curlimages/curl:7.87.0@sha256:f7f265d5c64eb4463a43a99b6bf773f9e61a50aaa7cefaf564f43e42549a01dd
command: ["curl", "--fail-with-body"]
args: ["http://{{ include "hapi-fhir-jpaserver.fullname" . }}:{{ .Values.metrics.service.port }}/actuator/prometheus"]
{{- with .Values.restrictedContainerSecurityContext }}
Expand Down
2 changes: 1 addition & 1 deletion charts/hapi-fhir-jpaserver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
# -- the path inside the repository
repository: hapiproject/hapi
# -- the image tag. As of v5.7.0, this is the `distroless` flavor by default, add `-tomcat` to use the Tomcat-based image.
tag: "v6.2.1@sha256:8d1b4c1c8abd613f685267a3dda494d87aba4cff449eed39902a6ece2c086f3c"
tag: "v6.2.2@sha256:9c4e8af94d81ac0049dbb589e4cd855bf78c9c13be6f6844e814c63d63545b44"
# -- image pullPolicy to use
pullPolicy: IfNotPresent

Expand Down
35 changes: 30 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>6.2.5</version>
<version>6.4.0</version>
</parent>

<artifactId>hapi-fhir-jpaserver-starter</artifactId>
<packaging>war</packaging>

<properties>
<java.version>11</java.version>
<logback-classic.version>1.2.11</logback-classic.version>
<slf4j-api.version>1.7.25</slf4j-api.version>
</properties>

<prerequisites>
Expand All @@ -43,12 +45,12 @@
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-api</artifactId>
<artifactId>websocket-jetty-api</artifactId>
<version>${jetty_version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
<artifactId>websocket-jetty-client</artifactId>
<version>${jetty_version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -131,7 +133,7 @@
<!-- This dependency includes the JPA CQL Server -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-cql</artifactId>
<artifactId>hapi-fhir-storage-cr</artifactId>
<version>${project.version}</version>
</dependency>
<!-- This dependency includes the JPA MDM Server -->
Expand Down Expand Up @@ -160,6 +162,12 @@
<version>${project.version}</version>
<classifier>classes</classifier>
</dependency>
<!-- This dependency is used to include the IPS Base Implementation -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-ips</artifactId>
<version>${project.version}</version>
</dependency>

<!-- HAPI-FHIR uses Logback for logging support. The logback library is included automatically by Maven as a part of the hapi-fhir-base dependency, but you also need to include a logging library. Logback
is used here, but log4j would also be fine. -->
Expand Down Expand Up @@ -262,7 +270,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<artifactId>websocket-jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -373,6 +381,23 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-classic.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback-classic.version}</version>
</dependency>

</dependencies>

<build>
Expand Down
39 changes: 34 additions & 5 deletions src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
@EnableConfigurationProperties
public class AppProperties {

private Boolean cql_enabled = false;
private Boolean cr_enabled = false;
private Boolean ips_enabled = false;
private Boolean openapi_enabled = false;
private Boolean mdm_enabled = false;
private boolean advanced_lucene_indexing = false;
Expand Down Expand Up @@ -72,6 +73,8 @@ public class AppProperties {
private Boolean install_transitive_ig_dependencies = true;
private Map<String, ImplementationGuide> implementationGuides = null;

private String staticLocation = null;

private Boolean lastn_enabled = false;
private boolean store_resource_in_lucene_index_enabled = false;
private NormalizedQuantitySearchLevel normalized_quantity_search_level = NormalizedQuantitySearchLevel.NORMALIZED_QUANTITY_SEARCH_NOT_SUPPORTED;
Expand All @@ -82,9 +85,26 @@ public class AppProperties {
private Integer bundle_batch_pool_size = 20;
private Integer bundle_batch_pool_max_size = 100;
private final List<String> local_base_urls = new ArrayList<>();

private final List<String> custom_interceptor_classes = new ArrayList<>();

public List<String> getCustomInterceptorClasses() {
return custom_interceptor_classes;
}


public String getStaticLocation() {
return staticLocation;
}

public void setStaticLocation(String staticLocation) {
this.staticLocation = staticLocation;
}


private Oauth oauth = new Oauth();


public Boolean getOpenapi_enabled() {
return openapi_enabled;
}
Expand Down Expand Up @@ -133,14 +153,23 @@ public void setPartitioning(Partitioning partitioning) {
this.partitioning = partitioning;
}

public Boolean getCql_enabled() {
return cql_enabled;
public Boolean getCr_enabled() {
return cr_enabled;
}

public void setCql_enabled(Boolean cql_enabled) {
this.cql_enabled = cql_enabled;
public void setCr_enabled(Boolean cr_enabled) {
this.cr_enabled = cr_enabled;
}

public Boolean getIps_enabled() {
return ips_enabled;
}

public void setIps_enabled(Boolean ips_enabled) {
this.ips_enabled = ips_enabled;
}


public Boolean getMdm_enabled() {
return mdm_enabled;
}
Expand Down
Loading

0 comments on commit 3454104

Please sign in to comment.