|
41 | 41 | import static com.adobe.testing.s3mock.util.AwsHttpParameters.UPLOADS; |
42 | 42 | import static com.adobe.testing.s3mock.util.AwsHttpParameters.UPLOAD_ID; |
43 | 43 | import static com.adobe.testing.s3mock.util.AwsHttpParameters.UPLOAD_ID_MARKER; |
| 44 | +import static com.adobe.testing.s3mock.util.EtagUtil.normalizeEtag; |
44 | 45 | import static com.adobe.testing.s3mock.util.HeaderUtil.checksumAlgorithmFromHeader; |
45 | 46 | import static com.adobe.testing.s3mock.util.HeaderUtil.checksumAlgorithmFromSdk; |
46 | 47 | import static com.adobe.testing.s3mock.util.HeaderUtil.checksumFrom; |
@@ -271,7 +272,7 @@ public ResponseEntity<Void> uploadPart( |
271 | 272 | .ok() |
272 | 273 | .headers(h -> h.setAll(checksumHeader)) |
273 | 274 | .headers(h -> h.setAll(encryptionHeadersFrom(httpHeaders))) |
274 | | - .eTag("\"" + etag + "\"") |
| 275 | + .eTag(normalizeEtag(etag)) |
275 | 276 | .build(); |
276 | 277 | } |
277 | 278 |
|
@@ -323,8 +324,8 @@ public ResponseEntity<CopyPartResult> uploadPartCopy( |
323 | 324 | return ResponseEntity |
324 | 325 | .ok() |
325 | 326 | .headers(h -> { |
326 | | - if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) { |
327 | | - h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId()); |
| 327 | + if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId != null) { |
| 328 | + h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId); |
328 | 329 | } |
329 | 330 | }) |
330 | 331 | .headers(h -> h.setAll(encryptionHeaders)) |
@@ -414,7 +415,7 @@ public ResponseEntity<CompleteMultipartUploadResult> completeMultipartUpload( |
414 | 415 | var bucket = bucketService.verifyBucketExists(bucketName); |
415 | 416 | var multipartUploadInfo = multipartService.verifyMultipartUploadExists(bucketName, uploadId, true); |
416 | 417 | var objectName = key.key(); |
417 | | - boolean isCompleted = multipartUploadInfo != null && multipartUploadInfo.completed(); |
| 418 | + boolean isCompleted = multipartUploadInfo != null && multipartUploadInfo.completed; |
418 | 419 | if (!isCompleted) { |
419 | 420 | multipartService.verifyMultipartParts(bucketName, objectName, uploadId, upload.parts()); |
420 | 421 | } |
@@ -442,20 +443,20 @@ public ResponseEntity<CompleteMultipartUploadResult> completeMultipartUpload( |
442 | 443 | locationWithEncodedKey, |
443 | 444 | bucketName, |
444 | 445 | objectName, |
445 | | - s3ObjectMetadata.etag(), |
| 446 | + normalizeEtag(s3ObjectMetadata.etag), |
446 | 447 | multipartUploadInfo, |
447 | | - s3ObjectMetadata.checksum(), |
448 | | - s3ObjectMetadata.checksumType(), |
449 | | - s3ObjectMetadata.checksumAlgorithm(), |
450 | | - s3ObjectMetadata.versionId() |
| 448 | + s3ObjectMetadata.checksum, |
| 449 | + s3ObjectMetadata.checksumType, |
| 450 | + s3ObjectMetadata.checksumAlgorithm, |
| 451 | + s3ObjectMetadata.versionId |
451 | 452 | ); |
452 | 453 | } |
453 | 454 |
|
454 | 455 | return ResponseEntity |
455 | 456 | .ok() |
456 | 457 | .headers(h -> { |
457 | 458 | if (result != null) { |
458 | | - h.setAll(result.multipartUploadInfo().encryptionHeaders()); |
| 459 | + h.setAll(result.multipartUploadInfo().encryptionHeaders); |
459 | 460 | } |
460 | 461 | }) |
461 | 462 | .headers(h -> { |
|
0 commit comments