Skip to content

Commit 9efff7f

Browse files
Fix unmodifiable collection issue
1 parent 04c1af9 commit 9efff7f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.util.Set;
1515
import java.util.function.Predicate;
1616
import java.util.stream.Collectors;
17-
1817
import com.google.api.gax.retrying.RetrySettings;
1918
import com.google.auth.Credentials;
2019
import com.google.auth.oauth2.GoogleCredentials;
@@ -205,7 +204,7 @@ private int removeBlobsByFilter(Predicate<? super Blob> filter) {
205204
.toList();
206205
List<Boolean> deletedBlobsResults = new ArrayList<>();
207206
if (!blobIds.isEmpty()) {
208-
deletedBlobsResults = deleteBlobs(blobIds);
207+
deletedBlobsResults.addAll(deleteBlobs(blobIds));
209208
}
210209

211210
deletedBlobsResults.removeIf(Boolean.FALSE::equals);

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@
77
import java.util.List;
88
import java.util.Map;
99
import java.util.UUID;
10-
1110
import com.google.cloud.storage.Blob;
1211
import com.google.cloud.storage.BlobId;
1312
import com.google.cloud.storage.BlobInfo;
1413
import com.google.cloud.storage.Storage;
1514
import com.google.cloud.storage.contrib.nio.testing.LocalStorageHelper;
15+
import org.apache.commons.collections4.list.UnmodifiableList;
1616
import org.cloudfoundry.multiapps.controller.persistence.model.FileEntry;
1717
import org.junit.jupiter.api.AfterEach;
1818
import org.junit.jupiter.api.BeforeEach;
1919
import org.springframework.http.MediaType;
20-
2120
import static org.junit.jupiter.api.Assertions.assertEquals;
2221
import static org.junit.jupiter.api.Assertions.assertNull;
2322

@@ -43,7 +42,7 @@ protected List<Boolean> deleteBlobs(List<BlobId> blobIds) {
4342
for (BlobId blobId : blobIds) {
4443
deletedBlobsResults.add(storage.delete(blobId));
4544
}
46-
return deletedBlobsResults;
45+
return new UnmodifiableList<>(deletedBlobsResults);
4746
}
4847
};
4948
spaceId = UUID.randomUUID()

0 commit comments

Comments
 (0)