From 5c0228cb8b725ecff3162064db75496db024b3a3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 25 Nov 2024 18:15:43 +0100
Subject: [PATCH] rename const; use vorgang-manager grpc client for
attached_item
---
.../collaboration/CollaborationManagerConfiguration.java | 5 ++---
.../collaboration/common/user/UserProfileService.java | 2 +-
.../attached_item/VorgangAttachedItemRemoteService.java | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
index 1a04366..80496bb 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/CollaborationManagerConfiguration.java
@@ -54,7 +54,7 @@ public class CollaborationManagerConfiguration {
public static final String COMMAND_SERVICE_NAME = "collaboration_OzgCloudCommandService";
public static final String FILE_SERVICE_NAME = "collaboration_OzgCloudFileService";
public static final String CURRENT_USER_SERVICE_NAME = "collaboration_CurrentUserService";
- public static final String OZG_CLOUD_USER_PROFILE_SERVICE_NAME = "collaboration_OzgCloudUserProfileService";
+ public static final String OZGCLOUD_USER_PROFILE_SERVICE_NAME = "collaboration_OzgCloudUserProfileService";
public static final String USER_PROFILE_SERVICE_NAME = "collaboration_UserProfileService";
public static final String VORGANG_SERVICE_NAME = "collaboration_VorgangService";
public static final String VORGANG_REMOTE_SERVICE_NAME = "collaboration_VorgangRemoteService";
@@ -72,7 +72,6 @@ public class CollaborationManagerConfiguration {
public static final String GRPC_COMMAND_MANAGER_NAME = "command-manager";
public static final String GRPC_FILE_MANAGER_NAME = "file-manager";
public static final String GRPC_USER_MANAGER_NAME = "user-manager";
- public static final String GRPC_VORGANG_ATTACHED_ITEM_SERVICE_NAME = "vorgang-attached-item";
@GrpcClient(GRPC_COMMAND_MANAGER_NAME)
private CommandServiceBlockingStub commandServiceStub;
@@ -105,7 +104,7 @@ public class CollaborationManagerConfiguration {
return new GrpcOzgCloudVorgangService(vorgangServiceStub, vorgangMapper, vorgangStubMapper, vorgangQueryMapper, contextProvider);
}
- @Bean(OZG_CLOUD_USER_PROFILE_SERVICE_NAME)
+ @Bean(OZGCLOUD_USER_PROFILE_SERVICE_NAME) // NOSONAR
OzgCloudUserProfileService grpcOzgCloudUserProfileService(UserProfileMapper userProfileMapper,
CollaborationManagerCallContextProvider contextProvider) {
return new GrpcOzgCloudUserProfileService(userProfileServiceStub, userProfileMapper, contextProvider);
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java
index bed150f..79b0322 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/user/UserProfileService.java
@@ -41,7 +41,7 @@ public class UserProfileService {
@Qualifier(CollaborationManagerConfiguration.CURRENT_USER_SERVICE_NAME) // NOSONAR
private final CurrentUserService currentUserService;
- @Qualifier(CollaborationManagerConfiguration.OZG_CLOUD_USER_PROFILE_SERVICE_NAME)
+ @Qualifier(CollaborationManagerConfiguration.OZGCLOUD_USER_PROFILE_SERVICE_NAME)
private final Optional<OzgCloudUserProfileService> ozgCloudUserProfileService;
private final CollaborationUserProfileMapper mapper;
diff --git a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/vorgang/attached_item/VorgangAttachedItemRemoteService.java b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/vorgang/attached_item/VorgangAttachedItemRemoteService.java
index d5015bf..4b86d0a 100644
--- a/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/vorgang/attached_item/VorgangAttachedItemRemoteService.java
+++ b/collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/common/vorgang/attached_item/VorgangAttachedItemRemoteService.java
@@ -16,7 +16,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service(CollaborationManagerConfiguration.VORGANG_ATTACHED_ITEM_REMOTE_SERVICE_NAME)
class VorgangAttachedItemRemoteService {
- @GrpcClient(CollaborationManagerConfiguration.GRPC_VORGANG_ATTACHED_ITEM_SERVICE_NAME)
+ @GrpcClient(CollaborationManagerConfiguration.GRPC_VORGANG_MANAGER_NAME)
private VorgangAttachedItemServiceBlockingStub stub;
@Autowired
private CollaborationManagerVorgangAttachedItemMapper mapper;
--
GitLab