From 6fd814680f5b1f49ad9a451918b9f0819266b20c Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Thu, 20 Mar 2025 14:23:27 +0100
Subject: [PATCH] Ozg-7573 apply code review
---
.../EingangStubReceiverStreamObserver.java | 17 +++++++-------
...EingangStubReceiverStreamObserverTest.java | 22 +++++++++----------
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
index 1d355f5f..fd810664 100644
--- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
+++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
@@ -57,7 +57,7 @@ import lombok.Builder;
import lombok.extern.log4j.Log4j2;
@Log4j2
-public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRouteForwardingRequest> {
+class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRouteForwardingRequest> {
private static final int CHUNK_SIZE = 1024 * 64;
private static final long TIMEOUT_MINUTES = 10;
@@ -81,11 +81,11 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
}
private FormData formData;
- private List<IncomingFile> representations = new ArrayList<>();
- private Map<String, List<IncomingFile>> attachments = new HashMap<>();
+ private final List<IncomingFile> representations = new ArrayList<>();
+ private final Map<String, List<IncomingFile>> attachments = new HashMap<>();
private IncomingFile currentFile;
- private Optional<String> groupName = Optional.empty();
+ private String groupName;
private PipedOutputStream pipedOutput;
private PipedInputStream pipedInput;
private CompletableFuture<File> receivingFileContent;
@@ -113,7 +113,7 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
void handleAttachment(GrpcAttachment attachment) {
if (attachment.hasFile()) {
setCurrentMetadata(incomingFileMapper.fromGrpcAttachmentFile(attachment.getFile()));
- groupName = Optional.of(attachment.getFile().getGroupName());
+ groupName = attachment.getFile().getGroupName();
} else {
handleFileContent(attachment.getContent());
}
@@ -130,7 +130,7 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
void setCurrentMetadata(IncomingFile metaData) {
if (Objects.nonNull(currentFile)) {
- throw new IllegalStateException("Received additional file before previos file reached the end.");
+ throw new IllegalStateException("Received additional file before previous file reached the end.");
}
currentFile = metaData;
}
@@ -170,7 +170,8 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
void handleEndOfFile() {
closeOutputPipe();
var completedIncomingFile = currentFile.toBuilder().file(getSavedFileContent()).build();
- groupName.map(group -> attachments.computeIfAbsent(group, s -> new ArrayList<IncomingFile>()))
+ Optional.ofNullable(groupName)
+ .map(group -> attachments.computeIfAbsent(group, s -> new ArrayList<>()))
.orElse(representations)
.add(completedIncomingFile);
resetFileReceiving();
@@ -191,7 +192,7 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
void resetFileReceiving() {
currentFile = null;
- groupName = Optional.empty();
+ groupName = null;
pipedOutput = null;
pipedInput = null;
receivingFileContent = null;
diff --git a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
index d14d9936..04d21376 100644
--- a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
+++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
@@ -35,7 +35,6 @@ import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
@@ -235,7 +234,7 @@ class EingangStubReceiverStreamObserverTest {
void shouldSetGroupName() {
observer.handleAttachment(attachmentWithFile);
- assertThat(getGroupName()).contains(GrpcAttachmentFileTestFactory.GROUP_NAME);
+ assertThat(getGroupName()).isEqualTo(GrpcAttachmentFileTestFactory.GROUP_NAME);
}
@Test
@@ -274,7 +273,7 @@ class EingangStubReceiverStreamObserverTest {
void shouldNotSetGroupName() {
observer.handleAttachment(attachmentWithContent);
- assertThat(getGroupName()).isEmpty();
+ assertThat(getGroupName()).isNull();
}
}
}
@@ -584,11 +583,11 @@ class EingangStubReceiverStreamObserverTest {
}
@Nested
- class TestOnGroupNameEmpty {
+ class TestOnGroupNameNull {
@BeforeEach
void setUp() {
- setGroupName(Optional.empty());
+ setGroupName(null);
}
@Test
@@ -606,7 +605,7 @@ class EingangStubReceiverStreamObserverTest {
@BeforeEach
void setUp() {
- setGroupName(Optional.of(GrpcAttachmentFileTestFactory.GROUP_NAME));
+ setGroupName(GrpcAttachmentFileTestFactory.GROUP_NAME);
}
@Test
@@ -763,7 +762,7 @@ class EingangStubReceiverStreamObserverTest {
@BeforeEach
void setUp() {
setCurrentFile(IncomingFileTestFactory.create());
- setGroupName(Optional.of(GrpcAttachmentFileTestFactory.GROUP_NAME));
+ setGroupName(GrpcAttachmentFileTestFactory.GROUP_NAME);
setPipedOutput(mock(PipedOutputStream.class));
setPipedOutput(mock(PipedOutputStream.class));
setFileContent(CompletableFuture.completedFuture(mock(File.class)));
@@ -780,7 +779,7 @@ class EingangStubReceiverStreamObserverTest {
void shouldResetGroupName() {
observer.resetFileReceiving();
- assertThat(getGroupName()).isEmpty();
+ assertThat(getGroupName()).isNull();
}
@Test
@@ -980,12 +979,11 @@ class EingangStubReceiverStreamObserverTest {
ReflectionTestUtils.setField(observer, "formData", formData);
}
- @SuppressWarnings("unchecked")
- private Optional<String> getGroupName() {
- return (Optional<String>) ReflectionTestUtils.getField(observer, "groupName");
+ private String getGroupName() {
+ return (String) ReflectionTestUtils.getField(observer, "groupName");
}
- private void setGroupName(Optional<String> groupName) {
+ private void setGroupName(String groupName) {
ReflectionTestUtils.setField(observer, "groupName", groupName);
}
--
GitLab