From f5887f78db667568df79678e4420c72d2be88de6 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Thu, 20 Mar 2025 11:59:45 +0100
Subject: [PATCH] Revert "OZG-7573 add error handler"
This reverts commit 0cf5dd0e163633de7196bf368d21d3429089530e.
---
.../EingangStubReceiverStreamObserver.java | 5 +--
.../forwarder/RouteForwardingGrpcService.java | 5 ---
...EingangStubReceiverStreamObserverTest.java | 12 ------
.../RouteForwardingGrpcServiceTest.java | 41 +++----------------
4 files changed, 7 insertions(+), 56 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 0d174825d..1d355f5fd 100644
--- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
+++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
@@ -67,19 +67,17 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
private final Function<InputStream, CompletableFuture<File>> fileSaver;
private final Consumer<FormData> formDataConsumer;
private final Consumer<GrpcRouteForwardingResponse> responseConsumer;
- private final Consumer<Throwable> onErrorHandler;
@Builder
public EingangStubReceiverStreamObserver(RouteForwardingMapper routeForwardingMapper, IncomingFileMapper incomingFileMapper,
IncomingFileGroupMapper incomingFileGroupMapper, Function<InputStream, CompletableFuture<File>> fileSaver,
- Consumer<FormData> formDataConsumer, Consumer<GrpcRouteForwardingResponse> responseConsumer, Consumer<Throwable> onErrorHandler) {
+ Consumer<FormData> formDataConsumer, Consumer<GrpcRouteForwardingResponse> responseConsumer) {
this.routeForwardingMapper = routeForwardingMapper;
this.incomingFileMapper = incomingFileMapper;
this.incomingFileGroupMapper = incomingFileGroupMapper;
this.fileSaver = fileSaver;
this.formDataConsumer = formDataConsumer;
this.responseConsumer = responseConsumer;
- this.onErrorHandler = onErrorHandler;
}
private FormData formData;
@@ -204,7 +202,6 @@ public class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRou
LOG.error("Error happened. Receiving stream closed.", t);
closeOutputPipe();
closeInputPipe();
- onErrorHandler.accept(t);
}
void closeOutputPipe() {
diff --git a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java
index d08d98e8e..322e7361f 100644
--- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java
+++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcService.java
@@ -52,7 +52,6 @@ public class RouteForwardingGrpcService extends RouteForwardingServiceGrpc.Route
.incomingFileGroupMapper(incomingFileGroupMapper)
.formDataConsumer(routeForwardingService::route)
.responseConsumer(repsonse -> respondWith(responseObserver, repsonse))
- .onErrorHandler(error -> handleError(error, responseObserver))
.build();
}
@@ -65,8 +64,4 @@ public class RouteForwardingGrpcService extends RouteForwardingServiceGrpc.Route
responseObserver.onCompleted();
}
- public void handleError(Throwable error, StreamObserver<GrpcRouteForwardingResponse> responseObserver) {
- responseObserver.onError(error);
- }
-
}
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 fc502fe69..d14d99362 100644
--- a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
+++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserverTest.java
@@ -76,8 +76,6 @@ class EingangStubReceiverStreamObserverTest {
private Consumer<FormData> formDataConsumer;
@Mock
private Consumer<GrpcRouteForwardingResponse> responseConsumer;
- @Mock
- private Consumer<Throwable> onErrorHandler;
@BeforeEach
void setUp() {
@@ -88,7 +86,6 @@ class EingangStubReceiverStreamObserverTest {
.incomingFileGroupMapper(incomingFileGroupMapper)
.formDataConsumer(formDataConsumer)
.responseConsumer(responseConsumer)
- .onErrorHandler(onErrorHandler)
.build());
}
@@ -830,15 +827,6 @@ class EingangStubReceiverStreamObserverTest {
verify(observer).closeInputPipe();
}
-
- @Test
- void shouldCallOnErrorHandler() {
- var exception = new Exception();
-
- observer.onError(exception);
-
- verify(onErrorHandler).accept(exception);
- }
}
@Nested
diff --git a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java
index 5c94fb60b..35ac8140c 100644
--- a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java
+++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/RouteForwardingGrpcServiceTest.java
@@ -122,16 +122,6 @@ class RouteForwardingGrpcServiceTest {
verify(service).respondWith(responseObserver, GrpcRouteForwardingResponse.getDefaultInstance());
}
- @Test
- void shouldSetOnErrorHandler() {
- var error = new Throwable();
-
- var observer = service.routeForwarding(responseObserver);
-
- callOnErrorHandler(observer, error);
- verify(service).handleError(error, responseObserver);
- }
-
@SuppressWarnings("unchecked")
private void callFileSaver(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
var fileSaver = (Function<InputStream, CompletableFuture<File>>) ReflectionTestUtils.getField(uploadObserver, "fileSaver");
@@ -139,15 +129,18 @@ class RouteForwardingGrpcServiceTest {
}
private RouteForwardingMapper getRouteForwardingMapper(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
- return (RouteForwardingMapper) ReflectionTestUtils.getField(uploadObserver, "routeForwardingMapper");
+ var routeForwardingMapper = (RouteForwardingMapper) ReflectionTestUtils.getField(uploadObserver, "routeForwardingMapper");
+ return routeForwardingMapper;
}
private IncomingFileMapper getIncomingFileMapper(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
- return (IncomingFileMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileMapper");
+ var incomingFileMapper = (IncomingFileMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileMapper");
+ return incomingFileMapper;
}
private IncomingFileGroupMapper getIncomingFileGroupMapper(StreamObserver<GrpcRouteForwardingRequest> uploadObserver) {
- return (IncomingFileGroupMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileGroupMapper");
+ var incomingFileGroupMapper = (IncomingFileGroupMapper) ReflectionTestUtils.getField(uploadObserver, "incomingFileGroupMapper");
+ return incomingFileGroupMapper;
}
@SuppressWarnings("unchecked")
@@ -161,12 +154,6 @@ class RouteForwardingGrpcServiceTest {
var responseConsumer = (Consumer<GrpcRouteForwardingResponse>) ReflectionTestUtils.getField(uploadObserver, "responseConsumer");
responseConsumer.accept(response);
}
-
- @SuppressWarnings("unchecked")
- private void callOnErrorHandler(StreamObserver<GrpcRouteForwardingRequest> uploadObserver, Throwable throwable) {
- var onErrorHandler = (Consumer<Throwable>) ReflectionTestUtils.getField(uploadObserver, "onErrorHandler");
- onErrorHandler.accept(throwable);
- }
}
@Nested
@@ -218,20 +205,4 @@ class RouteForwardingGrpcServiceTest {
inOrder.verify(responseObserver).onCompleted();
}
}
-
- @Nested
- class TestHandleError {
-
- @Mock
- private StreamObserver<GrpcRouteForwardingResponse> responseObserver;
-
- @Test
- void shouldDoNothing() {
- var error = new Throwable();
-
- service.handleError(error, responseObserver);
-
- verify(responseObserver).onError(error);
- }
- }
}
--
GitLab