Per Review

- Add init hooks to ResourceProviders
- Update ServletContextListeners to load Registry
- Update fhir-parent to remove unused line

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>

Author: prb112

fhir-bulkdata-webapp/src/main/java/com/ibm/fhir/bulkdata/jbatch/control/JobControlContextListener.java

@@ -21,6 +21,10 @@
 import javax.servlet.annotation.WebListener;
 
 import com.ibm.fhir.config.FHIRConfiguration;
+import com.ibm.fhir.model.util.FHIRUtil;
+import com.ibm.fhir.model.util.ModelSupport;
+import com.ibm.fhir.registry.FHIRRegistry;
+import com.ibm.fhir.search.util.SearchUtil;
 
 /**
  * This Servlet Context Listener provides a hook to the BatchRuntime.
@@ -35,6 +39,19 @@ public void contextInitialized(ServletContextEvent sce) {
 
         FHIRConfiguration.setConfigHome(System.getenv("FHIR_CONFIG_HOME"));
 
+        log.fine("Initializing ModelSupport...");
+        ModelSupport.init();
+
+        log.fine("Initializing FHIRUtil...");
+        FHIRUtil.init();
+
+        log.fine("Initializing FHIRRegistry...");
+        FHIRRegistry.getInstance();
+        FHIRRegistry.init();
+
+        log.fine("Initializing SearchUtil...");
+        SearchUtil.init();
+
         try {
             @SuppressWarnings("unused")
             Subject subject = Subject.getSubject(AccessController.getContext());

fhir-parent/pom.xml

@@ -867,8 +867,6 @@
                         <maxmemory>2g</maxmemory>
                         <!-- doclint is none, otherwise build breaks -->
                         <doclint>none</doclint>
-                        <additionalparam>-Xdoclint:none
-                            -Djava.awt.headless=true</additionalparam>
                         <detectLinks>true</detectLinks>
                         <!-- control display -->
                         <author>false</author>

fhir-profile/src/test/java/com/ibm/fhir/profile/test/provider/ProviderTest.java

@@ -6,18 +6,26 @@
 
 package com.ibm.fhir.profile.test.provider;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.ibm.fhir.model.annotation.Constraint;
 import com.ibm.fhir.model.resource.StructureDefinition;
 import com.ibm.fhir.model.type.Extension;
 import com.ibm.fhir.model.util.ModelSupport;
 import com.ibm.fhir.profile.ProfileSupport;
+import com.ibm.fhir.registry.FHIRRegistry;
 import com.ibm.fhir.registry.resource.FHIRRegistryResource;
 
 public class ProviderTest {
+    @BeforeClass
+    public void before() {
+        FHIRRegistry.getInstance();
+        FHIRRegistry.init();
+    }
+
     @Test
-    public static void testProviderWithLocalLookup() throws Exception {
+    public void testProviderWithLocalLookup() throws Exception {
         TestRegistryResourceProvider provider = new TestRegistryResourceProvider();
         for (FHIRRegistryResource registryResource : provider.getRegistryResources()) {
             if (StructureDefinition.class.equals(registryResource.getResourceType())) {

fhir-registry/src/main/java/com/ibm/fhir/registry/FHIRRegistry.java

@@ -350,6 +350,15 @@ private List<FHIRRegistryResourceProvider> loadProviders() {
         return providers;
     }
 
+    /**
+     * initializes the Resource Providers.
+     */
+    public static void init() {
+        for (FHIRRegistryResourceProvider provider : getInstance().providers) {
+            provider.init();
+        }
+    }
+
     /**
      * Get the singleton instance of this class
      *

fhir-registry/src/main/java/com/ibm/fhir/registry/spi/FHIRRegistryResourceProvider.java

@@ -13,9 +13,18 @@
 import com.ibm.fhir.registry.resource.FHIRRegistryResource;
 
 /**
- * An SPI for {@link FHIRRegistryResource} instances
+ * An SPI for {@link FHIRRegistryResource} instances.
+ *
+ * When implementing this SPI, the constructor and instance variables should not make calls to the FHIRRegistry. Use the init method to call back to the Registry.
  */
 public interface FHIRRegistryResourceProvider {
+    /**
+     * Facilitates callbacks after the ServiceLoader has discovered the providers and conditionally loaded the Providers.
+     */
+    default void init() {
+        // NOP
+    }
+
     /**
      * Get the registry resource from this provider for the given resource type, url and version
      *

fhir-server/src/main/java/com/ibm/fhir/server/listener/FHIRServletContextListener.java

@@ -116,6 +116,8 @@ public void contextInitialized(ServletContextEvent event) {
             /*
              * The following inits are intended to load the Support / Util classes into the classloader.
              * Subsequently, the code activates the static values (and maps).
+             *
+             * @see JobControlContextListener to see register these settings for Bulk Data.
              */
 
             log.fine("Initializing ModelSupport...");
@@ -124,6 +126,10 @@ public void contextInitialized(ServletContextEvent event) {
             log.fine("Initializing FHIRUtil...");
             FHIRUtil.init();
 
+            log.fine("Initializing FHIRRegistry...");
+            FHIRRegistry.getInstance();
+            FHIRRegistry.init();
+
             log.fine("Initializing SearchUtil...");
             SearchUtil.init();
 
@@ -215,9 +221,6 @@ public void contextInitialized(ServletContextEvent event) {
             Boolean checkUnicodeChars = fhirConfig.getBooleanProperty(PROPERTY_CHECK_CONTROL_CHARS, Boolean.TRUE);
             FHIRModelConfig.setCheckForControlChars(checkUnicodeChars);
 
-            log.fine("Initializing FHIRRegistry...");
-            FHIRRegistry.getInstance();
-
             Boolean serverRegistryResourceProviderEnabled = fhirConfig.getBooleanProperty(PROPERTY_SERVER_REGISTRY_RESOURCE_PROVIDER_ENABLED, Boolean.FALSE);
             if (serverRegistryResourceProviderEnabled) {
                 log.info("Registering ServerRegistryResourceProvider...");