Thanks.
I’ve changed the code slightly, your first change is now a configuration setting. Maybe the second change should be one also?
I’ve been using this repo recently https://github.com/nhsconnect/careconnect-java-examples/tree/master/careconnect-hapi-jpa-dstu2-springboot Thats aimed at running a FHIR server locally (using spring boot) rather than on an application server. We used it to build the UK version of Argonaut (https://nhsconnect.github.io/CareConnectAPI/explore.html)