From 97d0a1cea6c3e99ee1be484c00edc4d33d578acf Mon Sep 17 00:00:00 2001
From: OZG-Cloud Team <noreply@ozg-sh.de>
Date: Mon, 14 Oct 2024 13:42:13 +0200
Subject: [PATCH] OZG-6748 KOP-2750 Use getContentStream
---
.../eingang/router/VorgangRemoteService.java | 2 +-
.../router/VorgangRemoteServiceTest.java | 49 +++++++++++++++++++
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
index 5d129316..260cdc38 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
@@ -159,7 +159,7 @@ public class VorgangRemoteService {
}
String uploadIncomingFile(IncomingFile incomingFile) {
- var fileContentStream = incomingFile.getContentStreamForFinalRead();
+ var fileContentStream = incomingFile.getContentStream();
var resultFuture = GrpcFileUploadUtils.createSender(this::buildChunkRequest, fileContentStream,
this::buildCallStreamObserver)
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
index 1a8161b1..1b6c5eec 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
@@ -431,6 +431,55 @@ class VorgangRemoteServiceTest {
}
}
+ @DisplayName("update incoming file")
+ @Nested
+ class TestUpdateIncomingFile {
+
+ @Mock
+ private IncomingFile incomingFile;
+
+ @Mock
+ private InputStream inputStream;
+
+ @Mock
+ private GrpcUploadBinaryFileResponse response;
+
+ @Mock
+ private GrpcUploadBinaryFileRequest request;
+
+ @BeforeEach
+ void mock() {
+ doReturn(response).when(vorgangCreator).waitUntilFutureToComplete(any(), any());
+ when(incomingFile.getContentStream()).thenReturn(inputStream);
+ doReturn(request).when(vorgangCreator).buildMetaDataRequest(incomingFile);
+ }
+
+ @DisplayName("should call get content stream")
+ @Test
+ void shouldCallGetContentStream() {
+ vorgangCreator.uploadIncomingFile(incomingFile);
+
+ verify(incomingFile).getContentStream();
+ }
+
+ @DisplayName("should call build request with incoming file")
+ @Test
+ void shouldCallBuildRequestWithIncomingFile() {
+ vorgangCreator.uploadIncomingFile(incomingFile);
+
+ verify(vorgangCreator).buildMetaDataRequest(incomingFile);
+ }
+
+ @DisplayName("should call wait until future complete")
+ @Test
+ void shouldCallWaitUntilFutureComplete() {
+ vorgangCreator.uploadIncomingFile(incomingFile);
+
+ verify(vorgangCreator).waitUntilFutureToComplete(any(), eq(inputStream));
+ }
+
+ }
+
@Nested
class TestWaitUntilFutureToComplete {
--
GitLab