Merge pull request #2543 from IBM/issue-2054

Remove isStorageProviderExportPublic and the legacy config impl
LinuxForHealth · Jun 23, 2021 · 2b79220 · 2b79220
2 parents e352112 + eff5586
commit 2b79220
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 260 deletions.
diff --git a/docs/src/pages/guides/FHIRServerUsersGuide.md b/docs/src/pages/guides/FHIRServerUsersGuide.md
@@ -1363,17 +1363,17 @@ For more information about Liberty JavaBatch configuration, please refer to [IBM
 
 For BulkData storage types of `ibm-cos` and `aws-s3`, the IBM FHIR Server supports two styles of accessing the `s3` bucket - virtual host and path.  In the IBM FHIR Server, `path` is the default access. [Link](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html)
 
-With path style access, the objects in a bucket are accessed using the pattern - `https://s3.region.host-name.com/bucket-name/object-key`. To configure path style access, one needs to configure the fhir-server-config.json. 
+With path style access, the objects in a bucket are accessed using the pattern - `https://s3.region.host-name.com/bucket-name/object-key`. To configure path style access, one needs to configure the fhir-server-config.json.
 
-There are three critical elements in the configuration to configure path style: 
+There are three critical elements in the configuration to configure path style:
 
 |Configuration|Details|
 |-------------|-------|
 |`endpointInternal`|the direct S3 API provider for the S3 API|
 |`endpointExternal`|the endpoint url used to generate the downloadUrl used in S3 Export|
 |`accessType`|"path", the default access type|
 
-Example of `path` based access: 
+Example of `path` based access:
 
 ``` json
 "bulkdata": {
@@ -1392,7 +1392,6 @@ Example of `path` based access:
             },
             "enableParquet": false,
             "disableBaseUrlValidation": true,
-            "exportPublic": true,
             "disableOperationOutcomes": true,
             "duplicationCheck": false,
             "validateResources": false,
@@ -1404,9 +1403,9 @@ Example of `path` based access:
 }
 ```
 
-With virtual host style access, the objects in a bucket are accessed using the pattern - `https://bucket-name.s3.region.host-name.com/object-key`. To configure virtual host style access, one needs to configure the API. 
+With virtual host style access, the objects in a bucket are accessed using the pattern - `https://bucket-name.s3.region.host-name.com/object-key`. To configure virtual host style access, one needs to configure the API.
 
-There are three critical elements in the configuration to configure virtual host style: 
+There are three critical elements in the configuration to configure virtual host style:
 
 |Configuration|Details|
 |-------------|-------|
@@ -1416,7 +1415,7 @@ There are three critical elements in the configuration to configure virtual host
 
 Note, while the endpointInternal is specified with the S3 region endpoint, the calls to the API will use the virtual host directly.
 
-Example of `host` based access: 
+Example of `host` based access:
 
 ``` json
 "bulkdata": {
@@ -1435,7 +1434,6 @@ Example of `host` based access:
             },
             "enableParquet": false,
             "disableBaseUrlValidation": true,
-            "exportPublic": true,
             "disableOperationOutcomes": true,
             "duplicationCheck": false,
             "validateResources": false,

diff --git a/...n-bulkdata/src/main/java/com/ibm/fhir/operation/bulkdata/config/ConfigurationAdapter.java b/...n-bulkdata/src/main/java/com/ibm/fhir/operation/bulkdata/config/ConfigurationAdapter.java
@@ -377,14 +377,6 @@ public interface ConfigurationAdapter {
      */
     boolean shouldStorageProviderValidateBaseUrl(String provider);
 
-    /**
-     *
-     * @param provider
-     * @return
-     */
-    @Deprecated
-    boolean isStorageProviderExportPublic(String provider);
-
     /**
      *
      * @param provider

diff --git a/...n-bulkdata/src/main/java/com/ibm/fhir/operation/bulkdata/config/ConfigurationFactory.java b/...n-bulkdata/src/main/java/com/ibm/fhir/operation/bulkdata/config/ConfigurationFactory.java
@@ -6,27 +6,17 @@
 
 package com.ibm.fhir.operation.bulkdata.config;
 
-import com.ibm.fhir.config.FHIRConfigHelper;
-import com.ibm.fhir.operation.bulkdata.config.impl.LegacyConfigurationImpl;
 import com.ibm.fhir.operation.bulkdata.config.impl.V2ConfigurationImpl;
 
 /**
  * Controls the selection of the legacy versus the new implementation.
  */
-@SuppressWarnings("deprecation")
 public class ConfigurationFactory {
     private ConfigurationFactory() {
         // No Operation
     }
 
     public static ConfigurationAdapter getInstance() {
-        boolean legacy = FHIRConfigHelper.getBooleanProperty("fhirServer/bulkdata/legacy", Boolean.FALSE);
-        ConfigurationAdapter adapter;
-        if (legacy) {
-            adapter = new LegacyConfigurationImpl();
-        } else {
-            adapter = new V2ConfigurationImpl();
-        }
-        return adapter;
+        return new V2ConfigurationImpl();
     }
 }
diff --git a/...ta/src/main/java/com/ibm/fhir/operation/bulkdata/config/impl/LegacyConfigurationImpl.java b/...ta/src/main/java/com/ibm/fhir/operation/bulkdata/config/impl/LegacyConfigurationImpl.java
diff --git a/...lkdata/src/main/java/com/ibm/fhir/operation/bulkdata/config/impl/V2ConfigurationImpl.java b/...lkdata/src/main/java/com/ibm/fhir/operation/bulkdata/config/impl/V2ConfigurationImpl.java
@@ -145,11 +145,6 @@ public boolean shouldStorageProviderValidateBaseUrl(String provider) {
         return FHIRConfigHelper.getBooleanProperty("fhirServer/bulkdata/storageProviders/" + provider + "/disableBaseUrlValidation", Boolean.FALSE);
     }
 
-    @Override
-    public boolean isStorageProviderExportPublic(String provider) {
-        return false;
-    }
-
     @Override
     public boolean shouldStorageProviderCollectOperationOutcomes(String provider) {
         // Double negation... carefully change this line.