diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml index b11ce7176a0947d63c2f9686b196bd8acd58a4fb..36244e91f889b028ae6ccf5c0bba71aa72f580e2 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 978020bc9be22432f2e36bc4489afa52721b7840..1123434bbcc2c99403b8454d9f033ef20e667361 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 cb39a46b232501008cb6075932dc6e6ddf897fdb..a9652adeccc88b8b3af9e659c9432f22f62a5428 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 2b24b6cf23f1c68fbfd1c6a686ff9539cbec4e45..d864231f7a939fdc9479802718d3eb9a84253ec8 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 01d7ef0fbb8ec4b88f8c2a8fa71da8f2f96c92be..ed69dbdc03704b9ee9b1201f997050f1c48a74ef 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 55af48b1d59ba5682d01f2826a75261383a51dc8..c11a717e419495e9eee9b32ebd19ce894638e585 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 9a096c4068c12d509a0d59a8edc88938b181f31c..496889eb4f906661f164fc130f188691e899b72c 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 e5abcb4a078e0b26938044efd864eb19345eddb7..74cb6123a5a048f929e75491911f80e8ffa8017f 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 027d3b9a4e788a422c84507cdb9431728b06827e..de6b7301d5cf04f7ddcb2779a90397cf97103fce 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 8d24e9e292cbc07cb94eeca1cdc64033512f3079..99efbe3761e470d24c87e75733fa361a832b7191 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 4eb40cde318ef22daf650228528ff28e75c9decd..8e85e537c249836c593e4e4b921e9a08658e0e53 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 1e0a41cf5a0fd36fcc657c32a33108ce568c5f82..1a35db39cbe4619da3c29903e83fca69c89a5722 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 e5c7e4d9d4348f209a6818b1f7fe3815c94bf941..32407d5266ea7c2aead94a021c6af1d10bdecee7 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 e946422a9eff1ff9b9685a51edabb81e4195c834..6b3371976ca5e5036afffd123f28238eac5f74bd 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 9268d7103f143d46ca25b0d3510c78c3bff3b5ec..e19127ec39472a948faaf5e84aeb9fa2537b97ba 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 07a69bdf2d522a820b5e5bcc4c0476902d4280a0..8657ccbbf00845420d0f2142bebc7e09ba27535d 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 d14fa8cd29ab54afc996fe18abd065bcefe62263..368da8e20aeb17c379db720c24ff4ab278e2e28b 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 f3fc54c69d4d619eb4fa5851911e26df8bed9c2a..2e60f5b6599bc24eddc00bf9dd6d11f0ede8f9cc 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 9f32e10b57e22b862929dc3f91110d10843d1753..d39bb9819fce3aabd7e6b81c9ec5bb957f03507c 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 b75551ca3cdc907682e854506541e40f8bf82e87..3be93cd822823c832f3e0aa3f6c26f4cb716b838 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 7ef9c3b7cfb26ff17cb357db4a76920364aae5f2..b97fcadbc07f1dc8d1d4c8ce2eaa3803fac49a90 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 f6716f492f01a20c5ef70cc39fd7fdde52ff394a..143cdfe3ab199982acde5bf06fcfa442b2372847 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 1b72f771d989082cc82e3a218a8c8bef58ac7cf8..6f0001a6fee7ac28c95b69cecd8b8ed7cfd099d7 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 5268cb81663f83711f9abced0b3deb4255812322..ee2fc0b48fa26ba5105b3fd14d35cd2cad33746c 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 5bbb1918b958f24cb113749740624311d684175b..d9a9b117d15199bae085649d91df8ff2642543e7 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 a8f16b1ab30a5a0ea067f481cf1ead020e910fc1..b2f1bc90636089da8daaffdf211ca0b5c183834e 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 3ba503b13e8f1cb11b1df3231b3ad819e846e48b..b4a0c681c6922c9543e9aed465d9c70b73ef82c5 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 3398c50bb5d192073b9d1cd6f5938370927b3a75..34ae1b9242e720cf399b196ee568a36c7e2f7bb1 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 69ce20920fd164d260e850dc02804b1d15649414..a7334e89a6ee8d0d4e022a309286fc287f208052 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 a5d3605a8d1344e275f048cf837a676701d59859..bb2d49e67b4e7c57dac52b54c1aa27d329fd9525 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 14eaaeff7f337f1e2422e1dd9fe27e33de06949b..c8f4ee03842a9dfccffc873c66c13cf8200a588f 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 515083394430fcdc1f7dff904c80c8d636cad8c8..e71b2e637ab50ea9d05a96c08610b806e04be6a2 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 61b5b187be342cadd6a9bc06c38fe55a48cbf784..28b4498afb7588f303935b0d872300bcf7b8dcb2 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 913495ab4a3f1311da418f72807d3db5a5c25eb6..758d33543feba04b3c77049fa4c9e0f39afe5c69 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 1799846ff3cf38758c992e10a036cfcb4443ca8c..1637a7acf562d9176f31cfa7cfa1c3d3b6d7f7ad 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 b96696248648afae84c81131beb374bd13aeea86..0c2e091401116b31862aafd2dab492229f906ac7 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 550fdfe0560f68b820699a771428bcc6f1ca6bd6..42c939d54fda51f70452469c92079db846373893 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 ee009fe9d96eb8adc4f1aa5b60d6e6279f1c2e23..109a5f68f2e83cc22f36fa4495ab0ec06a8229ea 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 e9aa64c52ea757adf3bce9b7624f83c0399c8cb4..b5cbde03a462fdcbbda7802708bb0ee3c5244737 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 48b6cf93930d08656bf2b4be2c6cfa8a2c5beef4..7cbb60a7a9e61ffd3ec0cae4a300fec954e610a7 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 b47e0b2cf8d760734ea12a7805b36529e960eb99..7bedea4ed00ca3c2e46e32f8f8ec0b86a8e2cd71 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 0beeabcfd0b0fa295f6b3c011233433e19a92fb5..3c74d1eaa50292b7986321e60860b9c1f6202132 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 8cae622be553b13c5ecf5339b08184c3f5067131..ede58e879c805d55d99c3fbed32d6a47f2a6ee26 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 eac7c683c1e11882cf91e0d98d6fddeb3752cd58..47ea88eb946d5e1fc7e0946d6449693bb1022e0c 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 0d56b30c8173abd3df697882075b025aae617b67..86f92c430c24d212ed4793e2435cc7b3796e81b2 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 47e92e1d650716c41e83cb0f8da76af83724feac..4f5a25c5db1d05ddbaae46ef41ea1133d8482c9c 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 9f1794e8e811102563aba75133c2fc8d847532be..1b9fb97e903e6bd39552278ca1dd8a9ee4a74e73 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 0990b932322ca676093bf72d883bbc85e739065c..3a340b43f34ee2be9c64af370f8891fa4bc9f8cc 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 69555f5c226fd4ca769a7ca6caef530fb2ce303f..4fec83d09e26c0e351dba7723d038f1f261c22a7 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 17b441f07301a0434d8f23d966581cffce7fe107..3798e9217fb48db2f42fec41d6036b90f8f12507 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 366c06f0c088d2c0a383f5680d0acd84fe873e95..bc97844a0effdfe1d944e6aa8e8996cdb6284ddd 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 6df138656d075bfb6099a52fab84ba838cdec716..f7961d80115c6a591653d729c1114b22e0acc145 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 1a2110e067d10321560b4460735a3ec9ef4f2913..e655914cae2c9abfd0ec2dfe8cea3a2e669ba404 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 6cce227ad3e531fc9dbf20faedfa04fd3819a398..a64de0d45bb61878de179263dc4a345206feefa0 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 acbe2f514bbd6e5212611850a3ecacb587b74f5e..1a43411c7cd13d97c107dce408028a045709c1c9 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 86f32ff329f542fe23edda276586f15a3867a48b..2b7eba760b06badd0a930355716d4e2652d61fe5 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 4553fd1a4325223a4832f88a868e4e1edb6e7ad0..d4e36ee93529e2959b818f2d15a4380fdbe76a84 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 43886084cd681d691cfe51589b6a86a5c8a401c9..843163a601d593fc6243851a91123bc4e168f78f 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 c3006bbc78405f5dca7007e57a46a33a3c6ffd3a..13b13aff8ead17670a852029db24a37cc3634b9b 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 1ef29e1cda66d5d6bbbdc3373ab5703626f5136e..df991f09f6f18f2e1088016bc44b1ad30263839d 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 249cee90036d2e089834652798915f3ffebfaf3b..5524a2b82a3194344376023dcfb5672af9e030bf 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 f3134d43af9a1d8bbe9c9a5442b3904ee48e4386..8613527d1c02361e9aafac39bcfdda36581880b1 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 36f81118ba37eee0525e5a7ade7c1b18187e742d..72bbe175b6bf69fe5d31d0ada39c9c0be50eada9 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 53c5c130b3060e52ee96f111d20ce8aa418e5cfe..c912519852175a94b5226e5f1582761f823dcecf 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 3162b3c8ee6e56ef8c1aa350af06c3938f475304..119ea8e35b5fc9e6feceaf53cd05eae103696840 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 9e769c4252952401fb6a6fdc025c6362bf51b3a8..829a18a9af47b919a4120e8bd38d2c227ff5bbac 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 1e55cd9a9f0b09e0142d87289d8261778927a062..538a99cf6ee6f126bd7d59772a4e1fbb26cfa100 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 913cc5175098eb422e1dafdc7b2da8ee4d79b724..9941d1e42f295e92b3d9da26581685d66b5ff9db 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 a7a37a24d7df6081ce281ae603336409edb19182..1af57b84b77211fd3125c17fcad36261b8c4c1cf 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 36727aae7144bbb672efa30783aa91d8018610d5..b754ce2a13a5c9c5d91c91eded5dba835e409e8b 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 a0578dbb7ab338fc4e0f9b232d9e518ff0032807..3bb8069eb9ec9633ad3c36203883f419c62f6409 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 7c70dba37fc771a5b1e38a7690e595ee4a528946..524f373231c041afb2ae6fd0ed57f5804c28319d 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 2e13bea19e2ebec5c8616ebd2381835f277463cb..fc67c39367135c10296c3ddf0f34ce99765e1bb8 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 a7df744e48b0d94e6be8253edcc284d41a3a4415..0d26d330dc055948cec844b3cfd851f4adf72fd5 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 c9fa2a9d833d538a7886bd2103c8172d6415d30c..3f1e54b3d563b1ea6af0372f18997d7e9d406074 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 84a333e2cbfb447bae3da22164e30d42315b1710..77de356db5f2a42ec57bab543da64bfe8a0bdc76 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 af1809e9c527e83206416a82e1f4a805eb738867..56b85f9f3f14bf8e70f73c11d834721b7c923754 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 5ed97ce4511c808d550b69d910697f6594290fda..577949f83e3596eaf511832f85f72eb2efd3b318 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 9464ac43e8e09e3c84c7d2f83ac8f2a64732d592..790b0d5b03a6d556025029a2e2d925798a7d6a28 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 5a28b4c264c3223e843f895a145d6bca0d8f2fb2..bec42bda758bdf6f2edd54782261116a0e3dfed0 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 dec68cb6b42da2922c6794e004f95a0c368a8510..1e075738beb72616b61c8c6852c7163c39933505 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 f6a189f20b0e8b59ea6433766bd0bb0736702ee6..af4468e9ed0126b83e73f66dab035b0f2b59ecfe 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 019daf75b2e632d7755af94667a76015a9bd2f0b..56ea021c88fbe3135a0ce0b4f50de6d191385198 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 8771be54c53a17e2e2b879dbac8ae29dfd9866d3..64569dc35ff159d77548dae1383ea65b179b0eb1 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 3f19726f0c68a31b94efe606aff29d9d08c6bad6..f478bb997b72071687ab10431cb47512473d9e4e 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 fd560b6d4288b723fcf60bddeaef74e88f1d04e5..bc370e519b04f3b0f8169ec04b712488b0aa8568 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 929b86e85744f4b0f244609531d6ac5335968587..cc28e1e8de5e3825a98937813d05858b2989fa12 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 0dbfd89c08ddeaeb29bfab5b41bafd342e15bf64..681d6b5bc8d9b3b691e5379c20c69cd675b5c0be 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 e7dbfb737e78124b0fa2effdfb9699169e37681f..cf777c35a3105f004770ef340ca72a98388b14cd 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 96b3f2f9f8e501d6f3bd9fd693ae83ffd98469b1..9d005401b9e6b41b28cd30cc34a8bda56612ccd4 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 732b9cf0814d50fb08f1505b90455f6a1e8ac3bb..1fc1641f1feaddf771ddf598404a7dddf19efe90 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 f749fd6d065ce43042fff17bd2a654e5ebec0cb8..b58803a034815715942c32ca539feeb579bbce59 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 c7aaa3c993cc4ca43f70286c505268ceb8dcfc18..acd58cd4454e18240bb45afd82a665aacd7108b0 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 cd63838a845df514f5c897e306c6cfbef347dacb..67e4d9df7370b0e2cbda17213e54acd8ade50321 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 982ffd1a05f85f50cfc9a1b10b329377bb8d5631..3820dc118c8a4c58c41395df1c983659b7e903fc 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 d6c2a429e494384390e4599d8c49d61b7957739c..7fb6ed34bae88e88882abe13a2c124fc1068ef75 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 c06556b29603b5eb18d6bea09d5c4e01ce5f32c9..8a4c1f4d23e2fd5d9c22f42d5c0c566cdfa2ac11 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 5c47033f95825f0a726fd6ee10c4f89665399dd1..7f477d4e0e74fb8930d47871ec3d4cecc5cac8cc 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 b2e6d09b19a782399253aead987f3544fa687fcb..e62de56d08ea79d510e75c4b54ce4aa2fb7d68e8 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 6dddd919c949bb874a028f7b0a31fadcc2adb2dc..efa335ee63a6c12ad09b65c0607f080394320b60 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 0b3bd4ca735a3156e8d1521ff9ca35b7dac12012..c2c4eb8db070a11c9fecdc60473d9325d3e77745 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 76d629bc7597d3f22546bdfcf46dcc3be7625447..bb64bf701c5c44c8c019d44df448a38cacd5dea2 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 4be84cf6b877635a6480f93478d9013e6801f94d..8159bc6c0c44e2a36250f3ac3c5d73e56b8326d2 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 a36c3889edce2bbfa05f85eff2013156e67f91ce..b82a029f5e436022b50d6541541f8bee0ac9effd 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 446a4e0a5fb62363475b5d7f23daea922ac23c3d..ee8411efc2d1fe5c6d4bda32195365f7f78e8def 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 b5d05e7e6a0ed2d7b76cc71e6df9c9eefaa06ff3..3339e610600442106d5757eee3fc2a1353c48f41 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>