From 40713a192f0bf8c9f7b81674ed6c3e404d6acec7 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 22 Dec 2023 08:36:39 +0100
Subject: [PATCH] OZG-4606 add missing dependency, fix renaming issues
---
bescheid-manager/pom.xml | 10 +++++++---
.../common/callcontext/CurrentUserService.java | 2 +-
.../src/main/resources/application.yml | 15 +++++++--------
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index f7f9cb1e1..923194a80 100644
--- a/bescheid-manager/pom.xml
+++ b/bescheid-manager/pom.xml
@@ -46,7 +46,7 @@
<artifactId>api-lib-core</artifactId>
<version>${api-lib.version}</version>
</dependency>
-
+
<!-- spring -->
<dependency>
@@ -66,17 +66,21 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webflux</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.projectreactor.netty</groupId>
+ <artifactId>reactor-netty-http</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
-
+
<!--dev tools-->
<dependency>
<groupId>org.mapstruct</groupId>
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java
index ee4c2e5bd..4f5adf641 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java
@@ -35,10 +35,10 @@ import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
import de.ozgcloud.command.Command;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
diff --git a/vorgang-manager-server/src/main/resources/application.yml b/vorgang-manager-server/src/main/resources/application.yml
index db30d0cdd..9de3521b9 100644
--- a/vorgang-manager-server/src/main/resources/application.yml
+++ b/vorgang-manager-server/src/main/resources/application.yml
@@ -74,11 +74,10 @@ ozgcloud:
# file-manager:
# address: ${ozgcloud.vorgang-manager.address}
# negotiation-type: plaintext
-# command-manager:
-# address: ${ozgcloud.vorgang-manager.address}
-# address: self:self
-# negotiation-type: plaintext
-# user-manager:
-# address: ${grpc.client.user-manager.address:false}
-# address: static://127.0.0.1:9000
-# negotiation-type: ${grpc.client.user-manager.negotiationType:TLS}
\ No newline at end of file
+ command-manager:
+ address: self:self
+ negotiation-type: plaintext
+ user-manager:
+ address: ${grpc.client.user-manager.address}
+ negotiation-type: ${grpc.client.user-manager.negotiationType
+ }
\ No newline at end of file
--
GitLab