Skip to content

Commit 917535e

Browse files
committed
Formatting, @nullable annotations
1 parent 9c916e0 commit 917535e

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,15 @@ public ResponseEntity<ListVersionsResult> listObjectVersions(
478478
bucketService.verifyBucketExists(bucketName);
479479
bucketService.verifyMaxKeys(maxKeys);
480480
bucketService.verifyEncodingType(encodingType);
481-
var listVersionsResult =
482-
bucketService.listVersions(bucketName, prefix, delimiter, encodingType, maxKeys, keyMarker,
483-
versionIdMarker);
481+
var listVersionsResult = bucketService.listVersions(
482+
bucketName,
483+
prefix,
484+
delimiter,
485+
encodingType,
486+
maxKeys,
487+
keyMarker,
488+
versionIdMarker
489+
);
484490

485491
return ResponseEntity.ok(listVersionsResult);
486492
}

server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,15 @@ public List<S3Object> getS3Objects(String bucketName, @Nullable String prefix) {
253253
.toList();
254254
}
255255

256-
public ListVersionsResult listVersions(String bucketName,
257-
String prefix,
258-
String delimiter,
259-
String encodingType,
256+
public ListVersionsResult listVersions(
257+
String bucketName,
258+
@Nullable String prefix,
259+
@Nullable String delimiter,
260+
@Nullable String encodingType,
260261
Integer maxKeys,
261-
String keyMarker,
262-
String versionIdMarker) {
262+
@Nullable String keyMarker,
263+
@Nullable String versionIdMarker
264+
) {
263265
var result = listObjectsV1(bucketName, prefix, delimiter, keyMarker, encodingType, maxKeys);
264266

265267
var bucket = bucketStore.getBucketMetadata(bucketName);

0 commit comments

Comments
 (0)