diff --git a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java index 2e8feca30a..f3722cb5cf 100644 --- a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java +++ b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java @@ -205,7 +205,7 @@ private int removeBlobsByFilter(Predicate filter) { .toList(); List deletedBlobsResults = new ArrayList<>(); if (!blobIds.isEmpty()) { - deletedBlobsResults = deleteBlobs(blobIds); + deletedBlobsResults.addAll(deleteBlobs(blobIds)); } deletedBlobsResults.removeIf(Boolean.FALSE::equals); diff --git a/multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorageTest.java b/multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorageTest.java index 7e70e2bc56..0e158e9a3d 100644 --- a/multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorageTest.java +++ b/multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorageTest.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Map; import java.util.UUID; - import com.google.cloud.storage.Blob; import com.google.cloud.storage.BlobId; import com.google.cloud.storage.BlobInfo; @@ -17,7 +16,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.springframework.http.MediaType; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -43,7 +41,7 @@ protected List deleteBlobs(List blobIds) { for (BlobId blobId : blobIds) { deletedBlobsResults.add(storage.delete(blobId)); } - return deletedBlobsResults; + return List.copyOf(deletedBlobsResults); } }; spaceId = UUID.randomUUID()