From 8383deb7b462d8856d3bd11870e776ed16e9db4c Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Wed, 6 Nov 2024 14:17:07 +0100 Subject: [PATCH] OZG-6162 OZG-7060 Remove grpc client file-manager --- 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, 1 insertion(+), 8 deletions(-) diff --git a/alfa-server/src/main/resources/application-local.yml b/alfa-server/src/main/resources/application-local.yml index cf81eb981e..1dd7f05bdf 100644 --- a/alfa-server/src/main/resources/application-local.yml +++ b/alfa-server/src/main/resources/application-local.yml @@ -16,8 +16,6 @@ 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 252bea338e..f5642fefec 100644 --- a/alfa-server/src/main/resources/application.yml +++ b/alfa-server/src/main/resources/application.yml @@ -66,9 +66,6 @@ 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 219022e4ff..fc033f658d 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,8 +40,6 @@ 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 c650c035b1..060821f04b 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.FILE_MANAGER_GRPC_CLIENT) + @GrpcClient(GrpcUtil.VORGANG_MANAGER_GRPC_CLIENT) private ExportServiceBlockingStub exportServiceStub; public ExportedVorgangFile exportVorgang(String vorgangId) { -- GitLab