Skip to content

Commit 02f6f48

Browse files
author
Anirav Kareddy
committed
Fixed the second PR round of reviews
1 parent bf2be6e commit 02f6f48

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/main/java/software/amazon/encryption/s3/internal/ConvertSDKRequests.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@
1212

1313
public class ConvertSDKRequests {
1414

15+
/**
16+
* Converts a CreateMultipartUploadRequest to a PutObjectRequest. This conversion is necessary when
17+
* Instruction File PutObject is enabled and a multipart upload is performed.The method copies all the
18+
* relevant fields from the CreateMultipartUploadRequest to the PutObjectRequest.
19+
* @param request The CreateMultipartUploadRequest to convert
20+
* @return The converted PutObjectRequest
21+
* @throws IllegalArgumentException if the request contains an invalid field
22+
*/
1523
public static PutObjectRequest convertRequest(CreateMultipartUploadRequest request) {
16-
/*Converts a CreateMultipartUploadRequest into a PutObjectRequest by setting optional fields needed for
17-
putInstructionFile operation.
18-
*/
1924
final PutObjectRequest.Builder output = PutObjectRequest.builder();
2025
request
2126
.toBuilder()
@@ -138,11 +143,15 @@ public static PutObjectRequest convertRequest(CreateMultipartUploadRequest reque
138143
.overrideConfiguration(request.overrideConfiguration().orElse(null))
139144
.build();
140145
}
141-
146+
/**
147+
* Converts a PutObjectRequest to CreateMultipartUploadRequest.This conversion is necessary to convert an
148+
* original PutObjectRequest into a CreateMultipartUploadRequest to initiate the
149+
* multipart upload while maintaining the original request's configuration.
150+
* @param request The PutObjectRequest to convert
151+
* @return The converted CreateMultipartUploadRequest
152+
* @throws IllegalArgumentException if the request contains an invalid field
153+
*/
142154
public static CreateMultipartUploadRequest convertRequest(PutObjectRequest request) {
143-
/*Converts a PutObjectRequest into a CreateMultipartUploadRequest by setting optional fields needed for high-level
144-
multipart upload operation.
145-
*/
146155
final CreateMultipartUploadRequest.Builder output = CreateMultipartUploadRequest.builder();
147156
request
148157
.toBuilder()

src/test/java/software/amazon/encryption/s3/S3AsyncEncryptionClientTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,15 @@
3535
import software.amazon.awssdk.services.s3.S3Client;
3636
import software.amazon.awssdk.services.s3.S3Configuration;
3737
import software.amazon.awssdk.services.s3.model.CopyObjectResponse;
38-
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
3938
import software.amazon.awssdk.services.s3.model.DeleteObjectResponse;
4039
import software.amazon.awssdk.services.s3.model.DeleteObjectsResponse;
4140
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
42-
import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
4341
import software.amazon.awssdk.services.s3.model.ObjectIdentifier;
4442
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
4543
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
4644
import software.amazon.awssdk.services.s3.model.S3Exception;
4745
import software.amazon.awssdk.services.s3.model.StorageClass;
48-
import software.amazon.awssdk.services.s3.model.StorageClassAnalysisDataExport;
4946
import software.amazon.awssdk.services.s3.multipart.MultipartConfiguration;
50-
import software.amazon.encryption.s3.internal.ConvertSDKRequests;
5147
import software.amazon.encryption.s3.internal.InstructionFileConfig;
5248
import software.amazon.encryption.s3.materials.KmsKeyring;
5349
import software.amazon.encryption.s3.utils.BoundedInputStream;

0 commit comments

Comments
 (0)