From 389ea689cecabc5f7092e8580802300d1334eb04 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 6 Nov 2024 17:42:25 +0100
Subject: [PATCH] Revert "OZG-6162 OZG-7060 Remove grpc client file-manager"
This reverts commit 8383deb7b462d8856d3bd11870e776ed16e9db4c.
(cherry picked from commit b7791003a64756ad5320cfec22efbd35eaa195df)
---
alfa-server/src/main/resources/application-local.yml | 2 ++
alfa-server/src/main/resources/application.yml | 3 +++
.../src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java | 2 ++
.../main/java/de/ozgcloud/alfa/export/ExportRemoteService.java | 2 +-
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/alfa-server/src/main/resources/application-local.yml b/alfa-server/src/main/resources/application-local.yml
index 1dd7f05bdf..cf81eb981e 100644
--- a/alfa-server/src/main/resources/application-local.yml
+++ b/alfa-server/src/main/resources/application-local.yml
@@ -16,6 +16,8 @@ grpc:
negotiationType: PLAINTEXT
zufi-manager:
negotiationType: PLAINTEXT
+ file-manager:
+ negotiationType: PLAINTEXT
ozgcloud:
feature:
diff --git a/alfa-server/src/main/resources/application.yml b/alfa-server/src/main/resources/application.yml
index f5642fefec..252bea338e 100644
--- a/alfa-server/src/main/resources/application.yml
+++ b/alfa-server/src/main/resources/application.yml
@@ -66,6 +66,9 @@ grpc:
zufi-manager:
address: static://127.0.0.1:9190
negotiationType: TLS
+ file-manager:
+ address: static://127.0.0.1:9090
+ negotiationType: TLS
ozgcloud:
auth:
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
index fc033f658d..219022e4ff 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/GrpcUtil.java
@@ -40,6 +40,8 @@ public class GrpcUtil {
public static final String ZUFI_MANAGER_GRPC_CLIENT = "zufi-manager";
+ public static final String FILE_MANAGER_GRPC_CLIENT = "file-manager";
+
public static final String SERVICE_KEY = "GRPC_SERVICE";
public static Key<String> keyOfString(String key) {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java
index 060821f04b..c650c035b1 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/export/ExportRemoteService.java
@@ -10,7 +10,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
class ExportRemoteService {
- @GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT)
+ @GrpcClient(GrpcUtil.FILE_MANAGER_GRPC_CLIENT)
private ExportServiceBlockingStub exportServiceStub;
public ExportedVorgangFile exportVorgang(String vorgangId) {
--
GitLab