Merge branch 'master' into kbd-20201125-cql-initial-impl

src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java

@@ -53,6 +53,7 @@ public class AppProperties {
   private ClientIdStrategyEnum client_id_strategy = ClientIdStrategyEnum.ALPHANUMERIC;
   private List<String> supported_resource_types = new ArrayList<>();
   private List<Bundle.BundleType> allowed_bundle_types = null;
+  private Boolean narrative_enabled = true;
 
   private Validation validation = new Validation();
   private List<Tester> tester = ImmutableList.of(new Tester());
@@ -379,6 +380,16 @@ public class AppProperties {
     this.tester = tester;
   }
 
+  public Boolean getNarrative_enabled()
+  {
+    return narrative_enabled;
+  }
+
+  public void setNarrative_enabled(Boolean narrative_enabled)
+  {
+    this.narrative_enabled = narrative_enabled;
+  }
+
   public static class Cors {
     private Boolean allow_Credentials = true;
     private List<String> allowed_origin = ImmutableList.of("*");

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

@@ -23,6 +23,8 @@ import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
 import ca.uhn.fhir.jpa.searchparam.registry.ISearchParamRegistry;
 import ca.uhn.fhir.jpa.subscription.util.SubscriptionDebugLogInterceptor;
 import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
+import ca.uhn.fhir.narrative.INarrativeGenerator;
+import ca.uhn.fhir.narrative2.NullNarrativeGenerator;
 import ca.uhn.fhir.rest.server.ETagSupportEnum;
 import ca.uhn.fhir.rest.server.HardcodedServerAddressStrategy;
 import ca.uhn.fhir.rest.server.RestfulServer;
@@ -194,7 +196,11 @@ public class BaseJpaRestfulServer extends RestfulServer {
      * This server tries to dynamically generate narratives
      */
     FhirContext ctx = getFhirContext();
-    ctx.setNarrativeGenerator(new DefaultThymeleafNarrativeGenerator());
+    INarrativeGenerator theNarrativeGenerator =
+      appProperties.getNarrative_enabled() ?
+      new DefaultThymeleafNarrativeGenerator() :
+      new NullNarrativeGenerator();
+    ctx.setNarrativeGenerator(theNarrativeGenerator);
 
     /*
      * Default to JSON and pretty printing