From af2f8eee1aafacbd855cd1436bbc32d84b168ce6 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Fri, 21 Feb 2025 15:13:41 +0100
Subject: [PATCH] OZG-4097 Add bean qualifier to file service
---
lombok.config | 4 +++-
scripts/tag-and-push-vorgang-manager-image.sh | 2 +-
.../postfach/osiv2/attachment/Osi2AttachmentFileService.java | 3 +++
.../postfach/osiv2/config/Osi2PostfachProperties.java | 2 ++
.../ozgcloud/nachrichten/postfach/osiv2/TestApplication.java | 3 ---
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lombok.config b/lombok.config
index 92efe13..1d1c35e 100644
--- a/lombok.config
+++ b/lombok.config
@@ -4,4 +4,6 @@ lombok.log.log4j.flagUsage = ERROR
lombok.data.flagUsage = ERROR
lombok.nonNull.exceptionType = IllegalArgumentException
lombok.nonNull.flagUsage = ERROR
-lombok.addLombokGeneratedAnnotation = true
\ No newline at end of file
+lombok.addLombokGeneratedAnnotation = true
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Qualifier
+lombok.copyableAnnotations += org.springframework.beans.factory.annotation.Value
\ No newline at end of file
diff --git a/scripts/tag-and-push-vorgang-manager-image.sh b/scripts/tag-and-push-vorgang-manager-image.sh
index a935863..b530349 100755
--- a/scripts/tag-and-push-vorgang-manager-image.sh
+++ b/scripts/tag-and-push-vorgang-manager-image.sh
@@ -2,7 +2,7 @@
set -e
-VERSION=2.22.0-OZG-4094-SNAPSHOT-9
+VERSION=2.23.0-OZG-4097-SNAPSHOT-12
docker tag docker.ozg-sh.de/vorgang-manager:build-latest docker.ozg-sh.de/vorgang-manager:$VERSION
docker push docker.ozg-sh.de/vorgang-manager:$VERSION
\ No newline at end of file
diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/attachment/Osi2AttachmentFileService.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/attachment/Osi2AttachmentFileService.java
index 6e91793..fa0c2c0 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/attachment/Osi2AttachmentFileService.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/attachment/Osi2AttachmentFileService.java
@@ -6,6 +6,8 @@ import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
+import org.springframework.beans.factory.annotation.Qualifier;
+
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.file.OzgCloudFile;
@@ -26,6 +28,7 @@ public class Osi2AttachmentFileService {
private BinaryFileServiceGrpc.BinaryFileServiceBlockingStub binaryFileServiceStub;
private final Osi2AttachmentFileMapper attachmentFileMapper;
+ @Qualifier(OZG_CLOUD_FILE_SERVICE_NAME)
private final OzgCloudFileService ozgCloudFileService;
private final OzgCloudCallContextProvider ozgCloudCallContextProvider;
diff --git a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/Osi2PostfachProperties.java b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/Osi2PostfachProperties.java
index 2ed0945..f908633 100644
--- a/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/Osi2PostfachProperties.java
+++ b/src/main/java/de/ozgcloud/nachrichten/postfach/osiv2/config/Osi2PostfachProperties.java
@@ -23,6 +23,8 @@ import lombok.Setter;
public class Osi2PostfachProperties {
// From de.ozgcloud.nachrichten.NachrichtenManagerConfiguration
public static final String GRPC_FILE_MANAGER_NAME = "file-manager";
+ // From de.ozgcloud.nachrichten.NachrichtenManagerConfiguration
+ public static final String OZG_CLOUD_FILE_SERVICE_NAME = "nachrichten_OzgCloudFileService";
public static final String PREFIX = "ozgcloud.osiv2";
diff --git a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/TestApplication.java b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/TestApplication.java
index ab1c656..7a6df86 100644
--- a/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/TestApplication.java
+++ b/src/test/java/de/ozgcloud/nachrichten/postfach/osiv2/TestApplication.java
@@ -24,9 +24,6 @@ public class TestApplication {
public static final String NACHRICHTEN_MANAGER_CLIENT_NAME = "OzgCloud_NachrichtenManager";
public static final String NACHRICHTEN_MANAGER_SENDER_USER_ID = "system-nachrichten_manager-sender";
- // From de.ozgcloud.nachrichten.NachrichtenManagerConfiguration
- public static final String OZG_CLOUD_FILE_SERVICE_NAME = "nachrichten_OzgCloudFileService";
-
@GrpcClient(GRPC_FILE_MANAGER_NAME)
private BinaryFileServiceGrpc.BinaryFileServiceBlockingStub fileServiceBlockingStub;
@GrpcClient(GRPC_FILE_MANAGER_NAME)
--
GitLab