From c12523e629657c45394b430705d25c9c7dd5d6d0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 19 Oct 2023 17:11:26 +0200
Subject: [PATCH] fix command service configuration
---
.../OzgCloudClientAutoConfiguration.java | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
index a24f8e8..8337636 100644
--- a/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
+++ b/ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java
@@ -25,6 +25,7 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
import de.ozgcloud.apilib.file.dummy.DummyOzgCloudFileService;
import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
+import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.apilib.vorgang.dummy.DummyVorgangService;
import de.ozgcloud.apilib.vorgang.grpc.GrpcOzgCloudVorgangService;
@@ -68,6 +69,15 @@ public class OzgCloudClientAutoConfiguration {
return properties;
}
+ @Bean
+ @ConditionalOnProperty("ozgcloud.command-manager.address")
+ GrpcChannelsProperties commandProperties() {
+ var properties = new GrpcChannelsProperties();
+ var clientMap = properties.getClient();
+ addCommandManager(clientMap);
+ return properties;
+ }
+
private void addVorgangManager(Map<String, GrpcChannelProperties> clientMap) {
var channelProps = new GrpcChannelProperties();
channelProps.setAddress(vorgangManagerProperties.getAddress());
@@ -123,9 +133,14 @@ public class OzgCloudClientAutoConfiguration {
return new DummyVorgangService();
}
+ @Bean
+ OzgCloudVorgangIdMapper ozgCloudVorgangIdMapper() {
+ return Mappers.getMapper(OzgCloudVorgangIdMapper.class);
+ }
+
@Bean
@ConditionalOnProperty("ozgcloud.command-manager.address")
- OzgCloudCommandService grpcCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
+ OzgCloudCommandService grpcOzgCloudCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
CommandMapper commandMapper, OzgCloudCallContextProvider contextProvider) {
return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider);
}
--
GitLab