rollback of createAssembler changes

Author: tech-idgraph

bmc-objectstorage/bmc-objectstorage-extensions/src/main/java/com/oracle/bmc/objectstorage/transfer/UploadManager.java

@@ -90,7 +90,6 @@ public boolean shouldBeRetried(@NonNull BmcException e) {
      * @param uploadDetails The upload request.
      * @return The response.
      * @throws BmcException if the upload fails for any reason.
-     * @throws IllegalArgumentException if UploadRequest
      */
     public UploadResponse upload(UploadRequest uploadDetails) {
         if (MultipartUtils.shouldUseMultipart(
@@ -172,7 +171,8 @@ private UploadResponse multipartUpload(UploadRequest uploadRequest) {
             shutdownExecutor = true;
         }
 
-        MultipartObjectAssembler assembler = createAssembler(uploadRequest, executorServiceToUse);
+        MultipartObjectAssembler assembler =
+                createAssembler(request, uploadRequest, executorServiceToUse);
         MultipartManifest manifest = null;
         try {
             manifest =
@@ -265,10 +265,15 @@ private static RetryConfiguration getRetryToUse(RetryConfiguration ...configs) {
     }
 
     @VisibleForTesting
-    protected MultipartObjectAssembler createAssembler(UploadRequest uploadRequest, ExecutorService executorService) {
-
-        PutObjectRequest request = uploadRequest.putObjectRequest;
-        RetryConfiguration retryToUse = getRetryToUse(request.getRetryConfiguration());
+    protected MultipartObjectAssembler createAssembler(
+            PutObjectRequest request,
+            UploadRequest uploadRequest,
+            ExecutorService executorService) {
+
+        // in case request != uploadRequest.putObjectRequest then choose the correct RetryConfiguration
+        RetryConfiguration retryToUse = getRetryToUse(
+                uploadRequest.putObjectRequest.getRetryConfiguration(),
+                request.getRetryConfiguration());
 
         return MultipartObjectAssembler.builder()
                 .allowOverwrite(uploadRequest.allowOverwrite)