Commit Graph

973 Commits

Author SHA1 Message Date
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
dotasek
d9e7e9c568 Explicit profile for smoke test invocation (#627) 2024-01-04 15:45:12 +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
Matteo Steccolini
e7b1b89271 reverting profiles to the current situation in the master branch: spring-boot:run by defaults starts tomcat, while the jetty profile enables jetty
added a fix to run the generated war with spring-boot on tomcat, due to issues with spring-boot 3.2.0 https://github.com/spring-projects/spring-boot/issues/38585
the jar generated with jetty doesn't work at the moment
2024-01-03 08:45:48 +01:00
Matteo Steccolini
f24968a47d Update smoke-tests.yml
jetty-maven-plugin is obsolete, and jetty-ee10-maven-plugin doesn't work at the moment. Using spring-boot to run local server.
2023-12-22 15:32:20 +01:00
Matteo Steccolini
bf683478bc fix for tests not working
added required jetty dependencies through spring-boot-starter-jetty so this is the only dependency with scope=testing and transitive dependencies (core jetty libraries) aren't marked as such

mvn -P jetty spring-boot:run seems to work
2023-12-22 11:49:14 +01:00
Matteo Steccolini
142191b2bd unused imports in Application.java 2023-12-21 16:58:28 +01:00
Matteo Steccolini
36598c2e7e created a separated tomcat profile to run spring-boot with default server 2023-12-21 16:52:16 +01:00
Matteo Steccolini
a2a7e7681a fix test/compile/runtime dependencies of jetty to get spring-boot runnability with jetty and tomcat, tests, and deployment as web application 2023-12-21 16:32:12 +01:00
Matteo Steccolini
e49a9219af servletWebServerFactory definitely breaks things (spring-boot not starting with tomcat, and running as web application doesn't work if the bean is not at least lazy)
I'm removing it, it shouldn't be necessary (to run spring-spring boot with jetty, it's enough to enable the jetty profile?)
2023-12-21 11:54:23 +01:00
Matteo Steccolini
eafa7cfb4c servletWebServerFactory made lazy to run as web application 2023-12-18 09:07:59 +01:00
Matteo Steccolini
f9ce228adc Merge remote-tracking branch 'origin/ja_20231203_hapi_7_0' into stmsat_hapi_7_0
# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/Application.java
2023-12-18 08:17:33 +01:00
Matteo Steccolini
c8a71c2e64 removed version of junit dependencies to use the managed version 2023-12-15 15:53:07 +01:00
James Agnew
55e06699de Merge branch 'master' into ja_20231203_hapi_7_0 2023-12-15 09:42:24 -05:00
Matteo Steccolini
00eb114a50 bump parent 6.11.5 -> 6.11.7 2023-12-15 15:27:14 +01:00
Matteo Steccolini
0172a58140 Merge branch 'master' into stmsat_hapi_7_0 2023-12-15 15:05:32 +01:00
James Agnew
b746573253 Enable subscriptions and upgrade to jetty 12 2023-12-15 08:56:17 -05:00
Jens Kristian Villadsen
9c557e2c80 Cleaned up for running boot as default (#620) 2023-12-05 19:56:31 +01:00
Levi
0be636c169 Affected Issue(s): #606 (#612)
What this commit has achieved:
1. Externalized location of "mdm-rules.json" in the `AppProperties`
2. More info about the `ResourceLoader` interface is available at
https://docs.spring.io/spring-framework/reference/core/resources.html#resources-resourceloader
2023-12-04 21:10:21 +01: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
dotasek
31f9f0b00b Bump github actions used in docker build workflow (#619) 2023-12-04 21:04:08 +01:00
James Agnew
0133663fbc Update to HAPI FHIR 7.0.0 Draft 2023-12-03 14:23:05 -05:00
Kevin Dougan SmileCDR
b578ee39f6 Merge pull request #610 from hapifhir/cr-6.9.6-snapshot
6.10.0 release merge with Clinical Reasoning config
2023-11-28 13:30:18 -05:00
Justin McKelvy
d1c6b0661d new ide formatting 2023-11-28 11:08:59 -07:00
Justin McKelvy
79f631acf4 indent reformat 2023-11-28 11:00:38 -07:00
Justin McKelvy
1715ee5aaf remove indents 2023-11-28 10:57:56 -07:00
Justin McKelvy
82f1007478 reformatting indents 2023-11-28 10:52:58 -07:00
Justin McKelvy
a490d1a693 update margins 2023-11-28 10:19:29 -07:00
Justin McKelvy
efe1106969 reset appProperties 2023-11-28 10:16:56 -07:00
Justin McKelvy
0aa001b6f6 spotless apply formatting 2023-11-28 07:19:13 -07:00
Justin McKelvy
8c18c7dbc7 fix redundant variables from merge 2023-11-27 08:42:56 -07:00
Justin McKelvy
e2f49e3090 Merge branch 'master' into cr-6.9.6-snapshot 2023-11-27 08:40:31 -07:00
dotasek
f147c8315e Bump setup-java and checkout versions in github actions (#613)
* Bump setup-java and checkout versions

* Set java distribution
2023-11-24 22:11:12 +01:00
Justin McKelvy
8a0e947d3e fix missing patient ref in unit test 2023-11-24 12:25:43 -07:00
Justin McKelvy
3303cb2bbb match master appProperties 2023-11-24 11:14:23 -07:00
Jens Kristian Villadsen
1f7d25c5e5 Feat/ig install (#601)
* Added IG operation providers for run time installation of IG's

* Refactored conditions for enabling the provider

* Refactoring

* Disable it by default in config as well

* document package install feature

---------

Co-authored-by: Jose Costa Teixeira <jose.a.teixeira@gmail.com>
2023-11-23 22:25:32 +01:00
Justin McKelvy
23ef1d3c32 Merge branch 'master' into cr-6.9.6-snapshot 2023-11-22 12:39:19 -07:00
c-schuler
c0b89800f1 Added fix for HAPI CDS Hooks request extensions element json parsing error 2023-11-22 12:37:04 -07:00
dotasek
b0ae4f292d Merge pull request #598 from hapifhir/rel_6_9_tracking
Bump HAPI version
2023-11-22 13:52:59 -05:00
dotasek
4bfa53789f Merge remote-tracking branch 'origin/master' into rel_6_9_tracking 2023-11-22 13:24:39 -05:00
dotasek
d55aa31145 Bump parent pom to version 6.10.0 2023-11-22 13:24:28 -05:00
Justin McKelvy
aaa8a1f8cc Merge branch 'master' into cr-6.9.6-snapshot 2023-11-22 09:44:51 -07:00
Justin McKelvy
0cf1ec8a7e removed basecr config due to spring errors 2023-11-21 15:30:44 -07:00
craig mcclendon
21d51be451 remove redundant/unused reload-existing-ig property (#607) 2023-11-21 18:47:02 +01:00
dotasek
5ae8349fbf Merge remote-tracking branch 'origin/master' into rel_6_9_tracking 2023-11-08 09:45:56 -05:00
chgl
3640bd03a2 Updated helm chart to use image v6.8.0 and some minor improvements (#600) 2023-10-28 15:14:02 +02:00
dotasek
49c3db27d6 Merge remote-tracking branch 'origin/master' into rel_6_9_tracking 2023-10-24 14:41:13 -04:00
dotasek
afce59e5ad Bump to 6.9.10-SNAPSHOT 2023-10-24 14:40:59 -04: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
d2b421a58b Merge pull request #594 from hapifhir/jkiddo-patch-1
Update application.yaml
2023-10-13 15:25:19 -04:00