Merge branch 'master' into OZG-4606-userprofile-service

# Conflicts:
#	api-lib-core/pom.xml
#	ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java

api-lib-core/pom.xml

@@ -11,14 +11,12 @@
 	<artifactId>api-lib-core</artifactId>
 
 	<properties>
-		<lombok.version>1.18.26</lombok.version>
-		<mapstruct.version>1.5.4.Final</mapstruct.version>
+		<lombok.version>1.18.30</lombok.version>
+		<mapstruct.version>1.5.5.Final</mapstruct.version>
 		<!-- plugins -->
-		<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-		<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
-		<jacoco.plugin.version>0.8.10</jacoco.plugin.version>
-		
-		<user-manager.version>2.0.0-SNAPSHOT</user-manager.version>
+		<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
+		<maven-failsafe-plugin.version>3.2.2</maven-failsafe-plugin.version>
+		<jacoco.plugin.version>0.8.11</jacoco.plugin.version>
 	</properties>
 
 	<dependencies>
@@ -34,12 +32,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-interface</artifactId>
+			<groupId>de.ozgcloud.vorgang</groupId>
+			<artifactId>vorgang-manager-interface</artifactId>
+			<version>${vorgang-manager.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-utils</artifactId>
+			<groupId>de.ozgcloud.vorgang</groupId>
+			<artifactId>vorgang-manager-utils</artifactId>
+			<version>${vorgang-manager.version}</version>
 		</dependency>
 		
 		<dependency>

api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/CommandMapper.java

@@ -5,15 +5,15 @@ import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 
 import de.itvsh.kop.common.datatype.StringBasedValue;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandId;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
 import de.ozgcloud.apilib.common.datatypes.GenericId;
 import de.ozgcloud.apilib.user.OzgCloudUserId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
 
 @Mapper(uses = { GrpcObjectMapper.class })
 public interface CommandMapper {

api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandService.java

 package de.ozgcloud.apilib.common.command.grpc;
 
 import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.command.GrpcGetCommandRequest;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandId;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 

api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/OzgCloudCommandMapper.java

@@ -7,9 +7,9 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
 import de.itvsh.kop.common.datatype.StringBasedValue;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
 
 @Mapper(uses = GrpcObjectMapper.class)
 public interface OzgCloudCommandMapper {

api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java

@@ -12,18 +12,18 @@ import org.springframework.stereotype.Service;
 
 import de.itvsh.kop.common.binaryfile.FileId;
 import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFilesRequest;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
 import de.ozgcloud.apilib.file.OzgCloudFile;
 import de.ozgcloud.apilib.file.OzgCloudFileId;
 import de.ozgcloud.apilib.file.OzgCloudFileService;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcBinaryFilesRequest;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.java.Log;
 import net.devh.boot.grpc.client.inject.GrpcClient;

api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileDownloadStreamObserver.java

@@ -5,7 +5,7 @@ import java.io.OutputStream;
 import java.util.concurrent.CompletableFuture;
 
 import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
 import io.grpc.stub.StreamObserver;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;

api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/OzgCloudFileMapper.java

@@ -2,9 +2,9 @@ package de.ozgcloud.apilib.file.grpc;
 
 import org.mapstruct.Mapper;
 
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
 import de.ozgcloud.apilib.file.OzgCloudFile;
 import de.ozgcloud.apilib.file.OzgCloudFileId;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
 
 @Mapper
 public interface OzgCloudFileMapper {

api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/GrpcOzgCloudVorgangService.java

@@ -2,11 +2,6 @@ package de.ozgcloud.apilib.vorgang.grpc;
 
 import java.util.List;
 
-import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest.GrpcOrderBy;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangRequest;
-import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgang;
@@ -14,6 +9,11 @@ import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub;
 import de.ozgcloud.apilib.vorgang.Page;
+import de.ozgcloud.vorgang.vorgang.GrpcFilterBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest.GrpcOrderBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangRequest;
+import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import net.devh.boot.grpc.client.inject.GrpcClient;

api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudEingangMapper.java

@@ -6,14 +6,14 @@ import java.util.stream.Stream;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
-import de.itvsh.ozg.pluto.vorgang.GrpcSubForm;
 import de.ozgcloud.apilib.vorgang.OzgCloudEingang;
 import de.ozgcloud.apilib.vorgang.OzgCloudFormDataEntry;
 import de.ozgcloud.apilib.vorgang.OzgCloudFormField;
 import de.ozgcloud.apilib.vorgang.OzgCloudSubForm;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.vorgang.GrpcFormData;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
 
 @Mapper
 public interface OzgCloudEingangMapper {

api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangMapper.java

@@ -5,12 +5,12 @@ import java.util.Optional;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
 import de.ozgcloud.apilib.user.OzgCloudUserId;
 import de.ozgcloud.apilib.vorgang.OzgCloudServiceKontoType;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgang;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStatus;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
 
 @Mapper(uses = { OzgCloudEingangMapper.class, OzgCloudVorgangIdMapper.class })
 public interface OzgCloudVorgangMapper {

api-lib-core/src/main/java/de/ozgcloud/apilib/vorgang/grpc/OzgCloudVorgangStubMapper.java

@@ -3,9 +3,9 @@ package de.ozgcloud.apilib.vorgang.grpc;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHeader;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangIdMapper;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangStub;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
 
 @Mapper(uses = OzgCloudVorgangIdMapper.class)
 public interface OzgCloudVorgangStubMapper {

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandResponseTestFactory.java

 package de.ozgcloud.apilib.common.command.grpc;
 
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandResponse;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse;
 
 public class GrpcCommandResponseTestFactory {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCommandTestFactory.java

 package de.ozgcloud.apilib.common.command.grpc;
 
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
 
 public class GrpcCommandTestFactory {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcCreateCommandRequestTestFactory.java

@@ -2,10 +2,10 @@ package de.ozgcloud.apilib.common.command.grpc;
 
 import static de.ozgcloud.apilib.common.command.grpc.OzgCloudCommandTestFactory.*;
 
-import de.itvsh.ozg.pluto.common.GrpcObject;
-import de.itvsh.ozg.pluto.common.GrpcProperty;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
 import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
+import de.ozgcloud.vorgang.common.GrpcObject;
+import de.ozgcloud.vorgang.common.GrpcProperty;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
 
 public class GrpcCreateCommandRequestTestFactory {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandServiceTest.java

@@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -13,10 +12,10 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 
 import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
 import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandStatus;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
 
 class GrpcOzgCloudCommandServiceTest {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcFindFilesResponseTestFactory.java

 package de.ozgcloud.apilib.file.grpc;
 
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
 
 public class GrpcFindFilesResponseTestFactory {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java

@@ -12,10 +12,10 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
 import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
 import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
 
 class GrpcOzgCloudFileServiceTest {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgFileTestFactory.java

 package de.ozgcloud.apilib.file.grpc;
 
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
 import de.ozgcloud.apilib.file.OzgCloudFileTestFactory;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
 
 public class GrpcOzgFileTestFactory {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcAntragstellerTestFactory.java

@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
 
 import static de.ozgcloud.apilib.vorgang.OzgCloudAntragstellerTestFactory.*;
 
-import de.itvsh.ozg.pluto.vorgang.GrpcAntragsteller;
+import de.ozgcloud.vorgang.vorgang.GrpcAntragsteller;
 
 public class GrpcAntragstellerTestFactory {
 

api-lib-core/src/test/java/de/ozgcloud/apilib/vorgang/grpc/GrpcEingangHeaderTestFactory.java

@@ -2,7 +2,7 @@ package de.ozgcloud.apilib.vorgang.grpc;
 
 import static de.ozgcloud.apilib.vorgang.OzgCloudEingangHeaderTestFactory.*;
 
-import de.itvsh.ozg.pluto.vorgang.GrpcEingangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcEingangHeader;
 
 public class GrpcEingangHeaderTestFactory {