diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcBinaryFileService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcBinaryFileService.java index ce3eb0100c61d8a81723749c2512086f2659aa64..a381a5b47bcb847588423e5ccbb1834644424cce 100644 --- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcBinaryFileService.java +++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcBinaryFileService.java @@ -77,7 +77,7 @@ public class GrpcBinaryFileService extends BinaryFileServiceImplBase { responseObserver.onCompleted(); } - public GrpcFindFilesResponse buildResponseForOzgFiles(List<OzgCloudFile> files) { + GrpcFindFilesResponse buildResponseForOzgFiles(List<OzgCloudFile> files) { var builder = GrpcFindFilesResponse.newBuilder(); files.stream().map(fileMapper::map).forEach(builder::addFile); diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/OzgCloudFileRepository.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/OzgCloudFileRepository.java index fde2ccf7d0f54a59b937e98bb28d1a560f169510..d9ec33225bde9b06c4ed58a412a517d291d29660 100644 --- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/OzgCloudFileRepository.java +++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/OzgCloudFileRepository.java @@ -57,7 +57,7 @@ class OzgCloudFileRepository { static final String GRID_FS_FIELD_ID = "_id"; - private final CollisionVerifier collisionVerifier = new CollisionVerifier(this::existBinaryFile); + private final CollisionVerifier collisionVerifier = new CollisionVerifier(this::existOzgCloudFile); private final GridFsTemplate gridFsTemplate; private final MongoOperations mongoOperations; @@ -127,8 +127,8 @@ class OzgCloudFileRepository { } public void deleteAllByVorgang(String vorgangId) { - var deletedBinaryFile = mongoOperations.findAllAndRemove(query(where(OzgCloudFile.FIELD_VORGANG_ID).is(vorgangId)), OzgCloudFile.class); - deletedBinaryFile.stream().map(OzgCloudFile::getContentId).filter(Objects::nonNull).forEach(this::deleteContent); + var deletedOzgCloudFile = mongoOperations.findAllAndRemove(query(where(OzgCloudFile.FIELD_VORGANG_ID).is(vorgangId)), OzgCloudFile.class); + deletedOzgCloudFile.stream().map(OzgCloudFile::getContentId).filter(Objects::nonNull).forEach(this::deleteContent); } public void deleteContent(String contentId) { @@ -139,7 +139,7 @@ class OzgCloudFileRepository { return Query.query(Criteria.where(GRID_FS_FIELD_ID).is(contentId)); } - private boolean existBinaryFile(String fileId) { + private boolean existOzgCloudFile(String fileId) { return mongoOperations.exists(query(where(OzgCloudFile.FIELD_ID).is(fileId)), OzgCloudFile.class); } }