From be0d349bffb0973db757354204015b7484526313 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 28 Nov 2023 15:59:01 +0100
Subject: [PATCH] OZG-4561 use new vorgang-manager interfaces
---
alfa-service/pom.xml | 14 ++++----
.../VorgangAttachedItemMapper.java | 4 +--
.../VorgangAttachedItemRemoteService.java | 8 ++---
.../BinaryFileDownloadStreamObserver.java | 2 +-
.../binaryfile/BinaryFileRemoteService.java | 19 +++++------
.../BinaryFileUploadStreamObserver.java | 5 +--
.../common/callcontext/CallContextMapper.java | 2 +-
.../common/callcontext/ContextService.java | 4 +--
.../ClientAttributeRemoteService.java | 4 +--
.../ClientAttributeService.java | 8 ++---
.../common/command/CommandBodyMapper.java | 4 +--
.../alfa/common/command/CommandMapper.java | 6 ++--
.../common/command/CommandRemoteService.java | 22 ++++++-------
.../alfa/common/file/OzgFileMapper.java | 2 +-
.../common/file/OzgFileRemoteService.java | 6 ++--
.../alfa/kommentar/KommentarMapper.java | 6 ++--
.../kommentar/KommentarRemoteService.java | 6 ++--
.../alfa/postfach/PostfachMailMapper.java | 2 +-
.../postfach/PostfachMailRemoteService.java | 10 +++---
.../alfa/statistic/StatisticMapper.java | 8 ++---
.../statistic/StatisticRemoteService.java | 14 ++++----
.../alfa/system/RemoteSystemStatusMapper.java | 3 +-
.../system/SystemStatusRemoteService.java | 7 ++--
.../alfa/vorgang/AntragstellerMapper.java | 4 +--
.../alfa/vorgang/ClientAttributeUtils.java | 4 +--
.../alfa/vorgang/EingangHeaderMapper.java | 2 +-
.../ozgcloud/alfa/vorgang/EingangMapper.java | 4 +--
.../alfa/vorgang/ServiceKontoMapper.java | 4 +--
.../alfa/vorgang/VorgangHeaderMapper.java | 6 ++--
.../alfa/vorgang/VorgangRemoteService.java | 14 ++++----
.../vorgang/VorgangWithEingangMapper.java | 6 ++--
.../alfa/vorgang/ZustaendigeStelleMapper.java | 5 +--
.../vorgang/forwarding/ForwardingMapper.java | 2 +-
.../forwarding/ForwardingRemoteService.java | 4 +--
.../wiedervorlage/WiedervorlageMapper.java | 4 +--
.../WiedervorlageRemoteService.java | 18 +++++------
...GrpcGetAttachmentsResponseTestFactory.java | 4 +--
.../common/GrpcCallContextTestFactory.java | 4 +--
...VorgangAttachedItemRequestTestFactory.java | 15 +++++----
...organgAttachedItemResponseTestFactory.java | 4 +--
...VorgangAttachedItemRequestTestFactory.java | 14 ++++----
...organgAttachedItemResponseTestFactory.java | 4 +--
.../VorgangAttachedItemMapperTest.java | 2 +-
.../VorgangAttachedItemRemoteServiceTest.java | 10 +++---
.../BinaryFileDownloadStreamObserverTest.java | 2 +-
.../BinaryFileRemoteServiceTest.java | 16 +++++-----
.../binaryfile/BinaryFileTestFactory.java | 2 +-
.../BinaryFileUploadStreamObserverTest.java | 2 +-
.../binaryfile/ChunkedFileSenderTest.java | 8 ++---
...pcUploadBinaryFileMetaDataTestFactory.java | 2 +-
...rpcUploadBinaryFileRequestTestFactory.java | 4 +--
.../callcontext/ContextServiceTest.java | 2 +-
.../ClientAttributeRemoteServiceTest.java | 2 +-
.../ClientAttributeServiceTest.java | 2 +-
.../GrpcClientAttributeTestFactory.java | 6 ++--
.../common/command/CommandBodyMapperTest.java | 4 +--
.../common/command/CommandMapperTest.java | 8 ++---
.../command/CommandRemoteServiceTest.java | 32 +++++++++----------
.../GrpcCommandResponseTestFactory.java | 4 +--
.../command/GrpcCommandTestFactory.java | 8 ++---
.../GrpcPostfachCommandTestFactory.java | 4 +--
.../common/file/GrpcOzgFileTestFactory.java | 2 +-
.../common/file/OzgFileRemoteServiceTest.java | 12 +++----
.../alfa/common/user/GrpcUserTestFactory.java | 2 +-
.../alfa/kommentar/KommentarMapperTest.java | 2 +-
.../kommentar/KommentarRemoteServiceTest.java | 12 +++----
.../GrpcPostfachAddressTestFactory.java | 6 ++--
.../postfach/GrpcPostfachMailTestFactory.java | 8 ++---
.../alfa/postfach/PostfachMailITCase.java | 4 +--
.../PostfachMailRemoteServiceTest.java | 16 +++++-----
...GetRepresentationsResponseTestFactory.java | 4 +--
.../GrpcByStatusResultTestFactory.java | 2 +-
.../GrpcVorgangCountTestFactory.java | 6 ++--
.../GrpcVorgangStatisticQueryTestFactory.java | 2 +-
...pcVorgangStatisticResponseTestFactory.java | 2 +-
...GrpcVorgangStatisticResultTestFactory.java | 2 +-
.../statistic/StatisticRemoteServiceTest.java | 14 ++++----
...rpcGetSystemStatusResponseTestFactory.java | 2 +-
.../system/SystemStatusRemoteServiceTest.java | 6 ++--
.../alfa/vorgang/AntragstellerMapperTest.java | 2 +-
.../vorgang/ClientAttributeUtilsTest.java | 2 +-
.../alfa/vorgang/EingangMapperTest.java | 4 +--
.../vorgang/GrpcAntragstellerTestFactory.java | 6 ++--
.../GrpcClientAttributeTestFactory.java | 8 ++---
.../vorgang/GrpcEingangHeaderTestFactory.java | 2 +-
.../alfa/vorgang/GrpcEingangTestFactory.java | 6 ++--
.../alfa/vorgang/GrpcFilterByTestFactory.java | 2 +-
.../GrpcFindVorgangRequestTestFactory.java | 4 +--
.../alfa/vorgang/GrpcFormDataMapperTest.java | 8 ++---
.../vorgang/GrpcFormFieldTestFactory.java | 2 +-
.../vorgang/GrpcServiceKontoTestFactory.java | 2 +-
.../alfa/vorgang/GrpcSubFormTestFactory.java | 4 +--
.../GrpcVorgangAttachedItemTestFactory.java | 6 ++--
.../vorgang/GrpcVorgangHeaderTestFactory.java | 2 +-
.../alfa/vorgang/GrpcVorgangTestFactory.java | 4 +--
...VorgangWithEingangResponseTestFactory.java | 2 +-
.../GrpcVorgangWithEingangTestFactory.java | 6 ++--
.../GrpcZustaendigeStelleTestFactory.java | 2 +-
.../alfa/vorgang/ServiceKontoMapperTest.java | 2 +-
.../alfa/vorgang/VorgangHeaderMapperTest.java | 4 +--
.../vorgang/VorgangRemoteServiceTest.java | 8 ++---
.../VorgangWithEingangMapperITCase.java | 10 +++---
.../ForwardingRemoteServiceTest.java | 10 +++---
.../WiedervorlageMapperTest.java | 2 +-
.../WiedervorlageRemoteServiceTest.java | 18 +++++------
pom.xml | 14 ++++----
106 files changed, 330 insertions(+), 324 deletions(-)
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index b11ce7176a..36244e91f8 100644
--- a/alfa-service/pom.xml
+++ b/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>
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java
index 978020bc9b..1123434bbc 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapper.java
+++ b/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 {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
index cb39a46b23..a9652adecc 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteService.java
+++ b/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;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
index 2b24b6cf23..d864231f7a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserver.java
+++ b/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;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
index 01d7ef0fbb..ed69dbdc03 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteService.java
+++ b/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);
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java
index 55af48b1d5..c11a717e41 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserver.java
+++ b/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();
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java
index 9a096c4068..496889eb4f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/CallContextMapper.java
+++ b/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 {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
index e5abcb4a07..74cb6123a5 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/callcontext/ContextService.java
+++ b/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;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
index 027d3b9a4e..de6b7301d5 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteService.java
+++ b/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
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
index 8d24e9e292..99efbe3761 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeService.java
+++ b/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 {
@@ -52,7 +52,7 @@ public class ClientAttributeService {
.setVorgangId(vorgangId)
.setAttribute(
GrpcClientAttribute.newBuilder().setValue(
- GrpcClientAttributeValue.newBuilder().setBoolValue(value).build())
+ GrpcClientAttributeValue.newBuilder().setBoolValue(value).build())
.setClientName(ORIGINAL_CLIENT_NAME)
.setAttributeName(attributeName)
.build())
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java
index 4eb40cde31..8e85e537c2 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandBodyMapper.java
+++ b/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 {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java
index 1e0a41cf5a..1a35db39cb 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandMapper.java
+++ b/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 {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java
index e5c7e4d9d4..32407d5266 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandRemoteService.java
+++ b/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
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java
index e946422a9e..6b3371976c 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileMapper.java
+++ b/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 {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java
index 9268d7103f..e19127ec39 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/file/OzgFileRemoteService.java
+++ b/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
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java
index 07a69bdf2d..8657ccbbf0 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarMapper.java
+++ b/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 {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java
index d14fa8cd29..368da8e20a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarRemoteService.java
+++ b/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
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java
index f3fc54c69d..2e60f5b659 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailMapper.java
+++ b/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 })
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java
index 9f32e10b57..d39bb9819f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteService.java
+++ b/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
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
index b75551ca3c..3be93cd822 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
+++ b/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,
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
index 7ef9c3b7cf..b97fcadbc0 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
@@ -8,16 +8,16 @@ import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangCountRequest;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticQuery;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticQuery.GroupMethod;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticQuery.Operator;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticRequest;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticResponse;
-import de.itvsh.ozg.pluto.statistic.StatisticServiceGrpc.StatisticServiceBlockingStub;
import de.ozgcloud.alfa.AlfaProperties;
import de.ozgcloud.alfa.common.GrpcUtil;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangCountRequest;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.GroupMethod;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.Operator;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticRequest;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResponse;
+import de.ozgcloud.vorgang.statistic.StatisticServiceGrpc.StatisticServiceBlockingStub;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java
index f6716f492f..143cdfe3ab 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/system/RemoteSystemStatusMapper.java
@@ -23,9 +23,10 @@
*/
package de.ozgcloud.alfa.system;
-import de.itvsh.ozg.pluto.system.GrpcGetSystemStatusResponse;
import org.mapstruct.Mapper;
+import de.ozgcloud.vorgang.system.GrpcGetSystemStatusResponse;
+
@Mapper
interface RemoteSystemStatusMapper {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java
index 1b72f771d9..6f0001a6fe 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusRemoteService.java
@@ -23,12 +23,13 @@
*/
package de.ozgcloud.alfa.system;
-import de.itvsh.ozg.pluto.system.GrpcGetSystemStatusRequest;
-import de.itvsh.ozg.pluto.system.SystemStatusServiceGrpc.SystemStatusServiceBlockingStub;
-import net.devh.boot.grpc.client.inject.GrpcClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import de.ozgcloud.vorgang.system.GrpcGetSystemStatusRequest;
+import de.ozgcloud.vorgang.system.SystemStatusServiceGrpc.SystemStatusServiceBlockingStub;
+import net.devh.boot.grpc.client.inject.GrpcClient;
+
@Service
class SystemStatusRemoteService {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java
index 5268cb8166..ee2fc0b48f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/AntragstellerMapper.java
@@ -28,9 +28,9 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValueMappingStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy;
-import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
-import de.itvsh.ozg.pluto.vorgang.GrpcAntragsteller;
import de.ozgcloud.alfa.common.StringToNullMapper;
+import de.ozgcloud.vorgang.common.grpc.GrpcFormDataMapper;
+import de.ozgcloud.vorgang.vorgang.GrpcAntragsteller;
@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.SET_TO_NULL, //
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, //
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java
index 5bbb1918b9..d9a9b117d1 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtils.java
@@ -28,8 +28,8 @@ import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java
index a8f16b1ab3..b2f1bc9063 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangHeaderMapper.java
@@ -27,7 +27,7 @@ import java.time.ZonedDateTime;
import org.mapstruct.Mapper;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcEingangHeader;
@Mapper
interface EingangHeaderMapper {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java
index 3ba503b13e..b4a0c681c6 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/EingangMapper.java
@@ -29,8 +29,8 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.NullValueMappingStrategy;
import org.mapstruct.NullValuePropertyMappingStrategy;
-import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.common.grpc.GrpcFormDataMapper;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
@Mapper(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.SET_TO_NULL, //
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, //
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java
index 3398c50bb5..34ae1b9242 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapper.java
@@ -5,8 +5,8 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueMappingStrategy;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.vorgang.GrpcServiceKonto;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.vorgang.GrpcServiceKonto;
@Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, //
nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL, //
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java
index 69ce20920f..a7334e89a6 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapper.java
@@ -31,11 +31,11 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ReportingPolicy;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHeader;
import de.ozgcloud.alfa.common.clientattribute.ClientAttributeService;
import de.ozgcloud.alfa.common.user.UserIdMapper;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
@Mapper(uses = UserIdMapper.class, unmappedTargetPolicy = ReportingPolicy.WARN, collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED)
interface VorgangHeaderMapper {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
index a5d3605a8d..bb2d49e67b 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangRemoteService.java
@@ -28,14 +28,14 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-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.GrpcFindVorgangResponse;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangRequest;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangResponse;
-import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import de.ozgcloud.alfa.common.GrpcUtil;
+import de.ozgcloud.vorgang.vorgang.GrpcFilterBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest.GrpcOrderBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangResponse;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangResponse;
+import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
index 14eaaeff7f..c8f4ee0384 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapper.java
@@ -28,12 +28,12 @@ import java.util.List;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
import de.ozgcloud.alfa.common.BaseTypesMapper;
import de.ozgcloud.alfa.common.clientattribute.ClientAttributeService;
import de.ozgcloud.alfa.common.user.UserIdMapper;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
@Mapper(uses = { EingangMapper.class, UserIdMapper.class, BaseTypesMapper.class, ServiceKontoMapper.class })
interface VorgangWithEingangMapper {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java
index 5150833944..e71b2e637a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/ZustaendigeStelleMapper.java
@@ -23,11 +23,12 @@
*/
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.vorgang.GrpcZustaendigeStelle;
import org.mapstruct.Mapper;
+import de.ozgcloud.vorgang.vorgang.GrpcZustaendigeStelle;
+
@Mapper
interface ZustaendigeStelleMapper {
- ZustaendigeStelle mapToZustaendigeStelle(GrpcZustaendigeStelle grpcZustaendigeStelle);
+ ZustaendigeStelle mapToZustaendigeStelle(GrpcZustaendigeStelle grpcZustaendigeStelle);
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java
index 61b5b187be..28b4498afb 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingMapper.java
@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.vorgang.forwarding;
import org.mapstruct.Mapper;
-import de.itvsh.ozg.pluto.forwarding.GrpcForwarding;
import de.ozgcloud.alfa.common.TimeMapper;
+import de.ozgcloud.vorgang.forwarding.GrpcForwarding;
@Mapper(uses = TimeMapper.class)
public interface ForwardingMapper {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java
index 913495ab4a..758d33543f 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteService.java
@@ -28,9 +28,9 @@ import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.ozg.pluto.forwarding.ForwardingServiceGrpc.ForwardingServiceBlockingStub;
import de.ozgcloud.alfa.common.callcontext.ContextService;
-import de.itvsh.ozg.pluto.forwarding.GrpcFindForwardingsRequest;
+import de.ozgcloud.vorgang.forwarding.ForwardingServiceGrpc.ForwardingServiceBlockingStub;
+import de.ozgcloud.vorgang.forwarding.GrpcFindForwardingsRequest;
import net.devh.boot.grpc.client.inject.GrpcClient;
@Service
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java
index 1799846ff3..1637a7acf5 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapper.java
@@ -33,10 +33,10 @@ import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
import de.ozgcloud.alfa.attachment.AttachmentMapper;
import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
@Mapper(uses = { FileIdMapper.class }, unmappedTargetPolicy = ReportingPolicy.WARN, //
unmappedSourcePolicy = ReportingPolicy.WARN, //
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
index b966962486..0c2e091401 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteService.java
@@ -32,16 +32,16 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcAccessPermission;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcDeleteClientAttributeRequest;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcSetClientAttributeRequest;
-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.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcDeleteClientAttributeRequest;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcSetClientAttributeRequest;
+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
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java
index 550fdfe056..42c939d54f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/attachment/GrpcGetAttachmentsResponseTestFactory.java
@@ -25,9 +25,9 @@ package de.ozgcloud.alfa.attachment;
import java.util.Collections;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetAttachmentsResponse;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.alfa.common.file.GrpcOzgFileTestFactory;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsResponse;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
public class GrpcGetAttachmentsResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
index ee009fe9d9..109a5f68f2 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/GrpcCallContextTestFactory.java
@@ -23,9 +23,9 @@
*/
package de.ozgcloud.alfa.common;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
-import de.itvsh.ozg.pluto.grpc.command.GrpcUser;
import de.ozgcloud.alfa.common.user.GrpcUserTestFactory;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
+import de.ozgcloud.vorgang.grpc.command.GrpcUser;
public class GrpcCallContextTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java
index e9aa64c52e..b5cbde03a4 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemRequestTestFactory.java
@@ -1,15 +1,16 @@
package de.ozgcloud.alfa.common.attacheditem;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
public class GrpcFindVorgangAttachedItemRequestTestFactory {
- public static GrpcFindVorgangAttachedItemRequest create() {
- return createBuilder().build();
- }
+ public static GrpcFindVorgangAttachedItemRequest create() {
+ return createBuilder().build();
+ }
- public static GrpcFindVorgangAttachedItemRequest.Builder createBuilder() {
- return GrpcFindVorgangAttachedItemRequest.newBuilder().setVorgangId(VorgangHeaderTestFactory.ID).setItemName(VorgangAttachedItemTestFactory.ITEM_NAME);
- }
+ public static GrpcFindVorgangAttachedItemRequest.Builder createBuilder() {
+ return GrpcFindVorgangAttachedItemRequest.newBuilder().setVorgangId(VorgangHeaderTestFactory.ID)
+ .setItemName(VorgangAttachedItemTestFactory.ITEM_NAME);
+ }
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java
index 48b6cf9393..7cbb60a7a9 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcFindVorgangAttachedItemResponseTestFactory.java
@@ -1,8 +1,8 @@
package de.ozgcloud.alfa.common.attacheditem;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
import de.ozgcloud.alfa.vorgang.GrpcVorgangAttachedItemTestFactory;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
public class GrpcFindVorgangAttachedItemResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java
index b47e0b2cf8..7bedea4ed0 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemRequestTestFactory.java
@@ -1,14 +1,14 @@
package de.ozgcloud.alfa.common.attacheditem;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
public class GrpcVorgangAttachedItemRequestTestFactory {
- public static GrpcVorgangAttachedItemRequest create() {
- return createBuilder().build();
- }
+ public static GrpcVorgangAttachedItemRequest create() {
+ return createBuilder().build();
+ }
- public static GrpcVorgangAttachedItemRequest.Builder createBuilder() {
- return GrpcVorgangAttachedItemRequest.newBuilder().setId(VorgangAttachedItemTestFactory.ID);
- }
+ public static GrpcVorgangAttachedItemRequest.Builder createBuilder() {
+ return GrpcVorgangAttachedItemRequest.newBuilder().setId(VorgangAttachedItemTestFactory.ID);
+ }
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java
index 0beeabcfd0..3c74d1eaa5 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/GrpcVorgangAttachedItemResponseTestFactory.java
@@ -1,8 +1,8 @@
package de.ozgcloud.alfa.common.attacheditem;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
import de.ozgcloud.alfa.vorgang.GrpcVorgangAttachedItemTestFactory;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
public class GrpcVorgangAttachedItemResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java
index 8cae622be5..ede58e879c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemMapperTest.java
@@ -10,8 +10,8 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Spy;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.ozgcloud.alfa.vorgang.GrpcVorgangAttachedItemTestFactory;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
class VorgangAttachedItemMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java
index eac7c683c1..47ea88eb94 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/attacheditem/VorgangAttachedItemRemoteServiceTest.java
@@ -17,13 +17,13 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
import de.ozgcloud.alfa.common.errorhandling.ResourceNotFoundException;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
import io.grpc.Status;
import io.grpc.Status.Code;
import io.grpc.StatusRuntimeException;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java
index 0d56b30c81..86f92c430c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileDownloadStreamObserverTest.java
@@ -36,7 +36,7 @@ import org.mockito.Mock;
import com.google.protobuf.ByteString;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcGetBinaryFileDataResponse;
class BinaryFileDownloadStreamObserverTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
index 47e92e1d65..4f5a25c5db 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileRemoteServiceTest.java
@@ -50,20 +50,20 @@ import org.mockito.Spy;
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.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.command.GrpcCallContext;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.alfa.common.GrpcCallContextTestFactory;
import de.ozgcloud.alfa.common.callcontext.ContextService;
import de.ozgcloud.alfa.common.file.GrpcOzgFileTestFactory;
import de.ozgcloud.alfa.common.file.OzgFile;
import de.ozgcloud.alfa.common.file.OzgFileMapper;
import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
+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.command.GrpcCallContext;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
import io.grpc.stub.CallStreamObserver;
class BinaryFileRemoteServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java
index 9f1794e8e8..1b9fb97e90 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileTestFactory.java
@@ -32,9 +32,9 @@ import org.springframework.util.unit.DataSize;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
import de.ozgcloud.alfa.common.file.GrpcOzgFileTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
public class BinaryFileTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java
index 0990b93232..3a340b43f3 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileUploadStreamObserverTest.java
@@ -34,8 +34,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileResponse;
import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileResponse;
class BinaryFileUploadStreamObserverTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
index 69555f5c22..4fec83d09e 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/ChunkedFileSenderTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
import io.grpc.stub.CallStreamObserver;
import lombok.SneakyThrows;
@@ -70,7 +70,7 @@ class ChunkedFileSenderTest {
@SneakyThrows
@Test
void shouldCloseUploadStream() {
- when(uploadStream.readNBytes(anyInt())).thenReturn(new byte[]{});
+ when(uploadStream.readNBytes(anyInt())).thenReturn(new byte[] {});
streamer.sendChunkTo(requestObserver);
@@ -80,7 +80,7 @@ class ChunkedFileSenderTest {
@SneakyThrows
@Test
void shouldCallOnCompleted() {
- when(uploadStream.readNBytes(anyInt())).thenReturn(new byte[]{});
+ when(uploadStream.readNBytes(anyInt())).thenReturn(new byte[] {});
streamer.sendChunkTo(requestObserver);
@@ -89,7 +89,7 @@ class ChunkedFileSenderTest {
@SneakyThrows
@Test
- void shouldCallOnNext(){
+ void shouldCallOnNext() {
when(uploadStream.readNBytes(anyInt())).thenReturn(BinaryFileTestFactory.DATA);
streamer.sendChunkTo(requestObserver);
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java
index 17b441f073..3798e9217f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileMetaDataTestFactory.java
@@ -23,8 +23,8 @@
*/
package de.ozgcloud.alfa.common.binaryfile;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
public class GrpcUploadBinaryFileMetaDataTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java
index 366c06f0c0..bc97844a0e 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/GrpcUploadBinaryFileRequestTestFactory.java
@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.common.binaryfile;
import com.google.protobuf.ByteString;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
-import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest.Builder;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
+import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest.Builder;
public class GrpcUploadBinaryFileRequestTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java
index 6df138656d..f7961d8011 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/callcontext/ContextServiceTest.java
@@ -41,7 +41,6 @@ import org.springframework.context.ApplicationContext;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.ozg.pluto.grpc.command.GrpcUser;
import de.ozgcloud.alfa.RequestAttributes;
import de.ozgcloud.alfa.RequestAttributesTestFactory;
import de.ozgcloud.alfa.common.GrpcUtil;
@@ -49,6 +48,7 @@ import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
import de.ozgcloud.alfa.common.user.UserRole;
import de.ozgcloud.alfa.vorgang.ZustaendigeStelleTestFactory;
+import de.ozgcloud.vorgang.grpc.command.GrpcUser;
class ContextServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java
index 1a2110e067..e655914cae 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeRemoteServiceTest.java
@@ -32,7 +32,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
class ClientAttributeRemoteServiceTest {
@Nested
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java
index 6cce227ad3..a64de0d45b 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/ClientAttributeServiceTest.java
@@ -33,8 +33,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcUpdateClientAttributeRequest;
class ClientAttributeServiceTest {
@Spy
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java
index acbe2f514b..1a43411c7c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/clientattribute/GrpcClientAttributeTestFactory.java
@@ -23,10 +23,10 @@
*/
package de.ozgcloud.alfa.common.clientattribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcAccessPermission;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
import de.ozgcloud.alfa.common.callcontext.CallContextTestFactory;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
public class GrpcClientAttributeTestFactory {
static final String CLIENT_NAME = CallContextTestFactory.CLIENT_NAME;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java
index 86f32ff329..2b7eba760b 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandBodyMapperTest.java
@@ -38,8 +38,6 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandBody;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandBodyField;
import de.ozgcloud.alfa.common.binaryfile.BinaryFileTestFactory;
import de.ozgcloud.alfa.postfach.PostfachAddress;
import de.ozgcloud.alfa.postfach.PostfachAddressTestFactory;
@@ -47,6 +45,8 @@ import de.ozgcloud.alfa.postfach.PostfachMail;
import de.ozgcloud.alfa.postfach.PostfachMailTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
import de.ozgcloud.alfa.wiedervorlage.WiedervorlageTestFactory;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandBody;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandBodyField;
class CommandBodyMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java
index 4553fd1a43..d4e36ee935 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandMapperTest.java
@@ -38,14 +38,14 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.grpc.command.GrpcOrder;
-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.RedirectRequestTestFactory;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
+import de.ozgcloud.vorgang.grpc.command.GrpcRedirectRequest;
class CommandMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java
index 43886084cd..843163a601 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandRemoteServiceTest.java
@@ -46,26 +46,26 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectTestFactory;
-import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandResponse;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandsResponse;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcExistsPendingCommandsRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcExistsPendingCommandsResponse;
-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.GrpcGetPendingCommandsResponse;
-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.RedirectRequestTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
import de.ozgcloud.alfa.wiedervorlage.WiedervorlageTestFactory;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectTestFactory;
+import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandsResponse;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcExistsPendingCommandsRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcExistsPendingCommandsResponse;
+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.GrpcGetPendingCommandsResponse;
+import de.ozgcloud.vorgang.grpc.command.GrpcRevokeCommandRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcSetCommandExecutedRequest;
class CommandRemoteServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java
index c3006bbc78..13b13aff8e 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandResponseTestFactory.java
@@ -23,8 +23,8 @@
*/
package de.ozgcloud.alfa.common.command;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommandResponse;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommandResponse;
public class GrpcCommandResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java
index 1ef29e1cda..df991f09f6 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcCommandTestFactory.java
@@ -25,11 +25,11 @@ package de.ozgcloud.alfa.common.command;
import java.util.UUID;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCommand;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCreateCommandRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcOrder;
import de.ozgcloud.alfa.common.GrpcCallContextTestFactory;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
+import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
+import de.ozgcloud.vorgang.grpc.command.GrpcCreateCommandRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcOrder;
public class GrpcCommandTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java
index 249cee9003..5524a2b82a 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/GrpcPostfachCommandTestFactory.java
@@ -23,10 +23,10 @@
*/
package de.ozgcloud.alfa.common.command;
-import de.itvsh.ozg.mail.postfach.GrpcResendPostfachMailRequest;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
import de.ozgcloud.alfa.common.GrpcCallContextTestFactory;
import de.ozgcloud.alfa.postfach.PostfachMailTestFactory;
+import de.ozgcloud.nachrichten.postfach.GrpcResendPostfachMailRequest;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
public class GrpcPostfachCommandTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java
index f3134d43af..8613527d1c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/GrpcOzgFileTestFactory.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.common.file;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
public class GrpcOzgFileTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java
index 36f81118ba..72bbe175b6 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileRemoteServiceTest.java
@@ -35,17 +35,17 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
-import de.itvsh.ozg.pluto.grpc.file.FileServiceGrpc.FileServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetAttachmentsRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetAttachmentsResponse;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetRepresentationsRequest;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetRepresentationsResponse;
import de.ozgcloud.alfa.attachment.GrpcGetAttachmentsResponseTestFactory;
import de.ozgcloud.alfa.common.GrpcCallContextTestFactory;
import de.ozgcloud.alfa.common.callcontext.ContextService;
import de.ozgcloud.alfa.representation.GrpcGetRepresentationsResponseTestFactory;
import de.ozgcloud.alfa.vorgang.EingangTestFactory;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
+import de.ozgcloud.vorgang.grpc.file.FileServiceGrpc.FileServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsRequest;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsResponse;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsRequest;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsResponse;
class OzgFileRemoteServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java
index 53c5c130b3..c912519852 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/GrpcUserTestFactory.java
@@ -3,7 +3,7 @@ package de.ozgcloud.alfa.common.user;
import java.util.Collections;
import java.util.UUID;
-import de.itvsh.ozg.pluto.grpc.command.GrpcUser;
+import de.ozgcloud.vorgang.grpc.command.GrpcUser;
public class GrpcUserTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java
index 3162b3c8ee..119ea8e35b 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarMapperTest.java
@@ -41,10 +41,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemTestFactory;
import de.ozgcloud.alfa.common.binaryfile.BinaryFileTestFactory;
import de.ozgcloud.alfa.vorgang.GrpcVorgangAttachedItemTestFactory;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
class KommentarMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java
index 9e769c4252..829a18a9af 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarRemoteServiceTest.java
@@ -36,14 +36,14 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
-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.vorgang.GrpcVorgangAttachedItemTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
class KommentarRemoteServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java
index 1e55cd9a9f..538a99cf6e 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachAddressTestFactory.java
@@ -1,8 +1,8 @@
package de.ozgcloud.alfa.postfach;
-import de.itvsh.ozg.pluto.common.GrpcObject;
-import de.itvsh.ozg.pluto.common.GrpcProperty;
-import de.itvsh.ozg.pluto.vorgang.GrpcPostfachAddress;
+import de.ozgcloud.vorgang.common.GrpcObject;
+import de.ozgcloud.vorgang.common.GrpcProperty;
+import de.ozgcloud.vorgang.vorgang.GrpcPostfachAddress;
public class GrpcPostfachAddressTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java
index 913cc51750..9941d1e42f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/GrpcPostfachMailTestFactory.java
@@ -27,11 +27,11 @@ import static de.ozgcloud.alfa.postfach.PostfachMailTestFactory.*;
import java.util.Arrays;
-import de.itvsh.ozg.mail.postfach.GrpcDirection;
-import de.itvsh.ozg.mail.postfach.GrpcFindPostfachMailResponse;
-import de.itvsh.ozg.mail.postfach.GrpcFindPostfachMailsResponse;
-import de.itvsh.ozg.mail.postfach.GrpcPostfachMail;
import de.ozgcloud.alfa.common.binaryfile.BinaryFileTestFactory;
+import de.ozgcloud.nachrichten.postfach.GrpcDirection;
+import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailResponse;
+import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailsResponse;
+import de.ozgcloud.nachrichten.postfach.GrpcPostfachMail;
public class GrpcPostfachMailTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java
index a7a37a24d7..1af57b84b7 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailITCase.java
@@ -37,7 +37,6 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.ozg.mail.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub;
import de.ozgcloud.alfa.CallScope;
import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
@@ -45,6 +44,7 @@ import de.ozgcloud.alfa.vorgang.EingangTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangController;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory;
+import de.ozgcloud.nachrichten.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub;
@SpringBootTest
public class PostfachMailITCase {
@@ -81,7 +81,7 @@ public class PostfachMailITCase {
when(serviceStub.findPostfachMails(any())).thenReturn(GrpcPostfachMailTestFactory.createFindPostfachMailsResponse());
when(vorgangController.getVorgang(anyString())).thenReturn(
VorgangWithEingangTestFactory.createBuilder().eingang(EingangTestFactory.createBuilder().antragsteller(null).build()).build());
-
+
doReturn(UserProfileTestFactory.ID).when(userService).getUserId();
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java
index 36727aae71..b754ce2a13 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailRemoteServiceTest.java
@@ -38,17 +38,17 @@ import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-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.GrpcIsPostfachConfiguredResponse;
-import de.itvsh.ozg.mail.postfach.GrpcPostfachMail;
-import de.itvsh.ozg.mail.postfach.GrpcResendPostfachMailRequest;
-import de.itvsh.ozg.mail.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
import de.ozgcloud.alfa.common.callcontext.ContextService;
import de.ozgcloud.alfa.common.command.CommandTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailRequest;
+import de.ozgcloud.nachrichten.postfach.GrpcFindPostfachMailsRequest;
+import de.ozgcloud.nachrichten.postfach.GrpcIsPostfachConfiguredRequest;
+import de.ozgcloud.nachrichten.postfach.GrpcIsPostfachConfiguredResponse;
+import de.ozgcloud.nachrichten.postfach.GrpcPostfachMail;
+import de.ozgcloud.nachrichten.postfach.GrpcResendPostfachMailRequest;
+import de.ozgcloud.nachrichten.postfach.PostfachServiceGrpc.PostfachServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
class PostfachMailRemoteServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java
index a0578dbb7a..3bb8069eb9 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/representation/GrpcGetRepresentationsResponseTestFactory.java
@@ -25,9 +25,9 @@ package de.ozgcloud.alfa.representation;
import java.util.Collections;
-import de.itvsh.ozg.pluto.grpc.file.GrpcGetRepresentationsResponse;
-import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
import de.ozgcloud.alfa.common.file.GrpcOzgFileTestFactory;
+import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsResponse;
+import de.ozgcloud.vorgang.grpc.file.GrpcOzgFile;
public class GrpcGetRepresentationsResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java
index 7c70dba37f..524f373231 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcByStatusResultTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.alfa.statistic;
-import de.itvsh.ozg.pluto.statistic.GrpcByStatusResult;
+import de.ozgcloud.vorgang.statistic.GrpcByStatusResult;
public class GrpcByStatusResultTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java
index 2e13bea19e..fc67c39367 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangCountTestFactory.java
@@ -1,9 +1,9 @@
// TODO sebo: diese Datei später löschen
package de.ozgcloud.alfa.statistic;
-import de.itvsh.ozg.pluto.statistic.GrpcByStatusResult;
-import de.itvsh.ozg.pluto.statistic.GrpcPathCountResult;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangCountResponse;
+import de.ozgcloud.vorgang.statistic.GrpcByStatusResult;
+import de.ozgcloud.vorgang.statistic.GrpcPathCountResult;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangCountResponse;
public class GrpcVorgangCountTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticQueryTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticQueryTestFactory.java
index a7df744e48..0d26d330dc 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticQueryTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticQueryTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.alfa.statistic;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticQuery;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery;
public class GrpcVorgangStatisticQueryTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResponseTestFactory.java
index c9fa2a9d83..3f1e54b3d5 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResponseTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.alfa.statistic;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticResponse;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResponse;
public class GrpcVorgangStatisticResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java
index 84a333e2cb..77de356db5 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/GrpcVorgangStatisticResultTestFactory.java
@@ -1,6 +1,6 @@
package de.ozgcloud.alfa.statistic;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticResult;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResult;
class GrpcVorgangStatisticResultTestFactory {
public static final String RESULT_NAME = "countByStatus_NEU";
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
index af1809e9c5..56b85f9f3f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
@@ -21,14 +21,14 @@ import org.mockito.Spy;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangCountResponse;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticQuery.GroupMethod;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticQuery.Operator;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticResponse;
-import de.itvsh.ozg.pluto.statistic.GrpcVorgangStatisticResult;
-import de.itvsh.ozg.pluto.statistic.StatisticServiceGrpc.StatisticServiceBlockingStub;
import de.ozgcloud.alfa.AlfaProperties;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangCountResponse;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.GroupMethod;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.Operator;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResponse;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResult;
+import de.ozgcloud.vorgang.statistic.StatisticServiceGrpc.StatisticServiceBlockingStub;
class StatisticRemoteServiceTest {
@@ -160,7 +160,7 @@ class StatisticRemoteServiceTest {
@Nested
class TestGetVorgaengeStatistics {
- private final GrpcVorgangStatisticResponse response = GrpcVorgangStatisticResponseTestFactory.create();;
+ private final GrpcVorgangStatisticResponse response = GrpcVorgangStatisticResponseTestFactory.create();
@BeforeEach
void beforeEach() {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java
index 5ed97ce451..577949f83e 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/system/GrpcGetSystemStatusResponseTestFactory.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.system;
-import de.itvsh.ozg.pluto.system.GrpcGetSystemStatusResponse;
+import de.ozgcloud.vorgang.system.GrpcGetSystemStatusResponse;
public class GrpcGetSystemStatusResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java
index 9464ac43e8..790b0d5b03 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/system/SystemStatusRemoteServiceTest.java
@@ -33,8 +33,8 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.ozg.pluto.system.GrpcGetSystemStatusRequest;
-import de.itvsh.ozg.pluto.system.SystemStatusServiceGrpc.SystemStatusServiceBlockingStub;
+import de.ozgcloud.vorgang.system.GrpcGetSystemStatusRequest;
+import de.ozgcloud.vorgang.system.SystemStatusServiceGrpc.SystemStatusServiceBlockingStub;
class SystemStatusRemoteServiceTest {
@@ -68,7 +68,7 @@ class SystemStatusRemoteServiceTest {
void shouldGetSearchServerStatus() {
when(serviceStub.getSystemStatus(any())).thenReturn(GrpcGetSystemStatusResponseTestFactory.create());
- var plutoSystemStatus = service.getSystemStatus();
+ var plutoSystemStatus = service.getSystemStatus();
assertThat(plutoSystemStatus).isEqualTo(PLUTO_SYSTEM_STATUS);
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java
index 5a28b4c264..bec42bda75 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/AntragstellerMapperTest.java
@@ -32,8 +32,8 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Spy;
-import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
import de.ozgcloud.alfa.common.StringToNullMapper;
+import de.ozgcloud.vorgang.common.grpc.GrpcFormDataMapper;
class AntragstellerMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java
index dec68cb6b4..1e075738be 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ClientAttributeUtilsTest.java
@@ -31,8 +31,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
import de.ozgcloud.alfa.common.clientattribute.GrpcClientAttributeTestFactory;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
class ClientAttributeUtilsTest {
@Nested
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java
index f6a189f20b..af4468e9ed 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/EingangMapperTest.java
@@ -36,8 +36,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.common.grpc.GrpcFormDataMapper;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
class EingangMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java
index 019daf75b2..56ea021c88 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcAntragstellerTestFactory.java
@@ -27,9 +27,9 @@ import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.ozg.pluto.vorgang.GrpcAntragsteller;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcAntragsteller;
+import de.ozgcloud.vorgang.vorgang.GrpcFormData;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
public class GrpcAntragstellerTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java
index 8771be54c5..64569dc35f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcClientAttributeTestFactory.java
@@ -24,11 +24,11 @@
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcAccessPermission;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute.Builder;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
import de.ozgcloud.alfa.common.callcontext.CallContextTestFactory;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute.Builder;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
class GrpcClientAttributeTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java
index 3f19726f0c..f478bb997b 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangHeaderTestFactory.java
@@ -28,7 +28,7 @@ import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcEingangHeader;
public class GrpcEingangHeaderTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java
index fd560b6d42..bc370e519b 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcEingangTestFactory.java
@@ -25,9 +25,9 @@ package de.ozgcloud.alfa.vorgang;
import java.util.UUID;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
-import de.itvsh.ozg.pluto.vorgang.GrpcSubForm;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.vorgang.GrpcFormData;
+import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
public class GrpcEingangTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java
index 929b86e857..cc28e1e8de 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFilterByTestFactory.java
@@ -23,8 +23,8 @@
*/
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
+import de.ozgcloud.vorgang.vorgang.GrpcFilterBy;
public class GrpcFilterByTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java
index 0dbfd89c08..681d6b5bc8 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFindVorgangRequestTestFactory.java
@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.vorgang;
import static de.ozgcloud.alfa.vorgang.FindVorgaengeRequestCriteriaTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcFilterBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest;
public class GrpcFindVorgangRequestTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java
index e7dbfb737e..cf777c35a3 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormDataMapperTest.java
@@ -38,10 +38,10 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
-import de.itvsh.ozg.pluto.vorgang.GrpcSubForm;
+import de.ozgcloud.vorgang.common.grpc.GrpcFormDataMapper;
+import de.ozgcloud.vorgang.vorgang.GrpcFormData;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
class GrpcFormDataMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java
index 96b3f2f9f8..9d005401b9 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcFormFieldTestFactory.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
public class GrpcFormFieldTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java
index 732b9cf081..1fc1641f1f 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcServiceKontoTestFactory.java
@@ -1,7 +1,7 @@
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.vorgang.GrpcServiceKonto;
import de.ozgcloud.alfa.postfach.GrpcPostfachAddressTestFactory;
+import de.ozgcloud.vorgang.vorgang.GrpcServiceKonto;
public class GrpcServiceKontoTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java
index f749fd6d06..b58803a034 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcSubFormTestFactory.java
@@ -23,8 +23,8 @@
*/
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
-import de.itvsh.ozg.pluto.vorgang.GrpcSubForm;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
public class GrpcSubFormTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java
index c7aaa3c993..acd58cd445 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangAttachedItemTestFactory.java
@@ -23,10 +23,10 @@
*/
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.common.GrpcObject;
-import de.itvsh.ozg.pluto.common.GrpcProperty;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcVorgangAttachedItem;
import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemTestFactory;
+import de.ozgcloud.vorgang.common.GrpcObject;
+import de.ozgcloud.vorgang.common.GrpcProperty;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItem;
public class GrpcVorgangAttachedItemTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java
index cd63838a84..67e4d9df73 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangHeaderTestFactory.java
@@ -25,7 +25,7 @@ package de.ozgcloud.alfa.vorgang;
import static de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory.*;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
public class GrpcVorgangHeaderTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java
index 982ffd1a05..3820dc118c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangTestFactory.java
@@ -28,8 +28,8 @@ import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangResponse;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangHeader;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangResponse;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangHeader;
public class GrpcVorgangTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
index d6c2a429e4..7fb6ed34ba 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangResponseTestFactory.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangWithEingangResponse;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangResponse;
class GrpcVorgangWithEingangResponseTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java
index c06556b296..8a4c1f4d23 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcVorgangWithEingangTestFactory.java
@@ -25,10 +25,10 @@ package de.ozgcloud.alfa.vorgang;
import static de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory.*;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
-import de.itvsh.ozg.pluto.vorgang.GrpcVorgangWithEingang;
import de.ozgcloud.alfa.common.clientattribute.ClientAttributeService;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
class GrpcVorgangWithEingangTestFactory {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java
index 5c47033f95..7f477d4e0e 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/GrpcZustaendigeStelleTestFactory.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.vorgang;
-import de.itvsh.ozg.pluto.vorgang.GrpcZustaendigeStelle;
+import de.ozgcloud.vorgang.vorgang.GrpcZustaendigeStelle;
public class GrpcZustaendigeStelleTestFactory {
private static final String EMAIL = ZustaendigeStelleTestFactory.EMAIL;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java
index b2e6d09b19..e62de56d08 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/ServiceKontoMapperTest.java
@@ -10,8 +10,8 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Spy;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.ozgcloud.alfa.postfach.GrpcPostfachAddressTestFactory;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
class ServiceKontoMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java
index 6dddd919c9..efa335ee63 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderMapperTest.java
@@ -34,12 +34,12 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttribute;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcClientAttributeValue;
import de.ozgcloud.alfa.common.user.UserId;
import de.ozgcloud.alfa.common.user.UserIdMapper;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
import de.ozgcloud.alfa.wiedervorlage.WiedervorlageTestFactory;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttributeValue;
class VorgangHeaderMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java
index 0b3bd4ca73..c2c4eb8db0 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangRemoteServiceTest.java
@@ -38,11 +38,11 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.ozg.pluto.vorgang.GrpcFilterBy;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangRequest;
-import de.itvsh.ozg.pluto.vorgang.GrpcFindVorgangResponse;
-import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
+import de.ozgcloud.vorgang.vorgang.GrpcFilterBy;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequest;
+import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangResponse;
+import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
class VorgangRemoteServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java
index 76d629bc75..bb64bf701c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangWithEingangMapperITCase.java
@@ -34,9 +34,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
-import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
+import de.ozgcloud.vorgang.vorgang.GrpcEingang;
+import de.ozgcloud.vorgang.vorgang.GrpcFormData;
+import de.ozgcloud.vorgang.vorgang.GrpcFormField;
@SpringBootTest
class VorgangWithEingangMapperITCase {
@@ -60,8 +60,8 @@ class VorgangWithEingangMapperITCase {
private GrpcEingang buildEingang() {
return GrpcEingangTestFactory.createBuilder().setFormData(GrpcFormData.newBuilder()
- .addField(GrpcFormField.newBuilder().setName("TEST").setValue("VALUE1").build())
- .addField(GrpcFormField.newBuilder().setName("TEST").setValue("VALUE2").build()))
+ .addField(GrpcFormField.newBuilder().setName("TEST").setValue("VALUE1").build())
+ .addField(GrpcFormField.newBuilder().setName("TEST").setValue("VALUE2").build()))
.build();
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java
index 4be84cf6b8..8159bc6c0c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingRemoteServiceTest.java
@@ -35,13 +35,13 @@ import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.ozg.pluto.forwarding.ForwardingServiceGrpc.ForwardingServiceBlockingStub;
-import de.itvsh.ozg.pluto.forwarding.GrpcFindForwardingsRequest;
-import de.itvsh.ozg.pluto.forwarding.GrpcForwarding;
-import de.itvsh.ozg.pluto.forwarding.GrpcForwardingsResponse;
-import de.itvsh.ozg.pluto.grpc.command.GrpcCallContext;
import de.ozgcloud.alfa.common.callcontext.ContextService;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.vorgang.forwarding.ForwardingServiceGrpc.ForwardingServiceBlockingStub;
+import de.ozgcloud.vorgang.forwarding.GrpcFindForwardingsRequest;
+import de.ozgcloud.vorgang.forwarding.GrpcForwarding;
+import de.ozgcloud.vorgang.forwarding.GrpcForwardingsResponse;
+import de.ozgcloud.vorgang.grpc.command.GrpcCallContext;
class ForwardingRemoteServiceTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java
index a36c3889ed..b82a029f5e 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageMapperTest.java
@@ -39,11 +39,11 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemTestFactory;
import de.ozgcloud.alfa.common.binaryfile.BinaryFileTestFactory;
import de.ozgcloud.alfa.common.binaryfile.FileIdMapper;
import de.ozgcloud.alfa.vorgang.GrpcVorgangAttachedItemTestFactory;
+import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
class WiedervorlageMapperTest {
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java
index 446a4e0a5f..ee8411efc2 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageRemoteServiceTest.java
@@ -43,18 +43,18 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.context.ApplicationContext;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcAccessPermission;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcDeleteClientAttributeRequest;
-import de.itvsh.ozg.pluto.grpc.clientAttribute.GrpcSetClientAttributeRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
-import de.itvsh.ozg.pluto.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
-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.ApplicationTestFactory;
import de.ozgcloud.alfa.vorgang.GrpcVorgangAttachedItemTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
+import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcDeleteClientAttributeRequest;
+import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcSetClientAttributeRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
+import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemResponse;
+import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
class WiedervorlageRemoteServiceTest {
diff --git a/pom.xml b/pom.xml
index b5d05e7e6a..3339e61060 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <pluto.version>1.13.0</pluto.version>
+ <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>
</properties>
@@ -96,14 +96,14 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-interface</artifactId>
- <version>${pluto.version}</version>
+ <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>
- <version>${pluto.version}</version>
+ <groupId>de.ozgcloud.vorgang</groupId>
+ <artifactId>vorgang-manager-utils</artifactId>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
<groupId>de.itvsh.kop.common</groupId>
--
GitLab