diff --git a/vorgang-manager-interface/src/main/protobuf/vorgang.proto b/vorgang-manager-interface/src/main/protobuf/vorgang.proto index 327a50e4133fdcf7b6a7c6386693bc6c5798fc06..37a64301daf83dd7d8729e620a1109d260b8edc1 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 8ed15a0370366e68db1830ef86f84d59132818f6..e827425674555744882a4ed8d19b51666af8ed95 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 7a7d74628f38a4ab041e412ad67135975f29426f..daa2f758bdfc53001ec2bf67c9b236c1423c9daa 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 e7ce1a2d5700cfbc7b4343f702b880ceefd9b54a..24d8152f703322dd571094e5b4eefd73463fbc87 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 973daab561ad7abb837ed9a8c0342b45ad0c3bbe..aea3a5e9472def6b896648cb395e4137ced56514 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();