From dc50bcbe84cfb80c1fdd0eb6899b94cae5c7a2c0 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 13 Dec 2023 09:32:32 +0100
Subject: [PATCH] OZG-4688 Update dependency to zufi interface
---
vorgang-manager-server/pom.xml | 16 ++++++++++++----
.../vorgang/registry/ZufiRemoteService.java | 8 ++++----
.../GrpcRegistrationResponseTestFactory.java | 2 +-
.../vorgang/registry/ZufiRemoteServiceTest.java | 6 +++---
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index a1fc61203..be52d89a5 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -50,7 +50,7 @@
<spring-boot.build-image.imageName>docker.ozg-sh.de/vorgang-manager:build-latest</spring-boot.build-image.imageName>
<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
- <ozgcloud.zufi.api.version>0.5.0</ozgcloud.zufi.api.version>
+ <zufi-manager-interface.version>1.0.0-SNAPSHOT</zufi-manager-interface.version>
<user-manager-interface.version>2.0.0</user-manager-interface.version>
<bescheid-manager.version>1.4.0</bescheid-manager.version>
@@ -115,9 +115,9 @@
</dependency>
<dependency>
- <groupId>de.itvsh.kop.zufi</groupId>
- <artifactId>kop-zufi-api</artifactId>
- <version>${ozgcloud.zufi.api.version}</version>
+ <groupId>de.ozgcloud.zufi</groupId>
+ <artifactId>zufi-manager-interface</artifactId>
+ <version>${zufi-manager-interface.version}</version>
</dependency>
<dependency>
@@ -337,6 +337,14 @@
<artifactId>mongodb-springdata-v4-driver</artifactId>
<version>${mongock.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <version>4.1.101.Final</version>
+ <classifier>osx-aarch_64</classifier>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
index 5c1556ec7..5c2fdca0a 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java
@@ -4,9 +4,9 @@ import java.util.List;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
-import de.itvsh.kop.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
+import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
+import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import net.devh.boot.grpc.client.inject.GrpcClient;
@@ -15,7 +15,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
class ZufiRemoteService {
@GrpcClient("zufi-manager")
- private VorgangManagerRegistrationServiceBlockingStub serviceStub;
+ private VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub serviceStub;
public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) {
boolean success = getServiceStub()
@@ -23,7 +23,7 @@ class ZufiRemoteService {
LOG.info("Register success: " + success);
}
- private VorgangManagerRegistrationServiceBlockingStub getServiceStub() {
+ private VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub getServiceStub() {
return serviceStub.withInterceptors(new VorgangManagerClientCallContextAttachingInterceptor());
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java
index ee9f438ca..7bf1b282a 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/GrpcRegistrationResponseTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.vorgang.registry;
-import de.itvsh.kop.zufi.grpc.registration.GrpcVorgangManagerRegistrationResponse;
+import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationResponse;
public class GrpcRegistrationResponseTestFactory {
public static GrpcVorgangManagerRegistrationResponse create() {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java
index 6610cf167..044d79c45 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/registry/ZufiRemoteServiceTest.java
@@ -13,9 +13,9 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
-import de.itvsh.kop.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub;
import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
+import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
+import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc;
class ZufiRemoteServiceTest {
private static final String ORGANISATIONS_EINHEITEN_ID = "123456";
@@ -27,7 +27,7 @@ class ZufiRemoteServiceTest {
private ZufiRemoteService zufiRemoteService;
@Mock
- private VorgangManagerRegistrationServiceBlockingStub serviceStub;
+ private VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub serviceStub;
@DisplayName("Test ZuFiRemoteService when VorgangManager address is configured")
@Nested
--
GitLab