Skip to content
Snippets Groups Projects
Commit dc50bcbe authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4688 Update dependency to zufi interface

parent a0ded685
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<spring-boot.build-image.imageName>docker.ozg-sh.de/vorgang-manager:build-latest</spring-boot.build-image.imageName> <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.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> <user-manager-interface.version>2.0.0</user-manager-interface.version>
<bescheid-manager.version>1.4.0</bescheid-manager.version> <bescheid-manager.version>1.4.0</bescheid-manager.version>
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.itvsh.kop.zufi</groupId> <groupId>de.ozgcloud.zufi</groupId>
<artifactId>kop-zufi-api</artifactId> <artifactId>zufi-manager-interface</artifactId>
<version>${ozgcloud.zufi.api.version}</version> <version>${zufi-manager-interface.version}</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -337,6 +337,14 @@ ...@@ -337,6 +337,14 @@
<artifactId>mongodb-springdata-v4-driver</artifactId> <artifactId>mongodb-springdata-v4-driver</artifactId>
<version>${mongock.version}</version> <version>${mongock.version}</version>
</dependency> </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> </dependencies>
<build> <build>
......
...@@ -4,9 +4,9 @@ import java.util.List; ...@@ -4,9 +4,9 @@ import java.util.List;
import org.springframework.stereotype.Service; 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.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc;
import lombok.NonNull; import lombok.NonNull;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import net.devh.boot.grpc.client.inject.GrpcClient; import net.devh.boot.grpc.client.inject.GrpcClient;
...@@ -15,7 +15,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient; ...@@ -15,7 +15,7 @@ import net.devh.boot.grpc.client.inject.GrpcClient;
@Service @Service
class ZufiRemoteService { class ZufiRemoteService {
@GrpcClient("zufi-manager") @GrpcClient("zufi-manager")
private VorgangManagerRegistrationServiceBlockingStub serviceStub; private VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub serviceStub;
public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) { public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) {
boolean success = getServiceStub() boolean success = getServiceStub()
...@@ -23,7 +23,7 @@ class ZufiRemoteService { ...@@ -23,7 +23,7 @@ class ZufiRemoteService {
LOG.info("Register success: " + success); LOG.info("Register success: " + success);
} }
private VorgangManagerRegistrationServiceBlockingStub getServiceStub() { private VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub getServiceStub() {
return serviceStub.withInterceptors(new VorgangManagerClientCallContextAttachingInterceptor()); return serviceStub.withInterceptors(new VorgangManagerClientCallContextAttachingInterceptor());
} }
......
package de.ozgcloud.vorgang.registry; package de.ozgcloud.vorgang.registry;
import de.itvsh.kop.zufi.grpc.registration.GrpcVorgangManagerRegistrationResponse; import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationResponse;
public class GrpcRegistrationResponseTestFactory { public class GrpcRegistrationResponseTestFactory {
public static GrpcVorgangManagerRegistrationResponse create() { public static GrpcVorgangManagerRegistrationResponse create() {
......
...@@ -13,9 +13,9 @@ import org.mockito.InjectMocks; ...@@ -13,9 +13,9 @@ import org.mockito.InjectMocks;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Spy; 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.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
import de.ozgcloud.zufi.grpc.registration.GrpcVorgangManagerRegistrationRequest;
import de.ozgcloud.zufi.grpc.registration.VorgangManagerRegistrationServiceGrpc;
class ZufiRemoteServiceTest { class ZufiRemoteServiceTest {
private static final String ORGANISATIONS_EINHEITEN_ID = "123456"; private static final String ORGANISATIONS_EINHEITEN_ID = "123456";
...@@ -27,7 +27,7 @@ class ZufiRemoteServiceTest { ...@@ -27,7 +27,7 @@ class ZufiRemoteServiceTest {
private ZufiRemoteService zufiRemoteService; private ZufiRemoteService zufiRemoteService;
@Mock @Mock
private VorgangManagerRegistrationServiceBlockingStub serviceStub; private VorgangManagerRegistrationServiceGrpc.VorgangManagerRegistrationServiceBlockingStub serviceStub;
@DisplayName("Test ZuFiRemoteService when VorgangManager address is configured") @DisplayName("Test ZuFiRemoteService when VorgangManager address is configured")
@Nested @Nested
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment