From 807bb943ffe438efbca944126be54dd8b57dd1c7 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 12 Oct 2023 17:53:47 +0200
Subject: [PATCH] OZG-4390 add component strategy to mappers
---
.../de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java | 4 +++-
.../ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java | 4 +++-
.../ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java | 4 +++-
.../apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java | 3 +++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java
index 23070d3..b2f3663 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java
@@ -1,8 +1,10 @@
package de.ozgcloud.apilib.vorgang;
+import static org.mapstruct.MappingConstants.ComponentModel.*;
+
import org.mapstruct.Mapper;
-@Mapper
+@Mapper(componentModel = SPRING)
public interface OzgCloudVorgangIdMapper {
OzgCloudVorgangId fromString(String vorgangId);
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
index f024d80..5fd6373 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java
@@ -1,5 +1,7 @@
package de.ozgcloud.apilib.vorgang.grpc;
+import static org.mapstruct.MappingConstants.ComponentModel.*;
+
import java.util.List;
import java.util.stream.Stream;
@@ -15,7 +17,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudFormDataEntry;
import de.ozgcloud.apilib.vorgang.OzgCloudFormField;
import de.ozgcloud.apilib.vorgang.OzgCloudSubForm;
-@Mapper
+@Mapper(componentModel = SPRING)
public interface OzgCloudEingangMapper {
// TODO map files
diff --git a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
index 3973f79..115e72f 100644
--- a/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
+++ b/api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java
@@ -1,5 +1,7 @@
package de.ozgcloud.apilib.vorgang.grpc;
+import static org.mapstruct.MappingConstants.ComponentModel.*;
+
import java.util.Optional;
import org.mapstruct.Mapper;
@@ -12,7 +14,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgang;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStatus;
-@Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class })
+@Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class }, componentModel = SPRING)
public interface OzgCloudVorgangMapper {
@Mapping(target = "eingangs", ignore = true)
diff --git a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
index ff22489..197b54d 100644
--- a/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
+++ b/api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapperTest.java
@@ -10,6 +10,7 @@ import org.mockito.Spy;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangEingangTestFactory;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangHeaderTestFactory;
+import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
class OzgCloudVorgangMapperTest {
@@ -19,6 +20,8 @@ class OzgCloudVorgangMapperTest {
@Spy
private OzgCloudEingangMapper eingangMapper = Mappers.getMapper(OzgCloudEingangMapper.class);
+ @Spy
+ private OzgCloudVorgangIdMapper idMapper = Mappers.getMapper(OzgCloudVorgangIdMapper.class);
@Nested
class TestFromGrpc {
--
GitLab