From 8c806bea2d0bb332697618132e8cc7182b8c4c8b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 13 Dec 2024 17:25:12 +0100
Subject: [PATCH] OZG-7350 fix Bean name confilct
---
.../collaboration/CollaborationManagerConfiguration.java | 1 +
.../ozgcloud/collaboration/fachstelle/FachstelleMapper.java | 5 ++++-
.../collaboration/fachstelle/FachstelleRemoteService.java | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
index de0c54b..e1d333b 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
@@ -61,6 +61,7 @@ public class CollaborationManagerConfiguration {
public static final String VORGANG_OZGCLOUD_SERVICE_NAME = "collaboration_OzgCloudVorgangService";
public static final String COLLABORATION_SERVICE_NAME = "collaboration_CollaborationService";
public static final String COLLABORATION_REQUEST_MAPPER_NAME = "collaboration_CollaborationRequestMapper";
+ public static final String FACHSTELLE_MAPPER_NAME = "collaboration_FachstelleMapper";
public static final String TEMPLATE_HANDLER_NAME = "collaboration_TemplateHandler";
public static final String VORGANG_ATTACHED_ITEM_REMOTE_SERVICE_NAME = "collaboration_VorgangAttachedItemRemoteService";
public static final String VORGANG_ATTACHED_ITEM_SERVICE_NAME = "collaboration_VorgangAttachedItemService";
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
index af1774c..dfc9c6b 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleMapper.java
@@ -2,16 +2,19 @@ package de.ozgcloud.collaboration.fachstelle;
import java.util.Map;
+import org.mapstruct.AnnotateWith;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
+import org.springframework.stereotype.Component;
+import de.ozgcloud.collaboration.CollaborationManagerConfiguration;
import de.ozgcloud.zufi.grpc.fachstelle.GrpcFachstelle;
import de.ozgcloud.zufi.grpc.organisationseinheit.GrpcOrganisationsEinheit;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-
+@AnnotateWith(value = Component.class, elements = @AnnotateWith.Element(strings = CollaborationManagerConfiguration.FACHSTELLE_MAPPER_NAME))
public interface FachstelleMapper {
@Mapping(target = "technicalId", source = "id")
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java
index 2ed202a..d15023c 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/fachstelle/FachstelleRemoteService.java
@@ -1,5 +1,6 @@
package de.ozgcloud.collaboration.fachstelle;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import de.ozgcloud.collaboration.CollaborationManagerConfiguration;
@@ -18,6 +19,7 @@ class FachstelleRemoteService {
private final FachstelleServiceBlockingStub fachstelleServiceBlockingStub;
@GrpcClient(CollaborationManagerConfiguration.GRPC_ZUFI_MANAGER_NAME)
private final OrganisationsEinheitServiceBlockingStub organisationsEinheitServiceBlockingStub;
+ @Qualifier(CollaborationManagerConfiguration.FACHSTELLE_MAPPER_NAME) // NOSONAR
private final FachstelleMapper fachstelleMapper;
public Fachstelle getExterneFachstelle(String id) {
--
GitLab