Fix GCP sdk problem with cleaner (#1741) (#1742)

Author: Yavor16

multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java

@@ -26,7 +26,6 @@
 import com.google.cloud.storage.StorageException;
 import com.google.cloud.storage.StorageOptions;
 import com.google.cloud.storage.StorageRetryStrategy;
-import org.cloudfoundry.multiapps.common.util.MiscUtil;
 import org.cloudfoundry.multiapps.controller.persistence.Messages;
 import org.cloudfoundry.multiapps.controller.persistence.model.FileEntry;
 import org.cloudfoundry.multiapps.controller.persistence.util.ObjectStoreFilter;
@@ -200,17 +199,21 @@ public Set<Blob> getAllEntries() {
                       .collect(Collectors.toSet());
     }
 
-    protected int removeBlobsByFilter(Predicate<? super Blob> filter) {
+    private int removeBlobsByFilter(Predicate<? super Blob> filter) {
         List<BlobId> blobIds = getEntryNames(filter).stream()
                                                     .map(entry -> BlobId.of(bucketName, entry))
                                                     .toList();
         List<Boolean> deletedBlobsResults = new ArrayList<>();
         if (!blobIds.isEmpty()) {
-            deletedBlobsResults = storage.delete(blobIds);
+            deletedBlobsResults = deleteBlobs(blobIds);
         }
-        return MiscUtil.cast(deletedBlobsResults.stream()
-                                                .filter(Boolean::booleanValue)
-                                                .count());
+
+        deletedBlobsResults.removeIf(Boolean.FALSE::equals);
+        return deletedBlobsResults.size();
+    }
+
+    protected List<Boolean> deleteBlobs(List<BlobId> blobIds) {
+        return storage.delete(blobIds);
     }
 
     protected Set<String> getEntryNames(Predicate<? super Blob> filter) {

multiapps-controller-persistence/src/test/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorageTest.java

@@ -3,10 +3,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
-import java.util.function.Predicate;
 
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.BlobId;
@@ -38,13 +38,12 @@ protected Storage createObjectStoreStorage(Map<String, Object> credentials) {
             }
 
             @Override
-            protected int removeBlobsByFilter(Predicate<? super Blob> filter) {
-                Set<String> entries = getEntryNames(filter);
-                for (String entry : entries) {
-                    storage.delete(CONTAINER, entry);
+            protected List<Boolean> deleteBlobs(List<BlobId> blobIds) {
+                List<Boolean> deletedBlobsResults = new ArrayList<>();
+                for (BlobId blobId : blobIds) {
+                    deletedBlobsResults.add(storage.delete(blobId));
                 }
-
-                return entries.size();
+                return deletedBlobsResults;
             }
         };
         spaceId = UUID.randomUUID()