From ad6d51cc5a0054b19154fc9c1d33834221ed787d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 13 Mar 2024 16:24:12 +0100
Subject: [PATCH] OZG-5009 remove unnecessary null check
---
.../de/ozgcloud/alfa/bescheid/BescheidMapper.java | 11 ++---------
.../de/ozgcloud/alfa/bescheid/BescheidMapperTest.java | 7 -------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
index 1be2ab7e8d..1720be1c06 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidMapper.java
@@ -8,15 +8,8 @@ import org.mapstruct.ReportingPolicy;
import de.ozgcloud.bescheid.GrpcBescheid;
@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-abstract class BescheidMapper {
-
- public Bescheid fromGrpc(GrpcBescheid grpcBescheid, String vorgangId) {
- if (grpcBescheid == null) {
- return null;
- }
- return map(grpcBescheid, vorgangId);
- }
+interface BescheidMapper {
@Mapping(target = "vorgangId", source = "vorgangId")
- protected abstract Bescheid map(GrpcBescheid grpcBescheid, String vorgangId);
+ Bescheid fromGrpc(GrpcBescheid grpcBescheid, String vorgangId);
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
index 268c731007..9070e2d799 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidMapperTest.java
@@ -36,13 +36,6 @@ class BescheidMapperTest {
assertThat(bescheid.getBeschiedenAm()).isEqualTo(GrpcBescheidTestFactory.BESCHIEDEN_AM);
}
- @Test
- void shouldReturnNullOnNullGrpcBescheid() {
- var bescheid = mapper.fromGrpc(null, VorgangHeaderTestFactory.ID);
-
- assertThat(bescheid).isNull();
- }
-
private Bescheid map() {
return mapper.fromGrpc(GrpcBescheidTestFactory.create(), VorgangHeaderTestFactory.ID);
}
--
GitLab