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 5d1293168a6770fd9a8afa0e863afd08cd4750ca..260cdc3818a4af61e2f93d632a66afb75a31062f 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 1a8161b18bb9c02dce8ec7ee65ccd05f16707345..1b6c5eec707c92354bcae7a9c73a89360e69eafc 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 {