Merge pull request 'remove vorgang-attached-item grpc client' (#514) from...

Merge pull request 'remove vorgang-attached-item grpc client' (#514) from AdjustGrpcClient into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/vorgang-manager/pulls/514


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

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

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:

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;