diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml index 36244e91f889b028ae6ccf5c0bba71aa72f580e2..98a0a404a7e021af5821f16ef5a905405f722331 100644 --- a/alfa-service/pom.xml +++ b/alfa-service/pom.xml @@ -122,7 +122,7 @@ <artifactId>kop-common-pdf</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.user</groupId> + <groupId>de.ozgcloud.user</groupId> <artifactId>user-manager-interface</artifactId> </dependency> diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java index c6f19bda5791cbfad36e36d639f6d959f5196e77..71d6af36d4ce1b9b5caa286fabe8c5cea369bb5b 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserProfileMapper.java @@ -2,7 +2,7 @@ package de.ozgcloud.alfa.common.user; import org.mapstruct.Mapper; -import de.itvsh.kop.user.userprofile.GrpcUserProfile; +import de.ozgcloud.user.userprofile.GrpcUserProfile; @Mapper interface UserProfileMapper { diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java index 7db3ccda82b53462cee606c1d4e31f1dd11e40e2..ac6fc34e80fda4e4d376d305320fbc0afca74c29 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/user/UserRemoteService.java @@ -29,9 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; -import de.itvsh.kop.user.grpc.userprofile.GrpcGetUserProfileRequest; -import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc; -import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; +import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc; +import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; +import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest; import io.grpc.Channel; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java index 928df7144f7361a3b05f6dc23d198852b4d4037b..e1896cc9a854fe7dfec1a9b7082153f26ec4e1b3 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserProfileTestFactory.java @@ -23,9 +23,9 @@ */ package de.ozgcloud.alfa.common.user; -import de.itvsh.kop.user.grpc.userprofile.GrpcGetUserProfileRequest; -import de.itvsh.kop.user.grpc.userprofile.GrpcGetUserProfileResponse; -import de.itvsh.kop.user.userprofile.GrpcUserProfile; +import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest; +import de.ozgcloud.user.userprofile.GrpcGetUserProfileResponse; +import de.ozgcloud.user.userprofile.GrpcUserProfile; public class GrpcUserProfileTestFactory { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java index c99e22f6ceb79a615ffb521d767d4b347a004707..3b6b6c045916633ce1dbe57b7cba36cffe707582 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserProfileMapperTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mapstruct.factory.Mappers; -import de.itvsh.kop.user.userprofile.GrpcUserProfile; +import de.ozgcloud.user.userprofile.GrpcUserProfile; class UserProfileMapperTest { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java index d0987b8d13c738497fdd9187a1ef82804b3f9e5f..f72097c265bf6277fdb93bec2c849f9716c02147 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/UserRemoteServiceTest.java @@ -37,8 +37,8 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import de.itvsh.kop.user.grpc.userprofile.GrpcGetUserProfileRequest; -import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; +import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; +import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -98,11 +98,11 @@ class UserRemoteServiceTest { class TestFindByExternalId { @Test void shouldHandleNotFound() { - when(serviceStub.getByExternalId(any())).thenThrow(new StatusRuntimeException(Status.NOT_FOUND)); - - var result = service.getByExternalId(UserProfileTestFactory.EXTERNAL_ID); + when(serviceStub.getByExternalId(any())).thenThrow(new StatusRuntimeException(Status.NOT_FOUND)); - assertThat(result).isEmpty(); + var result = service.getByExternalId(UserProfileTestFactory.EXTERNAL_ID); + + assertThat(result).isEmpty(); } } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3339e610600442106d5757eee3fc2a1353c48f41..1b009d5407066c3fba08ae433f8e7a09a61cc52a 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ <vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version> <kop-common-pdf.version>2.3.1</kop-common-pdf.version> - <user-manager.version>1.6.0</user-manager.version> + <user-manager.version>2.0.0-SNAPSHOT</user-manager.version> </properties> <build> @@ -111,7 +111,7 @@ <version>${kop-common-pdf.version}</version> </dependency> <dependency> - <groupId>de.itvsh.kop.user</groupId> + <groupId>de.ozgcloud.user</groupId> <artifactId>user-manager-interface</artifactId> <version>${user-manager.version}</version> <exclusions>