From f30f0e9abfb1bc75cdcad72f77df6b74bf6953b0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 25 Nov 2024 18:21:51 +0100
Subject: [PATCH] remove vorgang-attached-item grpc client
---
.../src/main/resources/application-local.yml | 2 --
vorgang-manager-server/src/main/resources/application.yml | 3 ---
.../vorgang/collaboration/CollaborationITCase.java | 7 +++++--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/vorgang-manager-server/src/main/resources/application-local.yml b/vorgang-manager-server/src/main/resources/application-local.yml
index 783f70766..f6a467f49 100644
--- a/vorgang-manager-server/src/main/resources/application-local.yml
+++ b/vorgang-manager-server/src/main/resources/application-local.yml
@@ -38,8 +38,6 @@ grpc:
negotiationType: PLAINTEXT
vorgang-manager:
negotiationType: PLAINTEXT
- vorgang-attached-item:
- negotiationType: PLAINTEXT
server:
security:
enabled: false
diff --git a/vorgang-manager-server/src/main/resources/application.yml b/vorgang-manager-server/src/main/resources/application.yml
index f9366db61..7bf48c56c 100644
--- a/vorgang-manager-server/src/main/resources/application.yml
+++ b/vorgang-manager-server/src/main/resources/application.yml
@@ -44,9 +44,6 @@ grpc:
negotiationType: PLAINTEXT
zufi-manager:
negotiationType: TLS
- vorgang-attached-item:
- address: self:self
- negotiationType: TLS
server:
security:
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
index f9080eeb1..263f7b44c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/collaboration/CollaborationITCase.java
@@ -24,6 +24,7 @@
package de.ozgcloud.vorgang.collaboration;
import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.InstanceOfAssertFactories.*;
import static org.awaitility.Awaitility.*;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.*;
@@ -58,6 +59,7 @@ import org.springframework.test.annotation.DirtiesContext;
import com.google.protobuf.ByteString;
import com.thedeanda.lorem.LoremIpsum;
+import de.ozgcloud.apilib.client_attribute.grpc.OzgCloudClientAttributeMapper;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.user.OzgCloudUserProfile;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
@@ -103,7 +105,6 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
"grpc.client.vorgang-manager.address=in-process:test",
"grpc.client.ozgcloud-command-manager.address=in-process:test",
"grpc.client.file-manager.address=in-process:test",
- "grpc.client.vorgang-attached-item.address=in-process:test",
"grpc.client.inProcess.address=in-process:test",
"grpc.client.pluto.address=in-process:test"
})
@@ -123,13 +124,15 @@ class CollaborationITCase {
private MongoOperations mongoOperations;
@MockBean
- @Qualifier(CollaborationManagerConfiguration.OZG_CLOUD_USER_PROFILE_SERVICE_NAME)
+ @Qualifier(CollaborationManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME)
private OzgCloudUserProfileService collaborationOzgCloudUserProfileService;
@MockBean
private PostfachRemoteService postfachRemoteService;
@Mock
private OzgCloudUserProfile ozgCloudUserProfile;
+ @MockBean
+ private OzgCloudClientAttributeMapper clientAttributeMapper;
private String vorgangId;
--
GitLab