Refactored createAssembler and unit tests to remove redundant param

Author: tech-idgraph

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

@@ -90,6 +90,7 @@ 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(
@@ -171,8 +172,7 @@ private UploadResponse multipartUpload(UploadRequest uploadRequest) {
             shutdownExecutor = true;
         }
 
-        MultipartObjectAssembler assembler =
-                createAssembler(request, uploadRequest, executorServiceToUse);
+        MultipartObjectAssembler assembler = createAssembler(uploadRequest, executorServiceToUse);
         MultipartManifest manifest = null;
         try {
             manifest =
@@ -265,15 +265,10 @@ private static RetryConfiguration getRetryToUse(RetryConfiguration ...configs) {
     }
 
     @VisibleForTesting
-    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());
+    protected MultipartObjectAssembler createAssembler(UploadRequest uploadRequest, ExecutorService executorService) {
+
+        PutObjectRequest request = uploadRequest.putObjectRequest;
+        RetryConfiguration retryToUse = getRetryToUse(request.getRetryConfiguration());
 
         return MultipartObjectAssembler.builder()
                 .allowOverwrite(uploadRequest.allowOverwrite)

bmc-objectstorage/bmc-objectstorage-extensions/src/test/java/com/oracle/bmc/objectstorage/transfer/UploadManagerTest.java

@@ -242,7 +242,6 @@ public void upload_multipartUpload() {
                 new UploadManager(objectStorage, uploadConfiguration) {
                     @Override
                     protected MultipartObjectAssembler createAssembler(
-                            PutObjectRequest request,
                             UploadRequest uploadRequest,
                             ExecutorService executorService) {
                         return assembler;
@@ -280,7 +279,6 @@ public void upload_multipartUpload_enforceMd5() {
                 new UploadManager(objectStorage, uploadConfiguration) {
                     @Override
                     protected MultipartObjectAssembler createAssembler(
-                            PutObjectRequest request,
                             UploadRequest uploadRequest,
                             ExecutorService executorService) {
                         return assembler;
@@ -320,7 +318,6 @@ public void upload_multipartUpload_duplicatableStream_canNotParallelize() {
                 new UploadManager(objectStorage, uploadConfiguration) {
                     @Override
                     protected MultipartObjectAssembler createAssembler(
-                            PutObjectRequest request,
                             UploadRequest uploadRequest,
                             ExecutorService executorService) {
                         return assembler;
@@ -357,7 +354,6 @@ public void upload_multipartUpload_exception() {
                 new UploadManager(objectStorage, uploadConfiguration) {
                     @Override
                     protected MultipartObjectAssembler createAssembler(
-                            PutObjectRequest request,
                             UploadRequest uploadRequest,
                             ExecutorService executorService) {
                         return assembler;
@@ -391,7 +387,6 @@ public void upload_multipartUpload_exception_noAbort() {
                 new UploadManager(objectStorage, uploadConfiguration) {
                     @Override
                     protected MultipartObjectAssembler createAssembler(
-                            PutObjectRequest request,
                             UploadRequest uploadRequest,
                             ExecutorService executorService) {
                         return assembler;
@@ -449,7 +444,6 @@ public void multipartUpload_progressReporter() {
                 new UploadManager(objectStorage, getMultipartUploadConfiguration()) {
                     @Override
                     protected MultipartObjectAssembler createAssembler(
-                            PutObjectRequest request,
                             UploadRequest uploadRequest,
                             ExecutorService executorService) {
                         return assembler;
@@ -646,7 +640,6 @@ public void upload_multipartUpload_with_minConfiguration() {
                 new UploadManager(objectStorage, uploadConfiguration) {
                     @Override
                     protected MultipartObjectAssembler createAssembler(
-                            PutObjectRequest request,
                             UploadRequest uploadRequest,
                             ExecutorService executorService) {
                         return assembler;