Merge branch 'master' into OZG-2737_MigrationUserId

notification-manager/src/main/java/de/itvsh/kop/notification/user/UserRemoteService.java

 package de.itvsh.kop.notification.user;
 
-import de.itvsh.kop.user.recipient.GrpcFindRecipientRequest;
-import de.itvsh.kop.user.recipient.RecipientServiceGrpc;
-import net.devh.boot.grpc.client.inject.GrpcClient;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientRequest;
+import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc;
+import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
 public class UserRemoteService {

notification-manager/src/test/java/de/itvsh/kop/notification/user/GrpcFindRecipientRequestTestFactory.java

 package de.itvsh.kop.notification.user;
 
-import de.itvsh.kop.user.recipient.GrpcFindRecipientResponse;
+import de.itvsh.kop.user.grpc.recipient.GrpcFindRecipientResponse;
 import de.itvsh.kop.user.recipient.GrpcRecipient;
 
 public class GrpcFindRecipientRequestTestFactory {

notification-manager/src/test/java/de/itvsh/kop/notification/user/UserRemoteServiceTest.java

 package de.itvsh.kop.notification.user;
 
-import de.itvsh.kop.user.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
+import de.itvsh.kop.user.grpc.recipient.RecipientServiceGrpc.RecipientServiceBlockingStub;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;

pluto-server/src/main/resources/application-dev.yml

@@ -12,4 +12,4 @@ pluto:
     mail-from: ea@ozg-sh.de
 kop:
   notification:
-    mail-from: test@ozg-sh.de
+    mail-from: hilfe@kop.support