From d073da50d40ca4a24e1e38c1d11240c5d4e552f3 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Fri, 11 Oct 2024 14:08:26 +0200 Subject: [PATCH] OZG-6811 Set Bean name for Mappers --- bescheid-manager/pom.xml | 2 +- .../main/java/de/ozgcloud/bescheid/BescheidGrpcService.java | 2 ++ .../src/main/java/de/ozgcloud/bescheid/BescheidMapper.java | 3 +++ .../src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml index 3fb3aa6e7..19ad95e91 100644 --- a/bescheid-manager/pom.xml +++ b/bescheid-manager/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>de.ozgcloud.common</groupId> <artifactId>ozgcloud-common-parent</artifactId> - <version>4.3.1</version> + <version>4.3.2</version> <relativePath /> </parent> diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java index e17e1443f..81a730791 100644 --- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java +++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java @@ -3,6 +3,7 @@ package de.ozgcloud.bescheid; import java.util.Optional; import java.util.stream.Stream; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; import de.ozgcloud.bescheid.BescheidServiceGrpc.BescheidServiceImplBase; @@ -20,6 +21,7 @@ import net.devh.boot.grpc.server.service.GrpcService; class BescheidGrpcService extends BescheidServiceImplBase { private final BescheidService service; + @Qualifier("deprecatedBescheidMapper") private final BescheidMapper mapper; @Override diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java index c1330860c..7624432d0 100644 --- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java +++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java @@ -13,6 +13,7 @@ import java.util.Optional; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; +import org.mapstruct.AnnotateWith; import org.mapstruct.CollectionMappingStrategy; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -20,6 +21,7 @@ import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.NullValuePropertyMappingStrategy; import org.mapstruct.ReportingPolicy; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import de.ozgcloud.command.Command; import de.ozgcloud.common.binaryfile.FileId; @@ -40,6 +42,7 @@ import de.ozgcloud.document.common.attached_item.AttachedItemService; collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, // nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, // nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) // +@AnnotateWith(value = Component.class, elements = @AnnotateWith.Element(strings = "deprecatedBescheidMapper")) @Deprecated public abstract class BescheidMapper { diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java index 138a5af62..0d7c6c930 100644 --- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java +++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java @@ -7,14 +7,17 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.collections.MapUtils; +import org.mapstruct.AnnotateWith; import org.mapstruct.CollectionMappingStrategy; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; +import org.springframework.stereotype.Component; import de.ozgcloud.document.bescheid.SentInfo; @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED) +@AnnotateWith(value = Component.class, elements = @AnnotateWith.Element(strings = "deprecatedSentInfoMapper")) @Deprecated public interface SentInfoMapper { -- GitLab