From e753f3268cd7a44d7b82284877b6eb889a9955bf Mon Sep 17 00:00:00 2001
From: Krzysztof Witukiewicz <krzysztof.witukiewicz@mgm-tp.com>
Date: Mon, 17 Feb 2025 13:55:24 +0100
Subject: [PATCH] OZG-7608 OZG-7729 Create own return type for
FindDeletedVorgang
---
vorgang-manager-interface/src/main/protobuf/vorgang.proto | 6 +++++-
...lder.java => GrpcFindDeletedVorgangResponseBuilder.java} | 6 +++---
.../de/ozgcloud/vorgang/vorgang/VorgangGrpcService.java | 4 ++--
.../ozgcloud/vorgang/vorgang/VorgangGrpcServiceITCase.java | 4 ++--
.../de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceTest.java | 2 +-
5 files changed, 13 insertions(+), 9 deletions(-)
rename vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/{GrpcFindVorgangResponseBuilder.java => GrpcFindDeletedVorgangResponseBuilder.java} (81%)
diff --git a/vorgang-manager-interface/src/main/protobuf/vorgang.proto b/vorgang-manager-interface/src/main/protobuf/vorgang.proto
index 327a50e41..37a64301d 100644
--- a/vorgang-manager-interface/src/main/protobuf/vorgang.proto
+++ b/vorgang-manager-interface/src/main/protobuf/vorgang.proto
@@ -48,7 +48,7 @@ service VorgangService {
rpc CreateCollaborationVorgang(GrpcCreateCollaborationVorgangRequest) returns (GrpcCreateCollaborationVorgangResponse) {
}
- rpc FindDeletedVorgang(GrpcFindDeletedVorgangRequest) returns (stream GrpcFindVorgangResponse) {
+ rpc FindDeletedVorgang(GrpcFindDeletedVorgangRequest) returns (stream GrpcFindDeletedVorgangResponse) {
}
}
@@ -113,4 +113,8 @@ message GrpcFinishCreationResponse {
}
message GrpcFindDeletedVorgangRequest {
+}
+
+message GrpcFindDeletedVorgangResponse {
+ repeated GrpcVorgangHeader vorgang = 1;
}
\ No newline at end of file
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcFindVorgangResponseBuilder.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcFindDeletedVorgangResponseBuilder.java
similarity index 81%
rename from vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcFindVorgangResponseBuilder.java
rename to vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcFindDeletedVorgangResponseBuilder.java
index 8ed15a037..e82742567 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcFindVorgangResponseBuilder.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/GrpcFindDeletedVorgangResponseBuilder.java
@@ -25,9 +25,9 @@ package de.ozgcloud.vorgang.vorgang;
import de.ozgcloud.vorgang.common.grpc.GrpcResponseBuilder;
-class GrpcFindVorgangResponseBuilder implements GrpcResponseBuilder<GrpcVorgangHeader, GrpcFindVorgangResponse> {
+class GrpcFindDeletedVorgangResponseBuilder implements GrpcResponseBuilder<GrpcVorgangHeader, GrpcFindDeletedVorgangResponse> {
- private final GrpcFindVorgangResponse.Builder delegate = GrpcFindVorgangResponse.newBuilder();
+ private final GrpcFindDeletedVorgangResponse.Builder delegate = GrpcFindDeletedVorgangResponse.newBuilder();
@Override
public int getElementCount() {
@@ -40,7 +40,7 @@ class GrpcFindVorgangResponseBuilder implements GrpcResponseBuilder<GrpcVorgangH
}
@Override
- public GrpcFindVorgangResponse build() {
+ public GrpcFindDeletedVorgangResponse build() {
return delegate.build();
}
}
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcService.java
index 7a7d74628..daa2f758b 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcService.java
@@ -142,8 +142,8 @@ class VorgangGrpcService extends VorgangServiceGrpc.VorgangServiceImplBase {
}
@Override
- public void findDeletedVorgang(GrpcFindDeletedVorgangRequest request, StreamObserver<GrpcFindVorgangResponse> responseObserver) {
- var responseStreamer = GrpcResponseBatchStreamer.create(GrpcFindVorgangResponseBuilder::new, responseObserver);
+ public void findDeletedVorgang(GrpcFindDeletedVorgangRequest request, StreamObserver<GrpcFindDeletedVorgangResponse> responseObserver) {
+ var responseStreamer = GrpcResponseBatchStreamer.create(GrpcFindDeletedVorgangResponseBuilder::new, responseObserver);
vorgangService.findDeleted().map(vorgangStubMapper::toGrpcVorgangHeader).forEach(responseStreamer::send);
responseStreamer.finish();
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceITCase.java
index e7ce1a2d5..24d8152f7 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceITCase.java
@@ -246,9 +246,9 @@ class VorgangGrpcServiceITCase {
private static final int DELETED_VORGANG_COUNT = DEFAULT_BATCH_SIZE + INCOMPLETE_BATCH_SIZE;
@Mock
- private StreamObserver<GrpcFindVorgangResponse> streamObserver;
+ private StreamObserver<GrpcFindDeletedVorgangResponse> streamObserver;
@Captor
- private ArgumentCaptor<GrpcFindVorgangResponse> findVorgangResponseCaptor;
+ private ArgumentCaptor<GrpcFindDeletedVorgangResponse> findVorgangResponseCaptor;
@BeforeEach
void init() {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceTest.java
index 973daab56..aea3a5e94 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangGrpcServiceTest.java
@@ -526,7 +526,7 @@ class VorgangGrpcServiceTest {
@Mock
private GrpcResponseBatchStreamer<GrpcVorgangHeader, GrpcFindVorgangResponse> batchStreamer;
@Mock
- private StreamObserver<GrpcFindVorgangResponse> responseObserver;
+ private StreamObserver<GrpcFindDeletedVorgangResponse> responseObserver;
private final VorgangStub vorgangStub = VorgangStubTestFactory.create();
private final GrpcVorgangHeader grpcVorgangHeader = GrpcVorgangHeaderTestFactory.create();
--
GitLab