From a1730ed9fb860035301e0de2be03aeb973043fbc Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 13 Oct 2023 11:00:24 +0200
Subject: [PATCH] OZG-4390 configure mapper beans per autoconfiguration
---
.../de/ozgcloud/apilib/vorgang/OzgCloudVorgangIdMapper.java | 4 +---
.../ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java | 4 +---
.../ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java | 4 +---
.../autoconfigure/OzgCloudClientAutoConfiguration.java | 5 ++++-
4 files changed, 7 insertions(+), 10 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 b2f3663..23070d3 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,10 +1,8 @@
package de.ozgcloud.apilib.vorgang;
-import static org.mapstruct.MappingConstants.ComponentModel.*;
-
import org.mapstruct.Mapper;
-@Mapper(componentModel = SPRING)
+@Mapper
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 5fd6373..f024d80 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,7 +1,5 @@
package de.ozgcloud.apilib.vorgang.grpc;
-import static org.mapstruct.MappingConstants.ComponentModel.*;
-
import java.util.List;
import java.util.stream.Stream;
@@ -17,7 +15,7 @@ import de.ozgcloud.apilib.vorgang.OzgCloudFormDataEntry;
import de.ozgcloud.apilib.vorgang.OzgCloudFormField;
import de.ozgcloud.apilib.vorgang.OzgCloudSubForm;
-@Mapper(componentModel = SPRING)
+@Mapper
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 115e72f..3973f79 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,7 +1,5 @@
package de.ozgcloud.apilib.vorgang.grpc;
-import static org.mapstruct.MappingConstants.ComponentModel.*;
-
import java.util.Optional;
import org.mapstruct.Mapper;
@@ -14,7 +12,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 }, componentModel = SPRING)
+@Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class })
public interface OzgCloudVorgangMapper {
@Mapping(target = "eingangs", ignore = true)
diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
index 61488c5..0398793 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
@@ -25,9 +25,11 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
+import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapperImpl;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
+import de.ozgcloud.apilib.vorgang.grpc.OzgCloudEingangMapperImpl;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangMapper;
import de.ozgcloud.apilib.vorgang.grpc.OzgCloudVorgangStubMapper;
import net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration;
@@ -39,7 +41,8 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@ComponentScan("de.ozgcloud.client.autoconfigure")
@Import({
GrpcOzgCloudFileService.class, DummyOzgCloudFileService.class,
- OzgCloudCallContextAttachingInterceptor.class
+ OzgCloudCallContextAttachingInterceptor.class,
+ OzgCloudVorgangIdMapperImpl.class, OzgCloudEingangMapperImpl.class, OzgCloudVorgangIdMapperImpl.class
})
public class OzgCloudClientAutoConfiguration {
--
GitLab