adjust ozgcloudfilesservice bean definition

collaboration-manager-interface/pom.xml

@@ -37,7 +37,7 @@
 
 	<groupId>de.ozgcloud.collaboration</groupId>
 	<artifactId>collaboration-manager-interface</artifactId>
-	<version>0.3.0</version>
+	<version>0.3.1-SNAPSHOT</version>
 
 	<name>OZG-Cloud Collaboration Manager gRPC Interface</name>
 	<description>Interface (gRPC) for Collaboration Manager</description>

collaboration-manager-server/pom.xml

@@ -32,7 +32,7 @@
 	<parent>
 		<groupId>de.ozgcloud.collaboration</groupId>
 		<artifactId>collaboration-manager</artifactId>
-		<version>0.3.0</version>
+		<version>0.3.1-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java

@@ -29,8 +29,13 @@ import org.springframework.context.annotation.Configuration;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
 import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
+import de.ozgcloud.apilib.file.OzgCloudFileService;
+import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
+import de.ozgcloud.apilib.file.grpc.OzgCloudFileMapper;
 import de.ozgcloud.collaboration.common.callcontext.CollaborationManagerCallContextProvider;
-import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Configuration
@@ -43,20 +48,31 @@ public class CollaborationManagerConfiguration {
 	public static final String VORGANG_REMOTE_SERVICE_NAME = "collaboration_VorgangRemoteService";
 	public static final String COLLABORATION_SERVICE_NAME = "collaboration_CollaborationService";
 	public static final String TEMPLATE_HANDLER_NAME = "collaboration_TemplateHandler";
+	public static final String FILE_SERVICE_NAME = "collaboration_OzgCloudFileService";
 
 	public static final String CALL_CONTEXT_INTERCEPTOR_NAME = "collaboration_CallContextInterceptor";
 	public static final String CALL_CONTEXT_PROVIDER_NAME = "collaboration_CallContextProvider";
 
 	public static final String GRPC_VORGANG_MANAGER_NAME = "vorgang-manager";
 	public static final String GRPC_COMMAND_MANAGER_NAME = "command-manager";
+	public static final String GRPC_FILE_MANAGER_NAME = "file-manager";
 
 	@GrpcClient(CollaborationManagerConfiguration.GRPC_COMMAND_MANAGER_NAME)
-	private CommandServiceGrpc.CommandServiceBlockingStub commandServiceStub;
+	private CommandServiceBlockingStub commandServiceStub;
 
-	@Bean(COMMAND_SERVICE_NAME)
-	// NOSONAR
+	@GrpcClient(CollaborationManagerConfiguration.GRPC_FILE_MANAGER_NAME)
+	private BinaryFileServiceBlockingStub binaryFileServiceStub;
+	@GrpcClient(CollaborationManagerConfiguration.GRPC_FILE_MANAGER_NAME)
+	private BinaryFileServiceStub binaryFileServiceAsyncStub;
+
+	@Bean(COMMAND_SERVICE_NAME) // NOSONAR
 	OzgCloudCommandService grpcOzgCloudCommandService(CommandMapper commandMapper, CollaborationManagerCallContextProvider contextProvider) {
 		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider,
 				GrpcOzgCloudCommandService.DEFAULT_COMMAND_REQUEST_THRESHOLD_MILLIS);
 	}
+
+	@Bean(FILE_SERVICE_NAME) // NOSONAR
+	OzgCloudFileService grpcOzgClouFileService(OzgCloudFileMapper fileMapper, CollaborationManagerCallContextProvider contextProvider) {
+		return new GrpcOzgCloudFileService(binaryFileServiceStub, binaryFileServiceAsyncStub, contextProvider, fileMapper);
+	}
 }
\ No newline at end of file

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationService.java

@@ -72,6 +72,7 @@ public class CollaborationService {
 	@Qualifier(CollaborationManagerConfiguration.USER_PROFILE_SERVICE_NAME) // NOSONAR
 	private final UserProfileService userProfileService;
 
+	@Qualifier(CollaborationManagerConfiguration.FILE_SERVICE_NAME)
 	private final OzgCloudFileService fileService;
 
 	private final CollaborationManagerCollaborationRequestMapper collaborationRequestMapper;

pom.xml

@@ -37,7 +37,7 @@
 
 	<groupId>de.ozgcloud.collaboration</groupId>
 	<artifactId>collaboration-manager</artifactId>
-	<version>0.3.0</version>
+	<version>0.3.1-SNAPSHOT</version>
 
 	<name>OZG-Cloud Collaboration Manager</name>
 	<packaging>pom</packaging>