From 21f5d1dcbb74674294715802182199f8f39ec813 Mon Sep 17 00:00:00 2001
From: Michael Buckley <michael.buckley@smilecdr.com>
Date: Thu, 16 Dec 2021 17:14:31 -0500
Subject: [PATCH] Fix misconfiguration

modelConfig is part of DaoConfig and should not have a separate lifecycle.
---
 .../ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java    | 4 ++--
 src/main/resources/application.yaml                        | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
index 47e06dd..80f75f5 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -160,8 +160,8 @@ public class FhirServerConfigCommon {
   }
 
   @Bean
-  public ModelConfig modelConfig(AppProperties appProperties) {
-    ModelConfig modelConfig = new ModelConfig();
+  public ModelConfig modelConfig(AppProperties appProperties, DaoConfig daoConfig) {
+    ModelConfig modelConfig = daoConfig.getModelConfig();
     modelConfig.setAllowContainsSearches(appProperties.getAllow_contains_searches());
     modelConfig.setAllowExternalReferences(appProperties.getAllow_external_references());
     modelConfig.setDefaultSearchParamsCanBeOverridden(appProperties.getAllow_override_default_search_params());
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 049d801..d7abaf2 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,6 +1,8 @@
 spring:
   flyway:
     enabled: false
+    check-location: false
+    baselineOnMigrate: true
   datasource:
     url: 'jdbc:h2:file:./target/database/h2'
     #url: jdbc:h2:mem:test_mem
@@ -12,9 +14,6 @@ spring:
     # database connection pool size
     hikari:
       maximum-pool-size: 10
-  flyway:
-    check-location: false
-    baselineOnMigrate: true
   jpa:
     properties:
       hibernate.format_sql: false
@@ -92,6 +91,8 @@ hapi:
 #    graphql_enabled: true
 #    narrative_enabled: true
 #    mdm_enabled: true
+#    local_base_urls:
+#      - https://hapi.fhir.org/baseR4
 #    partitioning:
 #      allow_references_across_partitions: false
 #      partitioning_include_in_search_hashes: false