issue #3242 - update $everything to use ResourcesConfigAdapter

1. add the FHIRVersionParam to the OperationContext 2. use that with a ResourcesConfigAdapter to get the list of applicable resource types in EverythingOperation.getDefaultIncludedResourceTypes Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
LinuxForHealth · Mar 9, 2022 · 7bc561c · 7bc561c
1 parent a3a4ded
commit 7bc561c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/fhir-server-spi/src/main/java/com/ibm/fhir/server/spi/operation/FHIROperationContext.java b/fhir-server-spi/src/main/java/com/ibm/fhir/server/spi/operation/FHIROperationContext.java
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2017, 2021
+ * (C) Copyright IBM Corp. 2017, 2022
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -84,6 +84,11 @@ public enum Type { SYSTEM, RESOURCE_TYPE, INSTANCE }
      */
     public static final String PROPNAME_RESPONSE_PARAMETERS = "RESPONSE_PARAMETERS";
 
+    /**
+     * The FHIRVersionParam for this invocation
+     */
+    public static final String PROPNAME_FHIR_VERSION = "FHIR_VERSION";
+
     private final Type type;
     private final String code;
     private Map<String, Object> properties = null;

diff --git a/fhir-server/src/main/java/com/ibm/fhir/server/util/FHIRRestHelper.java b/fhir-server/src/main/java/com/ibm/fhir/server/util/FHIRRestHelper.java
@@ -2623,6 +2623,7 @@ private void setOperationContextProperties(FHIROperationContext operationContext
         operationContext.setProperty(FHIROperationContext.PROPNAME_REQUEST_BASE_URI, getRequestBaseUri(resourceTypeName));
         operationContext.setProperty(FHIROperationContext.PROPNAME_REQUEST_PARAMETERS, requestParameters);
         operationContext.setProperty(FHIROperationContext.PROPNAME_PERSISTENCE_IMPL, persistence);
+        operationContext.setProperty(FHIROperationContext.PROPNAME_FHIR_VERSION, fhirVersion);
     }
 
     @Override
@@ -2991,6 +2992,7 @@ public void validateInteraction(Interaction interaction, String resourceType) th
         List<String> interactions = null;
         boolean resourceValid = true;
 
+        // TODO: replace with ResourcesConfigAdapter
         // Retrieve the interaction configuration
         try {
             StringBuilder defaultInteractionsConfigPath = new StringBuilder(FHIRConfiguration.PROPERTY_RESOURCES).append("/Resource/")

diff --git a/...ation-everything/src/main/java/com/ibm/fhir/operation/everything/EverythingOperation.java b/...ation-everything/src/main/java/com/ibm/fhir/operation/everything/EverythingOperation.java
@@ -24,8 +24,11 @@
 import com.ibm.fhir.config.FHIRConfigHelper;
 import com.ibm.fhir.config.FHIRConfiguration;
 import com.ibm.fhir.config.FHIRRequestContext;
+import com.ibm.fhir.config.Interaction;
 import com.ibm.fhir.config.PropertyGroup;
+import com.ibm.fhir.config.ResourcesConfigAdapter;
 import com.ibm.fhir.core.FHIRConstants;
+import com.ibm.fhir.core.FHIRVersionParam;
 import com.ibm.fhir.core.HTTPHandlingPreference;
 import com.ibm.fhir.exception.FHIROperationException;
 import com.ibm.fhir.model.resource.Bundle;
@@ -225,7 +228,8 @@ protected Parameters doInvoke(FHIROperationContext operationContext, Class<? ext
 
         List<String> defaultResourceTypes = new ArrayList<String>(0);
         try {
-            defaultResourceTypes = getDefaultIncludedResourceTypes(resourceHelper);
+            FHIRVersionParam fhirVersion = (FHIRVersionParam) operationContext.getProperty(FHIROperationContext.PROPNAME_FHIR_VERSION);
+            defaultResourceTypes = getDefaultIncludedResourceTypes(resourceHelper, fhirVersion);
         } catch (FHIRSearchException e) {
             throw new Error("There has been an error retrieving the list of included resources of the $everything operation.", e);
         }
@@ -395,22 +399,14 @@ protected List<String> getOverridenIncludedResourceTypes(Parameters parameters,
      * @return the list of patient subresources that will be included in the $everything operation
      * @throws FHIRSearchException
      */
-    private List<String> getDefaultIncludedResourceTypes(FHIRResourceHelpers resourceHelper) throws FHIRSearchException {
+    private List<String> getDefaultIncludedResourceTypes(FHIRResourceHelpers resourceHelper, FHIRVersionParam fhirVersion) throws FHIRSearchException {
         List<String> resourceTypes = new ArrayList<>(compartmentHelper.getCompartmentResourceTypes(PATIENT));
 
         try {
-            List<String> supportedResourceTypes = FHIRConfigHelper.getSupportedResourceTypes();
-            // Examine the resource types to see if they support SEARCH
-            for (String resourceType: supportedResourceTypes) {
-                try {
-                    resourceHelper.validateInteraction(FHIRResourceHelpers.Interaction.SEARCH, resourceType);
-                } catch (FHIROperationException e) {
-                    if (LOG.isLoggable(Level.FINE)) {
-                        LOG.fine("Removing resourceType " + resourceType + " because it does not support SEARCH");
-                    }
-                    supportedResourceTypes.remove(resourceType);
-                }
-            }
+            PropertyGroup resourcesGroup = FHIRConfigHelper.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES);
+            ResourcesConfigAdapter configAdapter = new ResourcesConfigAdapter(resourcesGroup, fhirVersion);
+            Set<String> supportedResourceTypes = configAdapter.getSupportedResourceTypes(Interaction.SEARCH);
+
             if (LOG.isLoggable(Level.FINE)) {
                 StringBuilder resourceTypeBuilder = new StringBuilder(supportedResourceTypes.size());
                 resourceTypeBuilder.append("supportedResourceTypes are: ");
@@ -421,12 +417,10 @@ private List<String> getDefaultIncludedResourceTypes(FHIRResourceHelpers resourc
                 LOG.fine(resourceTypeBuilder.toString());
             }
 
-            // Need to have this if check to support server config files that do not specify resources
-            if (!supportedResourceTypes.isEmpty()) {
-                resourceTypes.retainAll(supportedResourceTypes);
-            }
+            resourceTypes.retainAll(supportedResourceTypes);
         } catch (Exception e) {
-            FHIRSearchException exceptionWithIssue = new FHIRSearchException("There has been an error retrieving the list of supported resource types of the $everything operation.", e);
+            FHIRSearchException exceptionWithIssue = new FHIRSearchException("There has been an error retrieving the list "
+                    + "of supported resource types for the $everything operation.", e);
             LOG.throwing(this.getClass().getName(), "doInvoke", exceptionWithIssue);
             throw exceptionWithIssue;
         }