Skip to content
Snippets Groups Projects
Commit 9b808646 authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

OZG-7573 refactor handleEndOfFile

parent 6fd81468
No related branches found
No related tags found
1 merge request!9Ozg 7573 forward vorgang
...@@ -33,7 +33,6 @@ import java.util.HashMap; ...@@ -33,7 +33,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -170,13 +169,22 @@ class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRouteForwa ...@@ -170,13 +169,22 @@ class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRouteForwa
void handleEndOfFile() { void handleEndOfFile() {
closeOutputPipe(); closeOutputPipe();
var completedIncomingFile = currentFile.toBuilder().file(getSavedFileContent()).build(); var completedIncomingFile = currentFile.toBuilder().file(getSavedFileContent()).build();
Optional.ofNullable(groupName) if (Objects.isNull(groupName)) {
.map(group -> attachments.computeIfAbsent(group, s -> new ArrayList<>())) addAsRepresentation(completedIncomingFile);
.orElse(representations) } else {
.add(completedIncomingFile); addAsAttachment(completedIncomingFile);
}
resetFileReceiving(); resetFileReceiving();
} }
private void addAsRepresentation(IncomingFile completedIncomingFile) {
representations.add(completedIncomingFile);
}
private void addAsAttachment(IncomingFile completedIncomingFile) {
attachments.computeIfAbsent(groupName, s -> new ArrayList<>()).add(completedIncomingFile);
}
File getSavedFileContent() { File getSavedFileContent() {
try { try {
return receivingFileContent.get(TIMEOUT_MINUTES, TimeUnit.MINUTES); return receivingFileContent.get(TIMEOUT_MINUTES, TimeUnit.MINUTES);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment