From 8e185f8b9ce7ce15cc39b1684862db2448673c16 Mon Sep 17 00:00:00 2001 From: Felix Reichenbach <felix.reichenbach@mgm-tp.com> Date: Mon, 6 Jan 2025 13:58:36 +0100 Subject: [PATCH] OZG-7038 remove TODO and unused private record --- .../de/ozgcloud/archive/common/command/CommandMapper.java | 4 ++-- .../callcontext/CallContextGrpcServerInterceptorTest.java | 4 +--- .../ozgcloud/archive/common/command/CommandTestFactory.java | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java index 8dda404..175a6ee 100644 --- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java +++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java @@ -41,10 +41,10 @@ import de.ozgcloud.vorgang.grpc.command.GrpcCommand; @AnnotateWith(value = Component.class, elements = @Element(strings = ArchiveManagerConfiguration.COMMAND_MAPPER_NAME)) interface CommandMapper { - @Mapping(target = "bodyObject", source = "bodyObj") @Mapping(target = "createdByClientName", ignore = true) // TODO Ergänzen sobald der aktueller Stand das zulässt - @Mapping(target = "relationVersion", ignore = true) // TODO Warum fehlt die? + @Mapping(target = "relationVersion", ignore = true) @Mapping(target = "body", ignore = true) + @Mapping(target = "bodyObject", source = "bodyObj") @Mapping(target = "order", source = "orderString") @Mapping(target = "finishedAt", expression = "java(mapToZonedDateTime(grpcCommand.getFinishedAt()))") ArchiveManagerCommand fromGrpc(GrpcCommand grpcCommand); diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java index 437490c..76556e7 100644 --- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java +++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java @@ -24,6 +24,7 @@ package de.ozgcloud.archive.common.callcontext; import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Optional; @@ -236,7 +237,4 @@ class CallContextGrpcServerInterceptorTest { private record RequestTest() { } - - private record ResponseTest() { - } } \ No newline at end of file diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java index c877368..22fbb41 100644 --- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java +++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java @@ -66,8 +66,6 @@ public class CommandTestFactory { .id(ID) .vorgangId(VORGANG_ID) .relationId(RELATION_ID) - // TODO Warum fehlt die? - // .relationVersion(RELATION_VERSION) .order(ORDER) .status(STATUS) .createdAt(CREATED_AT) -- GitLab