Merge pull request 'OZG-4561 use new vorgang-manager interfaces' (#339) from...

Merge pull request 'OZG-4561 use new vorgang-manager interfaces' (#339) from OZG-4561-use-new-vorgang-manager-interfaces into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/339


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

alfa-service/pom.xml

@@ -110,12 +110,12 @@
 
 		<!-- own projects -->
 		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-interface</artifactId>
+			<groupId>de.ozgcloud.vorgang</groupId>
+			<artifactId>vorgang-manager-interface</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-utils</artifactId>
+			<groupId>de.ozgcloud.vorgang</groupId>
+			<artifactId>vorgang-manager-utils</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>de.itvsh.kop.common</groupId>
@@ -164,11 +164,11 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>de.itvsh.ozg.pluto</groupId>
-			<artifactId>pluto-utils</artifactId>
+			<groupId>de.ozgcloud.vorgang</groupId>
+			<artifactId>vorgang-manager-utils</artifactId>
 			<type>test-jar</type>
 			<scope>test</scope>
-			<version>${pluto.version}</version>
+			<version>${vorgang-manager.version}</version>
 		</dependency>
 
 		<dependency>

alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java

@@ -2,8 +2,8 @@ package de.ozgcloud.alfa.common.attacheditem;
 
 import org.mapstruct.Mapper;
 
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
 
 @Mapper(uses = GrpcObjectMapper.class)
 interface VorgangAttachedItemMapper {

alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java

@@ -5,12 +5,12 @@ import java.util.stream.Stream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
 import de.ozgcloud.alfa.common.GrpcUtil;
 import de.ozgcloud.alfa.common.errorhandling.ResourceNotFoundException;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
 import io.grpc.Status.Code;
 import io.grpc.StatusRuntimeException;
 import net.devh.boot.grpc.client.inject.GrpcClient;

alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java

@@ -28,7 +28,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;

alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java

@@ -37,17 +37,17 @@ import org.springframework.stereotype.Service;
 import com.google.protobuf.ByteString;
 
 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.binaryFile.GrpcUploadBinaryFileMetaData;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
 import de.ozgcloud.alfa.common.callcontext.ContextService;
 import de.ozgcloud.alfa.common.file.OzgFile;
 import de.ozgcloud.alfa.common.file.OzgFileMapper;
+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.binaryFile.GrpcUploadBinaryFileMetaData;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service
@@ -93,7 +93,8 @@ class BinaryFileRemoteService {
 		return fileIdFuture;
 	}
 
-	BinaryFileUploadStreamObserver createUploadBinaryFileObserver(CompletableFuture<FileId> fileIdFuture, UploadBinaryFileRequest uploadBinaryFileRequest) {
+	BinaryFileUploadStreamObserver createUploadBinaryFileObserver(CompletableFuture<FileId> fileIdFuture,
+			UploadBinaryFileRequest uploadBinaryFileRequest) {
 		var metadataRequest = buildMetaDataRequest(uploadBinaryFileRequest);
 		var streamer = new ChunkedFileSender<>(uploadBinaryFileRequest.getUploadStream(), CHUNK_SIZE, this::buildChunkRequest, metadataRequest);
 		return new BinaryFileUploadStreamObserver(fileIdFuture, streamer);

alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java

@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.common.binaryfile;
 
 import java.util.concurrent.CompletableFuture;
 
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileResponse;
 import io.grpc.stub.ClientCallStreamObserver;
 import io.grpc.stub.ClientResponseObserver;
 import lombok.AccessLevel;
@@ -49,6 +49,7 @@ class BinaryFileUploadStreamObserver implements ClientResponseObserver<GrpcUploa
 		this.requestObserver = requestStream;
 		requestObserver.setOnReadyHandler(() -> fileStreamer.sendChunkTo(requestObserver));
 	}
+
 	@Override
 	public void onNext(GrpcUploadBinaryFileResponse response) {
 		fileId = response.getFileId();

alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java

@@ -26,7 +26,7 @@ package de.ozgcloud.alfa.common.callcontext;
 import org.mapstruct.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
 
 @Mapper
 public abstract class CallContextMapper {

alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java

@@ -32,11 +32,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
-import de.itvsh.ozg.pluto.grpc.command.GrpcUser;
 import de.ozgcloud.alfa.RequestAttributes;
 import de.ozgcloud.alfa.common.user.CurrentUserService;
 import de.ozgcloud.alfa.common.user.UserRole;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
+import de.ozgcloud.vorgang.grpc.command.GrpcUser;
 import io.grpc.Metadata;
 import lombok.extern.log4j.Log4j2;
 

alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java

@@ -25,9 +25,9 @@ package de.ozgcloud.alfa.common.clientattribute;
 
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
 import de.ozgcloud.alfa.common.GrpcUtil;
+import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service

alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java

@@ -26,9 +26,9 @@ package de.ozgcloud.alfa.common.clientattribute;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
 
 @Service
 public class ClientAttributeService {

alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java

@@ -37,8 +37,8 @@ import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
 
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandBody;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandBodyField;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandBody;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandBodyField;
 
 @Mapper
 public interface CommandBodyMapper {

alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java

@@ -33,13 +33,13 @@ import org.mapstruct.MappingConstants;
 import org.mapstruct.ValueMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.grpc.command.GrpcRedirectRequest;
 import de.ozgcloud.alfa.common.TimeMapper;
 import de.ozgcloud.alfa.common.callcontext.CallContextMapper;
 import de.ozgcloud.alfa.common.user.UserIdMapper;
 import de.ozgcloud.alfa.vorgang.forwarding.RedirectRequest;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcRedirectRequest;
 
 @Mapper(uses = { CallContextMapper.class, TimeMapper.class, CommandBodyMapper.class, GrpcObjectMapper.class, UserIdMapper.class })
 public abstract class CommandMapper {

alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java

@@ -30,19 +30,19 @@ import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcExistsPendingCommandsRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcFindCommandsRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcGetCommandRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcGetPendingCommandsRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcOrder;
-import de.itvsh.ozg.pluto.grpc.command.GrpcRedirectRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcRevokeCommandRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcSetCommandExecutedRequest;
 import de.ozgcloud.alfa.common.callcontext.ContextService;
 import de.ozgcloud.alfa.vorgang.forwarding.RedirectRequest;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcExistsPendingCommandsRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcFindCommandsRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcGetCommandRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcGetPendingCommandsRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
+import de.ozgcloud.vorgang.grpc.command.GrpcRedirectRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcSetCommandExecutedRequest;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service

alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java

@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.common.file;
 
 import org.mapstruct.Mapper;
 
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
 import de.ozgcloud.alfa.common.binaryfile.FileId;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
 
 @Mapper
 public interface OzgFileMapper {

alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java

@@ -28,10 +28,10 @@ import java.util.stream.Stream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.pluto.grpc.file.FileServiceGrpc.FileServiceBlockingStub;
 import de.ozgcloud.alfa.common.callcontext.ContextService;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetAttachmentsRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetRepresentationsRequest;
+import de.ozgcloud.vorgang.grpc.file.FileServiceGrpc.FileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsRequest;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsRequest;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service

alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java

@@ -34,10 +34,10 @@ import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ValueMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
 import de.ozgcloud.alfa.attachment.AttachmentMapper;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 abstract class KommentarMapper {

alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java

@@ -28,10 +28,10 @@ import java.util.stream.Stream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
 import de.ozgcloud.alfa.common.GrpcUtil;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service

alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java

@@ -37,10 +37,10 @@ import org.mapstruct.ValueMapping;
 
 import com.google.protobuf.ProtocolStringList;
 
-import de.itvsh.ozg.mail.postfach.GrpcPostfachMail;
 import de.ozgcloud.alfa.common.TimeMapper;
 import de.ozgcloud.alfa.common.binaryfile.FileId;
 import de.ozgcloud.alfa.common.user.UserIdMapper;
+import de.ozgcloud.nachrichten.postfach.GrpcPostfachMail;
 
 @Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, //
 		uses = { TimeMapper.class, UserIdMapper.class })

alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java

@@ -29,12 +29,12 @@ import java.util.stream.Stream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import de.itvsh.ozg.mail.postfach.GrpcFindPostfachMailRequest;
-import de.itvsh.ozg.mail.postfach.GrpcFindPostfachMailsRequest;
-import de.itvsh.ozg.mail.postfach.GrpcIsPostfachConfiguredRequest;
-import de.itvsh.ozg.mail.postfach.GrpcResendPostfachMailRequest;
-import de.itvsh.ozg.mail.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub;
 import de.ozgcloud.alfa.common.callcontext.ContextService;
+import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailRequest;
+import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailsRequest;
+import de.ozgcloud.nachrichten.postfach.GrpcIsPostfachConfiguredRequest;
+import de.ozgcloud.nachrichten.postfach.GrpcResendPostfachMailRequest;
+import de.ozgcloud.nachrichten.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 
 @Service

alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java

@@ -9,10 +9,10 @@ import org.mapstruct.Mapping;
 import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
 
-import de.itvsh.ozg.pluto.statistic.GrpcByStatusResult;
-import de.itvsh.ozg.pluto.statistic.GrpcPathCountResult;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangCountResponse;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticResult;
+import de.ozgcloud.vorgang.statistic.GrpcByStatusResult;
+import de.ozgcloud.vorgang.statistic.GrpcPathCountResult;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangCountResponse;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResult;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.WARN,
 		collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED,