Commit Graph

153 Commits

Author SHA1 Message Date
darth.cav
b81e2abe81 Add Elasticsearch index prefix configuration (#891)
* Add Elasticsearch configuration section to application.yaml

* Add configuration for reindexing resources upon search parameter change

* Add Elasticsearch client configuration for testing

* Update logback dependencies because of a security issue and enable resource filtering in pom.xml

* Add application name and tester configuration to application.yaml. Refactor hibernate properties

* Add custom Elasticsearch configuration to create ElasticsearchClient bean

* Add index prefix configuration for Elasticsearch indices

* Fix Elasticsearch URI format in test initialization

* Refactor ElasticsearchConfig for improved readability and code style consistency (spotless:apply)

* Refactor ElasticsearchConfig for improved readability and code style consistency (spotless:apply)

* Update index prefix in application.yaml for Elasticsearch configuration

* Enhance index prefix validation and add sanitization method for Elasticsearch index names

* Merged with master in upstream

* Refactor ElasticsearchBootSvcImpl and ElasticsearchConfig for improved readability (mvn spotless)

* Comment out custom_content_path in application.yaml for clarity

* - Refactor application.yaml for improved structure and readability;
- Add PostgresLucenePatientIT integration test; and
- Update testcontainers dependencies to avoid compatibility issues with newer Docker APIs.

* Refactor PostgresLucenePatientIT to use external configuration file for test properties

* Add integration tests for PostgreSQL and Elasticsearch with dynamic configuration

* Increase socket timeout in CdsHooksServletIT for improved stability during tests

* Remove deprecated tester configuration from application.yaml
2026-01-20 15:32:24 +01:00
craig mcclendon
9512ce1ddf enable the test profile in unit tests (#882) 2025-11-16 14:02:02 +01:00
Shamus Husheer
cf003331e4 Add configurable filesystem binary storage (fix #860) (#864)
* Add configurable filesystem binary storage (fix #860)

* Refine binary storage configuration handling

* Refine binary storage bean wiring

* Refine binary storage conditional beans

* Add integration coverage for binary storage configs

* Exercise binary storage via REST integration tests

* Update src/main/resources/application.yaml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Ubuntu <ubuntu@ip-172-31-35-43.eu-west-2.compute.internal>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-10-131.eu-west-2.compute.internal>
Co-authored-by: Jens Kristian Villadsen <jenskristianvilladsen@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-09 14:39:01 +02:00
Jens Kristian Villadsen
d76662c9e9 Feature/cds config (#857)
* Added MCP support using SSE on http://localhost:8080/sse

* Reverted change that IntelliJ complains about

* Pre-rework

* Cleaned up the code a fair bit

* Renamed

* Renamed

* Running spotless

* Reuse FhirContext in result serialization to make MCP server work with R5

* Added support for transactions

* PoC tool for CDS Hooks

* some cleanup

* Upgrade of model protocol

* Added comments

* Removed field injection ... CDS to be changed to AutoConfig eventually

* Adjusted to new builder pattern

* Update src/main/java/ca/uhn/fhir/rest/server/MCPBridge.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* A bit of restructuring

* More rework

* Removing (suspected unnecessary) formatting

* Add more example doc

* Added a smoke- / passthrough-test

* Applied spotless

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/main/java/ca/uhn/fhir/rest/server/McpCdsBridge.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/main/java/ca/uhn/fhir/rest/server/McpCdsBridge.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Formatting

* Added some documentation

* spotless cares about MD?

* Reverting back to default values

* minor refinements

* Fixed CDS hooks configuration

* Fixed some wirings

* Readded missing elements

* getting closer to get test running again ...

* applying review

* Readded exclude

* Bumped spring-ai deps

* added agents file

* Updated according to review

---------

Co-authored-by: Ádám Z. Kövér <adamzkover@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-01 22:17:07 +02:00
Jens Kristian Villadsen
9576cfa9b5 Feature/elastic on boot (#856)
* Fixing up elastic for Spring Boot

* Adding class shadowing for issue reported on https://github.com/hapifhir/hapi-fhir/pull/7242

* Formatting

* corrected condition

* fix import

* fix2

* crappy fix3

* fix actuator endpoint

* Simplified expression

* Ironed out a few legacy issues

* more rework

* major overhaul

* Disabling invalid test

* Reverting back to defaults for text searches

* Added default hibernate settings from the EnvironmentHelper

* Formatting

* Added comment on class shadow

* Added missing default
2025-09-22 23:41:43 +02:00
Jens Kristian Villadsen
680255ff62 Feature/mcp (#846)
* Added MCP support using SSE on http://localhost:8080/sse

* Reverted change that IntelliJ complains about

* Pre-rework

* Cleaned up the code a fair bit

* Renamed

* Renamed

* Running spotless

* Reuse FhirContext in result serialization to make MCP server work with R5

* Added support for transactions

* PoC tool for CDS Hooks

* some cleanup

* Upgrade of model protocol

* Added comments

* Removed field injection ... CDS to be changed to AutoConfig eventually

* Adjusted to new builder pattern

* Update src/main/java/ca/uhn/fhir/rest/server/MCPBridge.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* A bit of restructuring

* More rework

* Removing (suspected unnecessary) formatting

* Add more example doc

* Added a smoke- / passthrough-test

* Applied spotless

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

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

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/main/java/ca/uhn/fhir/rest/server/McpCdsBridge.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/main/java/ca/uhn/fhir/rest/server/McpCdsBridge.java

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Formatting

* Added some documentation

* spotless cares about MD?

* Reverting back to default values

* minor refinements

* Fixed CDS hooks configuration

* Fixed some wirings

* Revert "Fixed some wirings"

This reverts commit c9d3bc0b3b6756d7b15f5d2cf6100c99784fb868.

* Revert "Fixed CDS hooks configuration"

This reverts commit 67c4279100bf14432c164906235ea6348ee8af22.

---------

Co-authored-by: Ádám Z. Kövér <adamzkover@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-09-17 06:51:19 +02:00
winfriedgerlach
8224cae131 some cleanup (#840)
* some cleanup

* results from mvn spotless:apply

* fix contructor --> constructor

* revert change to fix CdsHooksServletIT

* revert change to charts README.md

* bump chart version, required due to changes in README.md
2025-08-19 20:00:34 +02:00
James Agnew
92485be847 Merge branch 'master' into ja_20250502_improve_dialect_handling 2025-06-25 17:05:08 -04:00
Saurav Sharma
e29dc540e3 feat: add support to enable search index full text (#828)
Signed-off-by: Saurav Sharma <appdroiddeveloper@gmail.com>
2025-06-08 11:38:52 +02:00
James Agnew
b695610178 Add test 2025-06-02 18:03:26 +02:00
Jens Kristian Villadsen
ba0589ce77 Moved terminology config out of being R4 specific. It now applies to all versions (#822) 2025-05-13 15:39:09 +02:00
Jens Kristian Villadsen
a7da4f2181 Added 's' 2025-04-29 13:24:39 +02:00
Jens Kristian Villadsen
9244310dfc Merge branch 'feat/remote-terminology-support' of github.com:jkiddo/hapi-fhir-jpaserver-starter into feat/remote-terminology-support 2025-04-29 13:17:07 +02:00
Jens Kristian Villadsen
b9f6e853ac Update src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-04-29 12:08:42 +02:00
Jens Kristian Villadsen
eb9081e01d Merge branch 'hapi-master' into feat/remote-terminology-support 2025-04-29 10:03:35 +02:00
Jens Kristian Villadsen
00a10777f6 Add test so verify hybrid 2025-03-31 23:17:29 +02:00
Jens Kristian Villadsen
ec0af6cae0 Added simple pass-through test for remote validation 2025-03-26 23:19:50 +01:00
Brenin Rhodes
f64f1beba6 fix config 2025-03-19 06:52:42 -06:00
Luke deGruchy
f716f99ad5 Add TestCdsHooksConfig. 2025-03-19 06:52:42 -06:00
Luke deGruchy
49f47db115 Try to fix injection errors. 2025-03-19 06:52:42 -06:00
Luke deGruchy
8147c4ea4b Everything compiles but there are still injection errors. 2025-03-19 06:52:42 -06:00
craig mcclendon
8e7cb0e0a1 registered diff provider (#791)
* registered  provider

* spotless fix
2025-03-13 15:34:28 +01:00
James Agnew
3cdd23368a Test fix 2025-02-12 13:58:42 -05:00
James Agnew
ac5dbb975e Merge branch 'rel_7_8_tracking' of github.com:hapifhir/hapi-fhir-jpaserver-starter into rel_7_8_tracking 2025-02-12 10:55:28 -05:00
James Agnew
509d5ffce0 Add support for Database Partition Mode 2025-02-12 10:54:38 -05:00
dotasek
8ef1d4669c Merge remote-tracking branch 'origin/master' into rel_7_8_tracking 2025-02-11 10:51:05 -05:00
Joel Schneider
e7cc34d789 use URI constructor instead of string concatenation, to avoid having static code analysis tool complain about "Concatenating user-controlled input into a URL" security issue 2025-01-27 10:06:21 -06:00
dotasek
b3761a499e Bump parent version + fix CQL test
See diff in https://github.com/cqframework/clinical-reasoning/pull/579/files
2025-01-02 11:12:26 -05:00
dotasek
103fd012c0 Update to HAPI 7.6.0 (#731)
* Bump to HAPI 7.5.0-SNAPSHOT

* Bump to latest HAPI version + fix config

* Bump to latest HAPI version + fix CR config + spotless

* Bump parent version to 7.5.4-SNAPSHOT

* Update to HAPI Release 7.6.0

---------

Co-authored-by: Brenin Rhodes <brenin@alphora.com>
2024-11-22 18:58:31 +01:00
craig mcclendon
69fede99a4 add property to turn on userRequestRetryVersionConflictsInterceptor (#752) 2024-11-11 20:29:54 +01:00
craig mcclendon
85aab81237 add comments to explain non-intuitive logic in test 2024-10-31 12:27:33 -05:00
craig mcclendon
04de3e738f fix intermittent error with CDS test 2024-10-29 14:51:10 -05:00
Jens Kristian Villadsen
40e5b4c10d Feature/fixing prometheus (#745)
* Fixing prometheus so that it actually works. Also seems related to https://github.com/micrometer-metrics/micrometer/issues/5093

* cleaning up override

* Limiting exposure

* Added docs

* Added smoketest for prometheus endpoint

* Removing metrics and prometheus exposure by default

* Removing 'info'
Adding parameterized tests for endpoints

* Reintroduced 'info'

* Remove info

* Adjusted comment
2024-10-04 17:25:33 +02:00
dotasek
cb6fa7d4c8 Merge remote-tracking branch 'origin/master' into rel_7_3_tracking 2024-07-02 12:00:55 -04:00
Brenin Rhodes
6b98988c6f Update Clinical Reasoning plugin (#692)
* Reproducing issues with CR/HAPI cds-hooks processing

* Add new $questionnaire operation

* Update StarterIpsConfig.java

* Update pom.xml

* Fixes for configuration properties

* Update VS Code launch properties

* Fixes for CQL logging

* Update pom.xml

* Remove unused threaded option

* Update to 7.1.7

* Fix some CR defaults

* Update to new snapshot

* Update pom.xml

* Fix test settings

* Do not make prefetch calls if all items are present

* Add alternative application.yaml for CDS settings.

* Add CdsHook tests and documentation

* Comment out custom prefetch until it is more mature

* Removal of DataEndpoint parameter is not longer needed

* Fix debug logging setting being overwritten

* Revert change

* Remove unused class

* Adding Rec10 Test

* Disable test until fixed

* fix tests

---------

Co-authored-by: c-schuler <hoofschu@gmail.com>
Co-authored-by: Jonathan Percival <jonathan.i.percival@gmail.com>
2024-06-30 12:14:35 +02:00
dotasek
db238aa9ec Fix subscription settings config in integration tests 2024-06-17 18:46:12 -04:00
dotasek
8f731a29ee WIP bump HAPI 2024-06-17 17:10:19 -04:00
David Conlan
4226648867 Allow custom operations/providers in addition to interceptors (#654)
* Allow custom operations/providers to be added in the same way custom interceptors are currently loaded

* Add new property to documentation and default yaml file

* Add test for custom operation
2024-03-03 17:39:03 +01:00
Matteo Steccolini
d762c18765 requested changes: upgrade to hapi-fhir-7.0.0-SNAPSHOT, removed empty JpaStarterWebsocketDispatcherConfig and references
unrequested changes: commons-logging dependency marked provided (to avoid redundant jar inclusion), removed unused imports in classes that were modified
2024-01-25 08:53:29 +01:00
Matteo Steccolini
0a95e71cbc fixed integration test execution; tests are now done with tomcat, unless "jetty" profile is active (in which case they're done with jetty)
Test class JpaStarterWebsocketDispatcherConfig emptied, not sure if necessary (it's now missing jetty dependencies)
2024-01-03 15:12:38 +01:00
James Agnew
55e06699de Merge branch 'master' into ja_20231203_hapi_7_0 2023-12-15 09:42:24 -05:00
James Agnew
b746573253 Enable subscriptions and upgrade to jetty 12 2023-12-15 08:56:17 -05:00
Levi
41a537efb2 Affected Issue(s): #611 (#617)
* Affected Issue(s): #611

What this commit has achieved:
1. MDM requires an implementation of `INicknameSvc`, it was instantiated
in `NicknameServiceConfig`
The error message regarding this was:
```
APPLICATION FAILED TO START

Description:

Parameter 2 of method matcherFactory in
ca.uhn.fhir.jpa.mdm.config.MdmCommonConfig required a bean of type
'ca.uhn.fhir.jpa.nickname.INicknameSvc' that could not be found.

Action:

Consider defining a bean of type 'ca.uhn.fhir.jpa.nickname.INicknameSvc'
in your configuration.
```
2. MDM requires the subscription of type message
The error message regarding this was:
```
2023-12-01 11:34:03
org.springframework.beans.factory.BeanCreationException: Error creating
bean with name 'mdmSubmitterInterceptorLoader': Invocation of init
method failed; nested exception is
ca.uhn.fhir.context.ConfigurationException: HAPI-2421: MDM requires
Message Subscriptions to be enabled in the Storage Settings
```

* Affected Issue(s): #611

What this commit has achieved:
1. Added Integration Test for future-proof
2023-12-04 21:07:51 +01:00
James Agnew
0133663fbc Update to HAPI FHIR 7.0.0 Draft 2023-12-03 14:23:05 -05:00
Justin McKelvy
23ef1d3c32 Merge branch 'master' into cr-6.9.6-snapshot 2023-11-22 12:39:19 -07:00
Justin McKelvy
0cf1ec8a7e removed basecr config due to spring errors 2023-11-21 15:30:44 -07:00
Brenin Rhodes
408da72cf4 Add settings for CDS Hooks and use latest hapi-fhir-cr configs 2023-10-19 06:50:29 -06:00
dotasek
0afe6ae050 Fix formatting 2023-10-12 16:01:12 -04:00
dotasek
ce0d7d43d2 Fix ExampleServerR4IT, restrict config to specific tests 2023-10-12 10:53:46 -04:00
dotasek
bcd10350fe Formatting 2023-10-12 10:27:27 -04:00