Skip to content

Commit 4e5be4b

Browse files
committed
Migrate "store" package to Kotlin
1 parent 0333b55 commit 4e5be4b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2330
-2437
lines changed

server/src/main/java/com/adobe/testing/s3mock/controller/BucketController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public ResponseEntity<Void> headBucket(@PathVariable final String bucketName) {
169169
BucketMetadata bucketMetadata = bucketService.verifyBucketExists(bucketName);
170170
return ResponseEntity
171171
.ok()
172-
.header(X_AMZ_BUCKET_REGION, bucketMetadata.bucketRegion())
172+
.header(X_AMZ_BUCKET_REGION, bucketMetadata.bucketRegion)
173173
.headers(h -> h.setAll(bucketService.bucketLocationHeaders(bucketMetadata)))
174174
.build();
175175
}
@@ -368,7 +368,7 @@ public ResponseEntity<Void> deleteBucketLifecycleConfiguration(@PathVariable Str
368368
@S3Verified(year = 2025)
369369
public ResponseEntity<LocationConstraint> getBucketLocation(@PathVariable String bucketName) {
370370
BucketMetadata bucketMetadata = bucketService.verifyBucketExists(bucketName);
371-
String bucketRegion = bucketMetadata.bucketRegion();
371+
String bucketRegion = bucketMetadata.bucketRegion;
372372
return ResponseEntity.ok(new LocationConstraint(bucketRegion));
373373
}
374374

server/src/main/java/com/adobe/testing/s3mock/controller/MultipartController.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import static com.adobe.testing.s3mock.util.AwsHttpParameters.UPLOADS;
4242
import static com.adobe.testing.s3mock.util.AwsHttpParameters.UPLOAD_ID;
4343
import static com.adobe.testing.s3mock.util.AwsHttpParameters.UPLOAD_ID_MARKER;
44+
import static com.adobe.testing.s3mock.util.EtagUtil.normalizeEtag;
4445
import static com.adobe.testing.s3mock.util.HeaderUtil.checksumAlgorithmFromHeader;
4546
import static com.adobe.testing.s3mock.util.HeaderUtil.checksumAlgorithmFromSdk;
4647
import static com.adobe.testing.s3mock.util.HeaderUtil.checksumFrom;
@@ -271,7 +272,7 @@ public ResponseEntity<Void> uploadPart(
271272
.ok()
272273
.headers(h -> h.setAll(checksumHeader))
273274
.headers(h -> h.setAll(encryptionHeadersFrom(httpHeaders)))
274-
.eTag("\"" + etag + "\"")
275+
.eTag(normalizeEtag(etag))
275276
.build();
276277
}
277278

@@ -323,8 +324,8 @@ public ResponseEntity<CopyPartResult> uploadPartCopy(
323324
return ResponseEntity
324325
.ok()
325326
.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);
328329
}
329330
})
330331
.headers(h -> h.setAll(encryptionHeaders))
@@ -414,7 +415,7 @@ public ResponseEntity<CompleteMultipartUploadResult> completeMultipartUpload(
414415
var bucket = bucketService.verifyBucketExists(bucketName);
415416
var multipartUploadInfo = multipartService.verifyMultipartUploadExists(bucketName, uploadId, true);
416417
var objectName = key.key();
417-
boolean isCompleted = multipartUploadInfo != null && multipartUploadInfo.completed();
418+
boolean isCompleted = multipartUploadInfo != null && multipartUploadInfo.completed;
418419
if (!isCompleted) {
419420
multipartService.verifyMultipartParts(bucketName, objectName, uploadId, upload.parts());
420421
}
@@ -442,20 +443,20 @@ public ResponseEntity<CompleteMultipartUploadResult> completeMultipartUpload(
442443
locationWithEncodedKey,
443444
bucketName,
444445
objectName,
445-
s3ObjectMetadata.etag(),
446+
normalizeEtag(s3ObjectMetadata.etag),
446447
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
451452
);
452453
}
453454

454455
return ResponseEntity
455456
.ok()
456457
.headers(h -> {
457458
if (result != null) {
458-
h.setAll(result.multipartUploadInfo().encryptionHeaders());
459+
h.setAll(result.multipartUploadInfo().encryptionHeaders);
459460
}
460461
})
461462
.headers(h -> {

0 commit comments

Comments
 (0)