Update

dcm4che · Feb 15, 2023 · fe56140 · fe56140
1 parent 672bb84
commit fe56140
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/dcm4chee-arc-storage-cloud/src/main/java/org/dcm4chee/arc/storage/cloud/CloudStorage.java b/dcm4chee-arc-storage-cloud/src/main/java/org/dcm4chee/arc/storage/cloud/CloudStorage.java
@@ -43,7 +43,6 @@
 import com.google.common.hash.HashCode;
 import org.dcm4che3.net.Device;
 import org.dcm4che3.util.AttributesFormat;
-import org.dcm4chee.arc.conf.BinaryPrefix;
 import org.dcm4chee.arc.conf.StorageDescriptor;
 import org.dcm4chee.arc.metrics.MetricsService;
 import org.dcm4chee.arc.storage.AbstractStorage;
@@ -94,7 +93,6 @@ public void upload(BlobStoreContext context, InputStream in, long length,
     private final AttributesFormat pathFormat;
     private final String container;
     private final BlobStoreContext context;
-    private final String uploaderOverride;
     private String api;
     private int count;
 
@@ -116,7 +114,6 @@ protected CloudStorage(StorageDescriptor descriptor, MetricsService metricsServi
             endpoint = api.substring(endApi + 1);
             api = api.substring(0, endApi);
         }
-        this.uploaderOverride = descriptor.getProperty("uploaderOverride", "");
         ContextBuilder ctxBuilder = ContextBuilder.newBuilder(api);
         String identity = descriptor.getProperty("identity", null);
         if (identity != null)
@@ -200,18 +197,13 @@ private void upload(InputStream in, WriteContext ctx) throws IOException {
         }
         long length = ctx.getContentLength();
         Uploader uploader = STREAMING_UPLOADER;
-        switch(uploaderOverride) {
-            case "do":
+        switch (api) {
+            case "aws-s3":
+                uploader = new S3Uploader();
+                break;
+            case "azureblob":
+                uploader = new AzureBlobUploader();
                 break;
-            default:
-                switch(api) {
-                    case "aws-s3":
-                        uploader = new S3Uploader();
-                        break;
-                    case "azureblob":
-                        uploader = new AzureBlobUploader();
-                        break;
-                }
         }
 
         uploader.upload(context, in, length, blobStore, container, storagePath);