OZG-3532 update user-manager dependency and imports

notification-manager/pom.xml

@@ -39,7 +39,7 @@
 	<name>OZG-Cloud Notification Manager</name>
 
 	<properties>
-		<user-manager-interface.version>1.1.0</user-manager-interface.version>
+		<user-manager-interface.version>2.0.0-SNAPSHOT</user-manager-interface.version>
 		<kop.license.version>1.6.0</kop.license.version>
 	</properties>
 
@@ -61,7 +61,7 @@
 		</dependency>
 		
 		<dependency>
-			<groupId>de.itvsh.kop.user</groupId>
+			<groupId>de.ozgcloud.user</groupId>
 			<artifactId>user-manager-interface</artifactId>
 			<version>${user-manager-interface.version}</version>
 			<exclusions>

notification-manager/src/main/java/de/ozgcloud/notification/user/UserRecipientMapper.java

@@ -23,9 +23,10 @@
  */
 package de.ozgcloud.notification.user;
 
-import de.itvsh.kop.user.recipient.GrpcRecipient;
 import org.mapstruct.Mapper;
 
+import de.ozgcloud.user.recipient.GrpcRecipient;
+
 @Mapper
 interface UserRecipientMapper {
 

notification-manager/src/main/java/de/ozgcloud/notification/user/UserRemoteService.java

@@ -28,9 +28,9 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientRequest;
-import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc;
 import de.ozgcloud.notification.NotificationManagerCallContextAttachingInterceptor;
+import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientRequest;
+import de.ozgcloud.user.grpc.recipient.RecipientServiceGrpc;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service

notification-manager/src/test/java/de/ozgcloud/notification/user/GrpcFindRecipientRequestTestFactory.java

@@ -23,8 +23,8 @@
  */
 package de.ozgcloud.notification.user;
 
-import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientResponse;
-import de.itvsh.kop.user.recipient.GrpcRecipient;
+import de.ozgcloud.user.grpc.recipient.GrpcFindRecipientResponse;
+import de.ozgcloud.user.recipient.GrpcRecipient;
 
 public class GrpcFindRecipientRequestTestFactory {
 

notification-manager/src/test/java/de/ozgcloud/notification/user/GrpcUserRecipientTestFactory.java

@@ -23,7 +23,7 @@
  */
 package de.ozgcloud.notification.user;
 
-import de.itvsh.kop.user.recipient.GrpcRecipient;
+import de.ozgcloud.user.recipient.GrpcRecipient;
 
 public class GrpcUserRecipientTestFactory {
 

notification-manager/src/test/java/de/ozgcloud/notification/user/UserRemoteServiceTest.java

@@ -32,9 +32,9 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
 import de.ozgcloud.notification.NotificationManagerCallContextAttachingInterceptor;
 import de.ozgcloud.notification.vorgang.VorgangTestFactory;
+import de.ozgcloud.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
 
 class UserRemoteServiceTest {
 

vorgang-manager-server/pom.xml

@@ -50,7 +50,7 @@
 		<kop.license.version>1.3.0</kop.license.version>
 		<kop.zufi.api.version>0.5.0</kop.zufi.api.version>
 		
-		<user-manager-interface.version>1.11.0</user-manager-interface.version>
+		<user-manager-interface.version>2.0.0-SNAPSHOT</user-manager-interface.version>
 		<bescheid-manager.version>1.4.0-SNAPSHOT</bescheid-manager.version>
 		<processor-manager.version>0.2.0-SNAPSHOT</processor-manager.version>
 		<ozgcloud-starter.version>0.4.0-SNAPSHOT</ozgcloud-starter.version>
@@ -124,7 +124,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>de.itvsh.kop.user</groupId>
+			<groupId>de.ozgcloud.user</groupId>
 			<artifactId>user-manager-interface</artifactId>
 			<version>${user-manager-interface.version}</version>
 			<!-- TODO Nur proto sources verwenden um quarkus Abhaenigkeiten zu

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/migration/UserRemoteService.java

@@ -5,8 +5,8 @@ import java.util.Optional;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc;
-import de.itvsh.kop.user.userprofile.GrpcGetUserProfileRequest;
+import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc;
+import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest;
 import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
 import lombok.extern.log4j.Log4j2;
 import net.devh.boot.grpc.client.inject.GrpcClient;

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/userconfig/UserConfigRemoteService.java

@@ -6,8 +6,8 @@ import org.springframework.stereotype.Service;
 
 import com.google.protobuf.Empty;
 
-import de.itvsh.kop.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceBlockingStub;
-import de.itvsh.kop.user.organisationseinheit.GrpcOrganisationsEinheit;
+import de.ozgcloud.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceBlockingStub;
+import de.ozgcloud.user.organisationseinheit.GrpcOrganisationsEinheit;
 import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/user/UserProfileRemoteService.java

@@ -29,10 +29,10 @@ import org.springframework.stereotype.Service;
 
 import com.google.protobuf.Empty;
 
-import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
-import de.itvsh.kop.user.userprofile.GrpcDeleteInactiveUserRequest;
-import de.itvsh.kop.user.userprofile.GrpcFindInactiveUserIdsResponse;
-import de.itvsh.kop.user.userprofile.GrpcUserProfileId;
+import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
+import de.ozgcloud.user.userprofile.GrpcDeleteInactiveUserRequest;
+import de.ozgcloud.user.userprofile.GrpcFindInactiveUserIdsResponse;
+import de.ozgcloud.user.userprofile.GrpcUserProfileId;
 import lombok.extern.log4j.Log4j2;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/UserRemoteServiceTest.java

@@ -11,10 +11,10 @@ import org.mockito.Captor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc;
-import de.itvsh.kop.user.userprofile.GrpcGetUserProfileRequest;
-import de.itvsh.kop.user.userprofile.GrpcGetUserProfileResponse;
-import de.itvsh.kop.user.userprofile.GrpcUserProfile;
+import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc;
+import de.ozgcloud.user.userprofile.GrpcGetUserProfileRequest;
+import de.ozgcloud.user.userprofile.GrpcGetUserProfileResponse;
+import de.ozgcloud.user.userprofile.GrpcUserProfile;
 import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
 
 class UserRemoteServiceTest {

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/userconfig/GrpcGetSupportedOrganisationEinheitenResponseTestFactory.java

 package de.ozgcloud.vorgang.common.userconfig;
 
-import de.itvsh.kop.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse;
-import de.itvsh.kop.user.organisationseinheit.GrpcOrganisationsEinheit;
+import de.ozgcloud.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse;
+import de.ozgcloud.user.organisationseinheit.GrpcOrganisationsEinheit;
 
 public class GrpcGetSupportedOrganisationEinheitenResponseTestFactory {
 	public static String ORGANISATIONS_EINHEIT_ID = "123456";

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/userconfig/UserConfigRemoteServiceTest.java

@@ -12,7 +12,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.itvsh.kop.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceBlockingStub;
+import de.ozgcloud.user.grpc.organisationseinheit.OrganisationsEinheitServiceGrpc.OrganisationsEinheitServiceBlockingStub;
 import de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor;
 
 class UserConfigRemoteServiceTest {

vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/user/UserProfileRemoteServiceTest.java

@@ -34,11 +34,10 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc;
-import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
-import de.itvsh.kop.user.userprofile.GrpcDeleteInactiveUserRequest;
-import de.itvsh.kop.user.userprofile.GrpcFindInactiveUserIdsResponse;
-import de.itvsh.kop.user.userprofile.GrpcUserProfileId;
+import de.ozgcloud.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
+import de.ozgcloud.user.userprofile.GrpcDeleteInactiveUserRequest;
+import de.ozgcloud.user.userprofile.GrpcFindInactiveUserIdsResponse;
+import de.ozgcloud.user.userprofile.GrpcUserProfileId;
 import de.ozgcloud.vorgang.callcontext.UserTestFactory;
 
 class UserProfileRemoteServiceTest {