OZG-6528 rename downloadFunction -> downloadConsumer; move fileId handling...

OZG-6528 rename downloadFunction -> downloadConsumer; move fileId handling from downloader to service

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationGrpcService.java

@@ -73,8 +73,7 @@ public class CollaborationGrpcService extends CollaborationServiceGrpc.Collabora
 			StreamObserver<GrpcGetFileContentResponse> responseObserver) {
 		return GrpcDownloader.<GrpcGetFileContentResponse>builder()
 				.callObserver((CallStreamObserver<GrpcGetFileContentResponse>) responseObserver)
-				.fileId(OzgCloudFileId.from(fileId))
-				.downloadFunction(service::writeFileContent)
+				.downloadConsumer(outputStream -> service.writeFileContent(OzgCloudFileId.from(fileId), outputStream))
 				.chunkBuilder(this::buildChunkResponse)
 				.taskExecutor(taskExecutor)
 				.build();

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/grpc/GrpcDownloader.java

@@ -5,7 +5,7 @@ import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.springframework.core.task.TaskExecutor;
@@ -25,11 +25,9 @@ public class GrpcDownloader<T> {
 	@Getter
 	private CallStreamObserver<T> callObserver;
 	@Getter
-	private OzgCloudFileId fileId;
-	@Getter
 	private Function<ByteString, T> chunkBuilder;
 	@Getter
-	private BiConsumer<OzgCloudFileId, OutputStream> downloadFunction;
+	private Consumer<OutputStream> downloadConsumer;
 	@Getter
 	private TaskExecutor taskExecutor;
 
@@ -41,11 +39,10 @@ public class GrpcDownloader<T> {
 
 	@Builder
 	public GrpcDownloader(CallStreamObserver<T> callObserver, OzgCloudFileId fileId, Function<ByteString, T> chunkBuilder,
-			BiConsumer<OzgCloudFileId, OutputStream> downloadFunction, TaskExecutor taskExecutor) {
+			Consumer<OutputStream> downloadConsumer, TaskExecutor taskExecutor) {
 		this.callObserver = callObserver;
-		this.fileId = fileId;
 		this.chunkBuilder = chunkBuilder;
-		this.downloadFunction = downloadFunction;
+		this.downloadConsumer = downloadConsumer;
 		this.taskExecutor = taskExecutor;
 	}
 
@@ -71,7 +68,7 @@ public class GrpcDownloader<T> {
 
 	void doDownload() throws IOException {
 		downloadInProgress.set(true);
-		downloadFunction.accept(fileId, outputStream);
+		downloadConsumer.accept(outputStream);
 		downloadInProgress.set(false);
 		outputStream.close();
 	}

collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/CollaborationGrpcServiceTest.java

@@ -192,17 +192,10 @@ class CollaborationGrpcServiceTest {
 		}
 
 		@Test
-		void shouldContainFileId() {
+		void shouldContainDownloadConsumer() {
 			var downloader = grpcService.buildDownloader(fileId, callStreamObserver);
 
-			assertThat(downloader.getFileId()).hasToString(fileId);
-		}
-
-		@Test
-		void shouldContainDownloadFunction() {
-			var downloader = grpcService.buildDownloader(fileId, callStreamObserver);
-
-			assertThat(downloader.getDownloadFunction()).isNotNull();
+			assertThat(downloader.getDownloadConsumer()).isNotNull();
 		}
 
 		@Test

collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/common/grpc/GrpcDownloaderTest.java

@@ -9,7 +9,7 @@ import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -39,7 +39,7 @@ class GrpcDownloaderTest {
 	@SuppressWarnings("unchecked")
 	private Function<ByteString, GrpcResponseDummy> chunkBuilder = Mockito.mock(Function.class);
 	@SuppressWarnings("unchecked")
-	private BiConsumer<OzgCloudFileId, OutputStream> downloadFunction = Mockito.mock(BiConsumer.class);
+	private Consumer<OutputStream> downloadConsumer = Mockito.mock(Consumer.class);
 	private TaskExecutor taskExecutor = mock(TaskExecutor.class);
 
 	private OzgCloudFileId fileId = FileTestFactory.ID;
@@ -48,7 +48,7 @@ class GrpcDownloaderTest {
 	private GrpcDownloader<GrpcResponseDummy> downloader = GrpcDownloader.<GrpcResponseDummy>builder()
 			.callObserver(callObserver)
 			.fileId(fileId)
-			.downloadFunction(downloadFunction)
+			.downloadConsumer(downloadConsumer)
 			.chunkBuilder(chunkBuilder)
 			.taskExecutor(taskExecutor)
 			.build();
@@ -161,10 +161,10 @@ class GrpcDownloaderTest {
 
 			@SneakyThrows
 			@Test
-			void shouldCallDownloadFunction() {
+			void shouldCallDownloadConsumer() {
 				downloader.doDownload();
 
-				verify(downloadFunction).accept(fileId, outputStream);
+				verify(downloadConsumer).accept(outputStream);
 			}
 
 			@SneakyThrows