From 0f5b82237ec2bd44f0684ed3973bfb48518ed259 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 16 Oct 2024 16:57:02 +0200
Subject: [PATCH] OZG-6944 add qualifier to OzgCloudFileMapper
---
.../nachrichten/NachrichtenManagerConfiguration.java | 1 +
.../nachrichten/antragraum/AntragraumGrpcService.java | 3 +++
.../ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java | 5 +++++
pom.xml | 2 +-
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/NachrichtenManagerConfiguration.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/NachrichtenManagerConfiguration.java
index 3f38811..a7a1e8c 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/NachrichtenManagerConfiguration.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/NachrichtenManagerConfiguration.java
@@ -23,6 +23,7 @@ public class NachrichtenManagerConfiguration {
public static final String NACHRICHTEN_VORGANG_SERVICE = "nachrichten_vorgangService";
public static final String NACHRICHTEN_VORGANG_REMOTE_SERVICE = "nachrichten_vorgangRemoteService";
public static final String NACHRICHTEN_ATTACHED_ITEM_SERVICE = "nachrichten_attachedItemService";
+ public static final String NACHRICHTEN_OZG_CLOUD_FILE_MAPPER = "nachrichten_OzgCloudFileMapperImpl";
public static final String GRPC_VORGANG_MANAGER_NAME = "vorgang-manager";
public static final String GRPC_COMMAND_MANAGER_NAME = "command-manager";
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
index a1998eb..0adbabe 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumGrpcService.java
@@ -34,12 +34,14 @@ import java.util.stream.Stream;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import com.google.protobuf.ByteString;
import de.ozgcloud.apilib.file.OzgCloudFile;
import de.ozgcloud.common.errorhandling.TechnicalException;
+import de.ozgcloud.nachrichten.NachrichtenManagerConfiguration;
import de.ozgcloud.nachrichten.common.vorgang.VorgangService;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import io.grpc.stub.StreamObserver;
@@ -57,6 +59,7 @@ class AntragraumGrpcService extends AntragraumServiceGrpc.AntragraumServiceImplB
private final AntragraumNachrichtMapper mapper;
private final RueckfrageMapper rueckfrageMapper;
private final AttachmentFileRequestMapper attachmentFileRequestMapper;
+ @Qualifier(NachrichtenManagerConfiguration.NACHRICHTEN_OZG_CLOUD_FILE_MAPPER)
private final OzgCloudFileMapper ozgCloudFileMapper;
private final VorgangService vorgangService;
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java
index 7c4eaa1..43ccf9a 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/OzgCloudFileMapper.java
@@ -1,12 +1,17 @@
package de.ozgcloud.nachrichten.antragraum;
+import org.mapstruct.AnnotateWith;
+import org.mapstruct.AnnotateWith.Element;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
+import org.springframework.stereotype.Component;
import de.ozgcloud.apilib.file.OzgCloudFile;
+import de.ozgcloud.nachrichten.NachrichtenManagerConfiguration;
+@AnnotateWith(value = Component.class, elements = @Element(strings = NachrichtenManagerConfiguration.NACHRICHTEN_OZG_CLOUD_FILE_MAPPER))
@Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, unmappedTargetPolicy = ReportingPolicy.WARN)
interface OzgCloudFileMapper {
diff --git a/pom.xml b/pom.xml
index e941af5..c3e4718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.3.1</version>
+ <version>4.3.2</version>
</parent>
<groupId>de.ozgcloud.nachrichten</groupId>
--
GitLab