getBucketMetadata never returns null.

Author: afranken

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

@@ -90,21 +90,17 @@ public BucketService(BucketStore bucketStore, ObjectStore objectStore) {
 
   public boolean isBucketEmpty(String bucketName) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
-    if (bucketMetadata != null) {
-      var objects = bucketMetadata.objects();
-      if (!objects.isEmpty()) {
-        for (var id : objects.values()) {
-          var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucketMetadata, id, null);
-          if (s3ObjectMetadata != null && !s3ObjectMetadata.deleteMarker()) {
-            return false;
-          }
+    var objects = bucketMetadata.objects();
+    if (!objects.isEmpty()) {
+      for (var id : objects.values()) {
+        var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucketMetadata, id, null);
+        if (s3ObjectMetadata != null && !s3ObjectMetadata.deleteMarker()) {
+          return false;
         }
-        return true;
       }
-      return bucketMetadata.objects().isEmpty();
-    } else {
-      throw new IllegalStateException("Requested Bucket does not exist: " + bucketName);
+      return true;
     }
+    return bucketMetadata.objects().isEmpty();
   }
 
   public boolean doesBucketExist(String bucketName) {
@@ -122,7 +118,6 @@ public ListAllMyBucketsResult listBuckets(
     var buckets = bucketStore
         .listBuckets()
         .stream()
-        .filter(Objects::nonNull)
         .filter(b -> b.name().startsWith(normalizedPrefix))
         .sorted(Comparator.comparing(BucketMetadata::name))
         .map(Bucket::from)
@@ -174,29 +169,25 @@ public Bucket createBucket(
 
   public boolean deleteBucket(String bucketName) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
-    if (bucketMetadata != null) {
-      var objects = bucketMetadata.objects();
-      if (!objects.isEmpty()) {
-        for (var entry : objects.entrySet()) {
-          var s3ObjectMetadata =
-              objectStore.getS3ObjectMetadata(bucketMetadata, entry.getValue(), null);
-          if (s3ObjectMetadata != null && s3ObjectMetadata.deleteMarker()) {
-            // yes, we really want to delete the objects here, if they are delete markers, they
-            // do not officially exist.
-            objectStore.doDeleteObject(bucketMetadata, entry.getValue());
-            bucketStore.removeFromBucket(entry.getKey(), bucketName);
-          }
+    var objects = bucketMetadata.objects();
+    if (!objects.isEmpty()) {
+      for (var entry : objects.entrySet()) {
+        var s3ObjectMetadata =
+            objectStore.getS3ObjectMetadata(bucketMetadata, entry.getValue(), null);
+        if (s3ObjectMetadata != null && s3ObjectMetadata.deleteMarker()) {
+          // yes, we really want to delete the objects here, if they are delete markers, they
+          // do not officially exist.
+          objectStore.doDeleteObject(bucketMetadata, entry.getValue());
+          bucketStore.removeFromBucket(entry.getKey(), bucketName);
         }
       }
-      // check again if bucket is empty
-      bucketMetadata = bucketStore.getBucketMetadata(bucketName);
-      if (!bucketMetadata.objects().isEmpty()) {
-        throw new IllegalStateException("Bucket is not empty: " + bucketName);
-      }
-      return bucketStore.deleteBucket(bucketName);
-    } else {
-      throw new IllegalStateException("Requested Bucket does not exist: " + bucketName);
     }
+    // check again if bucket is empty
+    bucketMetadata = bucketStore.getBucketMetadata(bucketName);
+    if (!bucketMetadata.objects().isEmpty()) {
+      throw new IllegalStateException("Bucket is not empty: " + bucketName);
+    }
+    return bucketStore.deleteBucket(bucketName);
   }
 
   public void setVersioningConfiguration(String bucketName, VersioningConfiguration configuration) {
@@ -255,7 +246,6 @@ public List<S3Object> getS3Objects(String bucketName, @Nullable String prefix) {
     var uuids = bucketStore.lookupIdsInBucket(prefix, bucketName);
     return uuids
         .stream()
-        .filter(Objects::nonNull)
         .map(uuid -> objectStore.getS3ObjectMetadata(bucketMetadata, uuid, null))
         .filter(Objects::nonNull)
         .map(S3Object::from)

server/src/main/java/com/adobe/testing/s3mock/store/StoreConfiguration.java

@@ -55,9 +55,7 @@ ObjectStore objectStore(
     var objectStore = new ObjectStore(S3_OBJECT_DATE_FORMAT, objectMapper);
     for (var bucketName : bucketNames) {
       var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
-      if (bucketMetadata != null) {
-        objectStore.loadObjects(bucketMetadata, bucketMetadata.objects().values());
-      }
+      objectStore.loadObjects(bucketMetadata, bucketMetadata.objects().values());
     }
     return objectStore;
   }

server/src/test/kotlin/com/adobe/testing/s3mock/service/BucketServiceTest.kt

@@ -30,6 +30,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.verify
+import org.mockito.kotlin.doThrow
 import org.mockito.kotlin.whenever
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
@@ -643,11 +644,10 @@ internal class BucketServiceTest : ServiceTestBase() {
   @Test
   fun testDeleteBucket_nonExistingBucket_throws() {
     val bucketName = "no-such-bucket"
-    // Return null metadata to trigger the else-branch in service
-    whenever(bucketStore.getBucketMetadata(bucketName)).thenReturn(null)
+    whenever(bucketStore.getBucketMetadata(bucketName)).doThrow(IllegalStateException(("Bucket does not exist: $bucketName")))
     assertThatThrownBy { iut.deleteBucket(bucketName) }
       .isInstanceOf(IllegalStateException::class.java)
-      .hasMessageContaining("Requested Bucket does not exist: $bucketName")
+      .hasMessageContaining("Bucket does not exist: $bucketName")
   }
 
   @Test