Skip to content
Snippets Groups Projects
Commit 67f448ce authored by OZGCloud's avatar OZGCloud
Browse files

OZG-297 fix collection typing

parent 0f959cfc
Branches
Tags
No related merge requests found
...@@ -2,6 +2,6 @@ package de.itvsh.ozg.pluto.files; ...@@ -2,6 +2,6 @@ package de.itvsh.ozg.pluto.files;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
interface BinaryFileRepository extends BinaryFileCustomRepository, CrudRepository<BinaryFilePersistanceWrapper, FileId> { interface BinaryFileRepository extends BinaryFileCustomRepository, CrudRepository<BinaryFilePersistanceWrapper, String> {
} }
...@@ -51,7 +51,7 @@ class FileService { ...@@ -51,7 +51,7 @@ class FileService {
return StreamSupport.stream(binaryFileRepository.findAllById(mapFileIdToString(ids)).spliterator(), false); return StreamSupport.stream(binaryFileRepository.findAllById(mapFileIdToString(ids)).spliterator(), false);
} }
private Collection mapFileIdToString(Collection<FileId> ids) { private Iterable<String> mapFileIdToString(Collection<FileId> ids) {
return ids.stream().map(fileIdMapper::toString).collect(Collectors.toList()); return ids.stream().map(fileIdMapper::toString).collect(Collectors.toList());
} }
......
...@@ -70,19 +70,18 @@ class BinaryFileRepositoryITCase { ...@@ -70,19 +70,18 @@ class BinaryFileRepositoryITCase {
@Test @Test
void shouldReturnListContainsFileByIdAsFileId() { void shouldReturnListContainsFileByIdAsFileId() {
var result = repository.findAllById(Collections.singleton(BinaryFilePersistanceWrapperTestFactory.ID)); var result = repository.findAllById(Collections.singleton(BinaryFilePersistanceWrapperTestFactory.ID.toString()));
var list = StreamSupport.stream(result.spliterator(), false).collect(Collectors.toList()); var list = StreamSupport.stream(result.spliterator(), false).collect(Collectors.toList());
assertThat(list).isNotNull().hasSize(1); assertThat(list).isNotNull().hasSize(1);
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
@Test @Test
void shouldReturnListContainsFileByIdAsString() { void shouldReturnListContainsFileByIdAsString() {
List ids = Stream.of(BinaryFilePersistanceWrapperTestFactory.ID).map(String::valueOf).collect(Collectors.toList()); List<String> ids = Stream.of(BinaryFilePersistanceWrapperTestFactory.ID).map(String::valueOf).collect(Collectors.toList());
Iterable<BinaryFilePersistanceWrapper> result = repository.findAllById(ids); var result = repository.findAllById(ids);
List<BinaryFilePersistanceWrapper> list = StreamSupport.stream(result.spliterator(), false).collect(Collectors.toList()); List<BinaryFilePersistanceWrapper> list = StreamSupport.stream(result.spliterator(), false).collect(Collectors.toList());
assertThat(list).isNotNull().hasSize(1); assertThat(list).isNotNull().hasSize(1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment