From 991badc5d0a9ab87996fb2cdb6f2d6139353abc5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Dec 2023 15:31:09 +0100
Subject: [PATCH] OZG-4589 OZG-4643 use ozgcloud common v3
---
bescheid-manager/pom.xml | 10 ++++----
.../java/de/ozgcloud/bescheid/Bescheid.java | 2 +-
...scheidCallContextAttachingInterceptor.java | 2 +-
.../bescheid/BescheidEventListener.java | 2 +-
.../de/ozgcloud/bescheid/BescheidService.java | 2 +-
.../java/de/ozgcloud/bescheid/UserId.java | 2 +-
.../binaryfile/BinaryFileRemoteService.java | 25 +++++++++++--------
.../dummy/DummyBescheidRemoteService.java | 2 +-
.../bescheid/nachricht/Nachricht.java | 2 +-
.../bescheid/nachricht/NachrichtId.java | 2 +-
.../bescheid/nachricht/NachrichtMapper.java | 2 +-
.../bescheid/nachricht/NachrichtService.java | 2 +-
.../SmartDocumentsBescheidRemoteService.java | 2 +-
.../vorgang/FormDataEntrySerializer.java | 2 +-
.../ozgcloud/bescheid/vorgang/VorgangId.java | 2 +-
.../bescheid/BescheidEventListenerITCase.java | 2 +-
.../bescheid/BescheidTestApplication.java | 2 +-
.../bescheid/BescheidTestFactory.java | 2 +-
.../nachricht/NachrichtServiceITCase.java | 2 +-
...tDocumentsBescheidRemoteServiceITCase.java | 2 +-
nachrichten-manager/pom.xml | 14 +++++------
.../errorhandling/TechnicalException.java | 2 +-
...ichtenCallContextAttachingInterceptor.java | 2 +-
.../nachrichten/email/EMailService.java | 7 +++---
.../ozgcloud/nachrichten/postfach/FileId.java | 2 +-
.../bayernid/BayernIdAttachmentService.java | 10 ++++----
.../BayernIdPostfachNachrichtMapper.java | 2 +-
.../osi/MessageAttachmentService.java | 2 +-
.../BayernIdAttachmentServiceTest.java | 2 +-
.../bayernid/BayernIdPropertiesITCase.java | 2 +-
notification-manager/pom.xml | 15 ++++++-----
...anagerCallContextAttachingInterceptor.java | 2 +-
.../AntragstellerNotificationService.java | 2 +-
.../notification/vorgang/VorgangId.java | 2 +-
...erCallContextAttachingInterceptorTest.java | 2 +-
pom.xml | 8 +++---
vorgang-manager-base/pom.xml | 6 ++---
.../VorgangManagerServerApplication.java | 2 +-
.../CallContextHandleInterceptor.java | 2 +-
...ClientCallContextAttachingInterceptor.java | 2 +-
.../CallContextHandleInterceptorTest.java | 2 +-
.../callcontext/CallContextTestFactory.java | 2 +-
.../callcontext/CurrentUserServiceITCase.java | 2 +-
.../TestCallContextAttachingInterceptor.java | 2 +-
...ntCallContextAttachingInterceptorTest.java | 2 +-
vorgang-manager-command/pom.xml | 10 ++++----
vorgang-manager-interface/pom.xml | 20 +++++++--------
vorgang-manager-server/pom.xml | 18 ++++++-------
.../vorgang/command/CommandService.java | 4 +--
.../vorgang/command/GrpcCommandService.java | 2 +-
...sistPostfachNachrichtByCommandService.java | 5 ++--
.../errorhandling/ExceptionHandler.java | 4 +--
.../errorhandling/FunctionalException.java | 6 ++---
.../errorhandling/NotFoundException.java | 2 +-
.../SearchServiceUnavailableException.java | 2 +-
.../logging/RepositoryLoggingAspect.java | 2 +-
.../de/ozgcloud/vorgang/files/FileId.java | 2 +-
.../vorgang/files/UploadStreamObserver.java | 2 +-
.../vorgang/status/StatusService.java | 4 +--
...anagerCallContextAttachingInterceptor.java | 2 +-
.../AktenzeichenProviderConfiguration.java | 2 +-
.../vorgang/redirect/ForwardingService.java | 5 ++--
.../vorgang/redirect/ZipBuilderService.java | 2 +-
.../attributes/ClientAttributeITCase.java | 2 +-
.../postfach/PostfachEventListenerITCase.java | 2 +-
.../postfach/PostfachMailITCase.java | 2 +-
.../BayernIdPostfachServiceITCase.java | 2 +-
...dPostfachServiceNoConfigurationITCase.java | 3 +--
.../postfach/osi/OsiPostfachApiTestCase.java | 2 +-
.../osi/OsiPostfachRemoteServiceITCase.java | 2 +-
.../VorgangManagerServerApplicationTests.java | 2 +-
...organgAttachedItemEventListenerITCase.java | 3 +--
.../VorgangAttachedItemITCase.java | 2 +-
.../VorgangAttachedItemRepositoryITCase.java | 2 +-
.../VorgangAttachedItemServiceITCase.java | 3 +--
.../VorgangAttachedItemTestFactory.java | 2 +-
.../ClientAttributeITCase.java | 4 +--
.../ClientAttributeRepositoryITCase.java | 2 +-
.../ClientAttributeServiceITCase.java | 3 +--
.../vorgang/command/CommandITCase.java | 2 +-
.../command/CommandRepositoryITCase.java | 2 +-
.../vorgang/command/CommandServiceITCase.java | 2 +-
.../vorgang/command/CommandServiceTest.java | 2 +-
...istPostfachMailByCommandServiceITCase.java | 7 ++++--
.../errorhandling/ExceptionHandlerTest.java | 7 +++---
...ateClientNameInClientAttributesITCase.java | 4 +--
.../M002_UpdateClientNameInGridFsITCase.java | 2 +-
...ClientNameInVorgangAttachedItemITCase.java | 2 +-
...ClientNameInVorgangAttachedItemITCase.java | 2 +-
...gerClientNameInClientAttributesITCase.java | 2 +-
...ClientNameInVorgangAttachedItemITCase.java | 2 +-
...iceClientNameInClientAttributesITCase.java | 2 +-
...teMailServiceClientNameInGridFsITCase.java | 2 +-
.../common/migration/RenameUtilITCase.java | 2 +-
.../vorgang/common/search/SearchITCase.java | 2 +-
.../search/SearchIndexInitializerITCase.java | 4 +--
.../security/PolicyRepositoryITCase.java | 2 +-
.../vorgang/files/BinaryFileITCase.java | 5 ++--
.../files/BinaryFileRepositoryITCase.java | 2 +-
.../files/EingangFilesRepositoryITCase.java | 2 +-
.../de/ozgcloud/vorgang/files/FileITCase.java | 2 +-
.../files/UploadStreamObserverTest.java | 2 +-
.../statistic/StatisticRepositoryITCase.java | 2 +-
.../status/StatusEventListenerITCase.java | 3 +--
.../status/StatusRepositoryITCase.java | 2 +-
.../vorgang/status/StatusServiceTest.java | 2 +-
...erCallContextAttachingInterceptorTest.java | 2 +-
.../vorgang/AktenzeichenServiceITCase.java | 2 +-
.../vorgang/GrpcVorgangServiceITCase.java | 2 +-
.../vorgang/IncomingFileTestFactory.java | 2 +-
.../vorgang/VorgangEventListenerITCase.java | 2 +-
.../VorgangHeaderRepositoryITCase.java | 2 +-
.../VorgangHeaderRepositoryImplITCase.java | 2 +-
.../vorgang/vorgang/VorgangITCase.java | 2 +-
.../vorgang/VorgangRepositoryITCase.java | 2 +-
.../vorgang/vorgang/VorgangServiceITCase.java | 2 +-
.../redirect/ForwardVorgangITCase.java | 2 +-
.../ForwardingEventListenerITCase.java | 2 +-
.../vorgang/redirect/ForwardingITCase.java | 2 +-
.../redirect/ForwardingRepositoryITCase.java | 2 +-
.../redirect/ForwardingServiceITCase.java | 2 +-
vorgang-manager-utils/pom.xml | 16 ++++++------
.../common/grpc/GrpcObjectMapperTest.java | 2 +-
123 files changed, 208 insertions(+), 213 deletions(-)
diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index 26c000e10..682843b72 100644
--- a/bescheid-manager/pom.xml
+++ b/bescheid-manager/pom.xml
@@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-parent</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>
@@ -36,8 +36,8 @@
</dependency>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-lib</artifactId>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-lib</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/Bescheid.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/Bescheid.java
index 419b07d7d..e66c3a241 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/Bescheid.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/Bescheid.java
@@ -2,9 +2,9 @@ package de.ozgcloud.bescheid;
import java.io.File;
-import de.itvsh.kop.common.binaryfile.FileId;
import de.ozgcloud.bescheid.vorgang.Vorgang;
import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.common.binaryfile.FileId;
import lombok.Builder;
import lombok.Getter;
import lombok.With;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java
index 4fce105cf..c3e424ba8 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java
@@ -1,6 +1,6 @@
package de.ozgcloud.bescheid;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import java.util.UUID;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
index 21f21a390..22eb1b3ff 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
@@ -12,7 +12,6 @@ import org.springframework.context.event.EventListener;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.bescheid.binaryfile.BinaryFileService;
import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
import de.ozgcloud.bescheid.nachricht.NachrichtService;
@@ -20,6 +19,7 @@ import de.ozgcloud.bescheid.vorgang.VorgangId;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEvent;
import de.ozgcloud.command.CommandFailedEvent;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidService.java
index 613a0fb9d..b24103919 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/BescheidService.java
@@ -5,8 +5,8 @@ import java.util.Objects;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.bescheid.vorgang.VorgangService;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.extern.log4j.Log4j2;
@Service
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/UserId.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/UserId.java
index 825a14ba2..d92b40245 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/UserId.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/UserId.java
@@ -2,7 +2,7 @@ package de.ozgcloud.bescheid;
import java.util.Objects;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java
index 5c225a4f7..8b6583727 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java
@@ -5,19 +5,20 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import org.apache.commons.io.IOUtils;
import org.springframework.stereotype.Service;
import com.google.protobuf.ByteString;
-import de.itvsh.kop.common.binaryfile.FileId;
-import de.itvsh.kop.common.binaryfile.GrpcFileUploadUtils;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.bescheid.Bescheid;
+import de.ozgcloud.common.binaryfile.FileId;
+import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils;
+import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils.FileSender;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
@@ -44,7 +45,7 @@ class BinaryFileRemoteService {
.withMetaData(buildMetaDataRequest(bescheid))
.send();
- return FileId.from(waitUntilFutureToComplete(resultFuture).getFileId());
+ return FileId.from(waitUntilFutureToComplete(resultFuture, in).getFileId());
} catch (IOException e) {
throw new TechnicalException("Error on uploading file.", e);
}
@@ -72,8 +73,8 @@ class BinaryFileRemoteService {
.build();
}
- private GrpcUploadBinaryFileRequest buildChunkRequest(byte[] bytes) {
- return GrpcUploadBinaryFileRequest.newBuilder().setFileContent((ByteString.copyFrom(bytes))).build();
+ private GrpcUploadBinaryFileRequest buildChunkRequest(byte[] bytes, Integer length) {
+ return GrpcUploadBinaryFileRequest.newBuilder().setFileContent((ByteString.copyFrom(bytes, 0, length))).build();
}
private CallStreamObserver<GrpcUploadBinaryFileRequest> buildCallStreamObserver(
@@ -81,15 +82,19 @@ class BinaryFileRemoteService {
return (CallStreamObserver<GrpcUploadBinaryFileRequest>) binaryFileRemoteStub.uploadBinaryFileAsStream(responseObserver);
}
- GrpcUploadBinaryFileResponse waitUntilFutureToComplete(CompletableFuture<GrpcUploadBinaryFileResponse> streamFuture) {
+ GrpcUploadBinaryFileResponse waitUntilFutureToComplete(FileSender<GrpcUploadBinaryFileRequest, GrpcUploadBinaryFileResponse> fileSender,
+ InputStream fileContentStream) {
try {
- return streamFuture.get(10, TimeUnit.MINUTES);
+ return fileSender.getResultFuture().get(10, TimeUnit.MINUTES);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
+ fileSender.cancelOnError(e);
throw new TechnicalException("Waiting for finishing upload was interrupted.", e);
} catch (ExecutionException | TimeoutException e) {
- streamFuture.cancel(true);
+ fileSender.cancelOnTimeout();
throw new TechnicalException("Error / Timeout on uploading data.", e);
+ } finally {
+ IOUtils.closeQuietly(fileContentStream);
}
}
}
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
index 0a35a6217..2f7a4097f 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
@@ -5,11 +5,11 @@ import org.springframework.stereotype.Service;
import com.google.common.net.MediaType;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
import de.ozgcloud.bescheid.Bescheid;
import de.ozgcloud.bescheid.BescheidRemoteService;
import de.ozgcloud.bescheid.BescheidRequest;
import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
@Service
@ConditionalOnMissingBean(BescheidRemoteService.class)
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/Nachricht.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/Nachricht.java
index 8efef32ad..1f352d1d9 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/Nachricht.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/Nachricht.java
@@ -2,10 +2,10 @@ package de.ozgcloud.bescheid.nachricht;
import java.time.ZonedDateTime;
-import de.itvsh.kop.common.binaryfile.FileId;
import de.ozgcloud.bescheid.UserId;
import de.ozgcloud.bescheid.vorgang.Vorgang;
import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.common.binaryfile.FileId;
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtId.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtId.java
index 7864d82a7..b8fd29a93 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtId.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtId.java
@@ -1,6 +1,6 @@
package de.ozgcloud.bescheid.nachricht;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class NachrichtId extends StringBasedValue {
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtMapper.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtMapper.java
index e57013c3a..45bba2af3 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtMapper.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtMapper.java
@@ -6,9 +6,9 @@ import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
-import de.itvsh.kop.common.binaryfile.FileId;
import de.ozgcloud.bescheid.UserId;
import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.nachrichten.postfach.GrpcPostfachNachricht;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
import de.ozgcloud.vorgang.vorgang.GrpcPostfachAddress;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtService.java
index 42d57dcf6..54090eea7 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/nachricht/NachrichtService.java
@@ -8,9 +8,9 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.bescheid.Bescheid;
import de.ozgcloud.bescheid.vorgang.Vorgang.PostfachAddress;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
index f23cac948..6acd44134 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
@@ -14,7 +14,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import de.itvsh.kop.common.binaryfile.FileDataDeserializer;
import de.ozgcloud.bescheid.Bescheid;
import de.ozgcloud.bescheid.BescheidRemoteService;
import de.ozgcloud.bescheid.BescheidRequest;
@@ -22,6 +21,7 @@ import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData;
import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.BescheidData;
import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.SmartDocument.Selection;
import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.common.binaryfile.FileDataDeserializer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java
index 263acb398..0a3b48dbe 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java
@@ -10,9 +10,9 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.bescheid.vorgang.FormDataEntry.FormField;
import de.ozgcloud.bescheid.vorgang.FormDataEntry.SubForm;
+import de.ozgcloud.common.errorhandling.TechnicalException;
public class FormDataEntrySerializer extends StdSerializer<FormDataEntry> {
diff --git a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java
index 368cdff21..2cb8785e5 100644
--- a/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java
+++ b/bescheid-manager/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java
@@ -1,6 +1,6 @@
package de.ozgcloud.bescheid.vorgang;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class VorgangId extends StringBasedValue {
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
index 7ee549d1e..cb898c7a6 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEventTestFactory;
import de.ozgcloud.command.CommandTestFactory;
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java
index 66beb3d56..28c3e88f5 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java
@@ -7,7 +7,7 @@ import org.springframework.security.authentication.AuthenticationTrustResolver;
import org.springframework.security.authentication.AuthenticationTrustResolverImpl;
@SpringBootApplication
-@ComponentScan({ "de.ozgcloud.*", "de.itvsh.*" })
+@ComponentScan({ "de.ozgcloud.*" })
public class BescheidTestApplication {
@Bean
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java
index 9dc6516cf..28e3f21a6 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java
@@ -4,10 +4,10 @@ import java.io.File;
import org.springframework.http.MediaType;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
import de.ozgcloud.bescheid.vorgang.ServiceKontoTestFactory;
import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.command.CommandTestFactory;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
public class BescheidTestFactory {
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/nachricht/NachrichtServiceITCase.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/nachricht/NachrichtServiceITCase.java
index 79fa8c204..471fdfd64 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/nachricht/NachrichtServiceITCase.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/nachricht/NachrichtServiceITCase.java
@@ -6,7 +6,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.bescheid.BescheidTestFactory;
@ITCase
diff --git a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
index 3daf43861..6bbf4083b 100644
--- a/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
+++ b/bescheid-manager/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ActiveProfiles;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.bescheid.BescheidRequestTestFactory;
import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
diff --git a/nachrichten-manager/pom.xml b/nachrichten-manager/pom.xml
index 4a28c6289..24461739a 100644
--- a/nachrichten-manager/pom.xml
+++ b/nachrichten-manager/pom.xml
@@ -28,9 +28,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-parent</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -44,7 +44,7 @@
<!-- TODO version management -->
<shedlock.version>4.25.0</shedlock.version>
<logcaptor.version>2.7.10</logcaptor.version>
- <kop.license.version>1.3.0</kop.license.version>
+ <ozgcloud.license.version>1.3.0</ozgcloud.license.version>
<jaxb-maven-plugin.version>3.0.1</jaxb-maven-plugin.version>
</properties>
@@ -279,9 +279,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-license</artifactId>
+ <version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/errorhandling/TechnicalException.java b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/errorhandling/TechnicalException.java
index 54f1f08fe..307353add 100644
--- a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/errorhandling/TechnicalException.java
+++ b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/errorhandling/TechnicalException.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.nachrichten.common.errorhandling;
-@Deprecated /** please use {@link de.itvsh.kop.common.errorhandling.TechnicalException} */
+@Deprecated /** please use {@link de.ozgcloud.common.errorhandling.TechnicalException} */
public class TechnicalException extends RuntimeException {
private static final long serialVersionUID = 1L;
diff --git a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/grpc/NachrichtenCallContextAttachingInterceptor.java b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/grpc/NachrichtenCallContextAttachingInterceptor.java
index 52ece2e4a..d3fa03da9 100644
--- a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/grpc/NachrichtenCallContextAttachingInterceptor.java
+++ b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/common/grpc/NachrichtenCallContextAttachingInterceptor.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.nachrichten.common.grpc;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import java.util.UUID;
diff --git a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/email/EMailService.java b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/email/EMailService.java
index 8dd528362..8f5c54e5d 100644
--- a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/email/EMailService.java
+++ b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/email/EMailService.java
@@ -33,11 +33,10 @@ import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import de.ozgcloud.nachrichten.email.MailSendRequest.MailAttachment;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
-
-import de.ozgcloud.nachrichten.email.MailSendRequest.MailAttachment;
import lombok.extern.log4j.Log4j2;
@Service
@@ -92,7 +91,7 @@ class EMailService {
return mailRecipient.email();
}
var builder = new StringBuilder();
- if (StringUtils.isNotEmpty(mailRecipient.firstName())){
+ if (StringUtils.isNotEmpty(mailRecipient.firstName())) {
builder.append(mailRecipient.firstName()).append(" ");
}
if (StringUtils.isNotEmpty(mailRecipient.lastName())) {
diff --git a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/FileId.java b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/FileId.java
index e17827792..785167921 100644
--- a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/FileId.java
+++ b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/FileId.java
@@ -25,7 +25,7 @@ package de.ozgcloud.nachrichten.postfach;
import java.util.UUID;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
diff --git a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentService.java b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentService.java
index 43e1cc5ac..ea357f1ae 100644
--- a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentService.java
+++ b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentService.java
@@ -36,7 +36,7 @@ import org.springframework.util.Base64Utils;
import com.mongodb.client.gridfs.model.GridFSFile;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.postfach.BinaryFileService;
import de.ozgcloud.nachrichten.postfach.FileId;
@@ -50,10 +50,10 @@ public class BayernIdAttachmentService {
private BinaryFileService binaryFileService;
public BayernIdAttachment getMessageAttachment(FileId fileId) {
- return Optional.ofNullable(binaryFileService.getFile(fileId))
- .map(GridFSFile::getMetadata)
- .map(metadata -> buildBayernIdAttachment(metadata, getAttachmentContent(fileId)))
- .orElseThrow(() -> new TechnicalException("Can not find attachment with id " + fileId));
+ return Optional.ofNullable(binaryFileService.getFile(fileId))
+ .map(GridFSFile::getMetadata)
+ .map(metadata -> buildBayernIdAttachment(metadata, getAttachmentContent(fileId)))
+ .orElseThrow(() -> new TechnicalException("Can not find attachment with id " + fileId));
}
BayernIdAttachment buildBayernIdAttachment(Document metadata, byte[] attachmentContent) {
diff --git a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachNachrichtMapper.java b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachNachrichtMapper.java
index a09343878..a7e145a81 100644
--- a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachNachrichtMapper.java
+++ b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachNachrichtMapper.java
@@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import de.akdb.egov.bsp.nachrichten.BspNachricht;
import de.akdb.egov.bsp.nachrichten.DataContainerType;
import de.akdb.egov.bsp.nachrichten.SchluesseltabelleType;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.postfach.FileId;
import de.ozgcloud.nachrichten.postfach.PostfachAddress;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
diff --git a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/osi/MessageAttachmentService.java b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/osi/MessageAttachmentService.java
index 8906eb978..7d7dc8260 100644
--- a/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/osi/MessageAttachmentService.java
+++ b/nachrichten-manager/src/main/java/de/ozgcloud/nachrichten/postfach/osi/MessageAttachmentService.java
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Base64Utils;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.postfach.AttachmentFile;
import de.ozgcloud.nachrichten.postfach.BinaryFileService;
import de.ozgcloud.nachrichten.postfach.FileId;
diff --git a/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentServiceTest.java b/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentServiceTest.java
index 8150ff9b3..1a75a2c85 100644
--- a/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentServiceTest.java
+++ b/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdAttachmentServiceTest.java
@@ -43,7 +43,7 @@ import org.mockito.Spy;
import com.mongodb.client.gridfs.model.GridFSFile;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.postfach.BinaryFileService;
import de.ozgcloud.nachrichten.postfach.FileId;
diff --git a/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPropertiesITCase.java b/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPropertiesITCase.java
index c011650b7..f767196e6 100644
--- a/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPropertiesITCase.java
+++ b/nachrichten-manager/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPropertiesITCase.java
@@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.core.io.ClassPathResource;
import org.springframework.test.context.TestPropertySource;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
@SpringBootTest(classes = { BayernIdProperties.class })
@ITCase
diff --git a/notification-manager/pom.xml b/notification-manager/pom.xml
index 6186a3a64..f2ab4441f 100644
--- a/notification-manager/pom.xml
+++ b/notification-manager/pom.xml
@@ -27,9 +27,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-parent</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -40,7 +40,7 @@
<properties>
<user-manager-interface.version>2.0.0-SNAPSHOT</user-manager-interface.version>
- <kop.license.version>1.6.0</kop.license.version>
+ <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
</properties>
<dependencies>
@@ -131,7 +131,6 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>4.1</version>
<configuration>
<mapping>
<config>SCRIPT_STYLE</config>
@@ -149,9 +148,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-license</artifactId>
+ <version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/notification-manager/src/main/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptor.java b/notification-manager/src/main/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptor.java
index a62f35ee2..5c95757fd 100644
--- a/notification-manager/src/main/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptor.java
+++ b/notification-manager/src/main/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptor.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.notification;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import java.util.UUID;
diff --git a/notification-manager/src/main/java/de/ozgcloud/notification/antragsteller/AntragstellerNotificationService.java b/notification-manager/src/main/java/de/ozgcloud/notification/antragsteller/AntragstellerNotificationService.java
index 9e949f042..7c15e2129 100644
--- a/notification-manager/src/main/java/de/ozgcloud/notification/antragsteller/AntragstellerNotificationService.java
+++ b/notification-manager/src/main/java/de/ozgcloud/notification/antragsteller/AntragstellerNotificationService.java
@@ -33,7 +33,7 @@ import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.notification.command.CommandService;
import de.ozgcloud.notification.postfach.PostfachNachricht;
import de.ozgcloud.notification.vorgang.Vorgang;
diff --git a/notification-manager/src/main/java/de/ozgcloud/notification/vorgang/VorgangId.java b/notification-manager/src/main/java/de/ozgcloud/notification/vorgang/VorgangId.java
index f3a8f6997..e3c50bbd6 100644
--- a/notification-manager/src/main/java/de/ozgcloud/notification/vorgang/VorgangId.java
+++ b/notification-manager/src/main/java/de/ozgcloud/notification/vorgang/VorgangId.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.notification.vorgang;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
diff --git a/notification-manager/src/test/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptorTest.java b/notification-manager/src/test/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptorTest.java
index a71dbe30c..7c28db127 100644
--- a/notification-manager/src/test/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptorTest.java
+++ b/notification-manager/src/test/java/de/ozgcloud/notification/NotificationManagerCallContextAttachingInterceptorTest.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.notification;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import static de.ozgcloud.notification.NotificationManagerCallContextAttachingInterceptor.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/pom.xml b/pom.xml
index ea4e0c7de..8a31c3fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<packaging>pom</packaging>
<properties>
- <kop.license.version>1.3.0</kop.license.version>
+ <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
</properties>
<modules>
@@ -73,9 +73,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-license</artifactId>
+ <version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/vorgang-manager-base/pom.xml b/vorgang-manager-base/pom.xml
index d903865fd..54de9746d 100644
--- a/vorgang-manager-base/pom.xml
+++ b/vorgang-manager-base/pom.xml
@@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-parent</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath />
</parent>
diff --git a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/VorgangManagerServerApplication.java b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/VorgangManagerServerApplication.java
index 62d562b44..ff799cfa3 100644
--- a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/VorgangManagerServerApplication.java
+++ b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/VorgangManagerServerApplication.java
@@ -38,7 +38,7 @@ import org.springframework.security.authentication.AuthenticationTrustResolver;
import org.springframework.security.authentication.AuthenticationTrustResolverImpl;
import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor;
-@SpringBootApplication(scanBasePackages = { "de.itvsh.*", "de.ozgcloud" })
+@SpringBootApplication(scanBasePackages = { "de.ozgcloud" })
@EnableAsync(proxyTargetClass = true)
@EnableScheduling
@EnableAspectJAutoProxy(proxyTargetClass = true)
diff --git a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptor.java b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptor.java
index c813a83a4..56e9cdb76 100644
--- a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptor.java
+++ b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptor.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.callcontext;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import java.util.UUID;
diff --git a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptor.java b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptor.java
index 78bf07542..667559f54 100644
--- a/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptor.java
+++ b/vorgang-manager-base/src/main/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptor.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.callcontext;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import java.util.UUID;
diff --git a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptorTest.java b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptorTest.java
index 9d774b263..7da699439 100644
--- a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptorTest.java
+++ b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextHandleInterceptorTest.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.callcontext;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import static de.ozgcloud.vorgang.callcontext.CallContextHandleInterceptor.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextTestFactory.java b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextTestFactory.java
index 9cc7b8b46..a51e03e3c 100644
--- a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextTestFactory.java
+++ b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CallContextTestFactory.java
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import de.itvsh.kop.common.grpc.GrpcUtil;
+import de.ozgcloud.common.grpc.GrpcUtil;
import io.grpc.Metadata;
public class CallContextTestFactory {
diff --git a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CurrentUserServiceITCase.java b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CurrentUserServiceITCase.java
index 923ec5ca5..db8a5e476 100644
--- a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CurrentUserServiceITCase.java
+++ b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/CurrentUserServiceITCase.java
@@ -33,7 +33,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.test.context.support.WithAnonymousUser;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
@ITCase
class CurrentUserServiceITCase {
diff --git a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/TestCallContextAttachingInterceptor.java b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/TestCallContextAttachingInterceptor.java
index 56f471a1a..518fc07f0 100644
--- a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/TestCallContextAttachingInterceptor.java
+++ b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/TestCallContextAttachingInterceptor.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.callcontext;
-import de.itvsh.kop.common.grpc.GrpcUtil;
+import de.ozgcloud.common.grpc.GrpcUtil;
import io.grpc.CallOptions;
import io.grpc.Channel;
import io.grpc.ClientCall;
diff --git a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptorTest.java b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptorTest.java
index 6818c1d6b..e3ee4977f 100644
--- a/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptorTest.java
+++ b/vorgang-manager-base/src/test/java/de/ozgcloud/vorgang/callcontext/VorgangManagerClientCallContextAttachingInterceptorTest.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.callcontext;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import static de.ozgcloud.vorgang.callcontext.VorgangManagerClientCallContextAttachingInterceptor.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/vorgang-manager-command/pom.xml b/vorgang-manager-command/pom.xml
index f4f0d656a..1c0a7a281 100644
--- a/vorgang-manager-command/pom.xml
+++ b/vorgang-manager-command/pom.xml
@@ -2,9 +2,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-dependencies</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -24,8 +24,8 @@
</dependency>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-lib</artifactId>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-lib</artifactId>
</dependency>
<dependency>
diff --git a/vorgang-manager-interface/pom.xml b/vorgang-manager-interface/pom.xml
index 48fcbc3ad..99eff692d 100644
--- a/vorgang-manager-interface/pom.xml
+++ b/vorgang-manager-interface/pom.xml
@@ -28,9 +28,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-dependencies</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -50,15 +50,15 @@
<maven.compiler.target>17</maven.compiler.target>
<find-and-replace-maven-plugin.version>1.1.0</find-and-replace-maven-plugin.version>
- <kop.license.version>1.6.0</kop.license.version>
+ <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>${kop-common.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-dependencies</artifactId>
+ <version>${ozgcloud-common.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -160,9 +160,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-license</artifactId>
+ <version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/vorgang-manager-server/pom.xml b/vorgang-manager-server/pom.xml
index 2cdf8d641..299842d01 100644
--- a/vorgang-manager-server/pom.xml
+++ b/vorgang-manager-server/pom.xml
@@ -28,9 +28,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-parent</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -47,8 +47,8 @@
<spring-boot.build-image.imageName>docker.ozg-sh.de/vorgang-manager:build-latest</spring-boot.build-image.imageName>
- <kop.license.version>1.3.0</kop.license.version>
- <kop.zufi.api.version>0.5.0</kop.zufi.api.version>
+ <ozgcloud.license.version>1.6.0</ozgcloud.license.version>
+ <ozgcloud.zufi.api.version>0.5.0</ozgcloud.zufi.api.version>
<user-manager-interface.version>2.0.0-SNAPSHOT</user-manager-interface.version>
<bescheid-manager.version>1.4.0-SNAPSHOT</bescheid-manager.version>
@@ -114,7 +114,7 @@
<dependency>
<groupId>de.itvsh.kop.zufi</groupId>
<artifactId>kop-zufi-api</artifactId>
- <version>${kop.zufi.api.version}</version>
+ <version>${ozgcloud.zufi.api.version}</version>
</dependency>
<dependency>
@@ -401,9 +401,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-license</artifactId>
+ <version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java
index a7e166496..a1ae7a95e 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/CommandService.java
@@ -37,15 +37,15 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEvent;
import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.command.CommandStatus;
import de.ozgcloud.command.RevokeCommandEvent;
+import de.ozgcloud.common.errorhandling.TechnicalException;
+import de.ozgcloud.vorgang.callcontext.CallContext;
import de.ozgcloud.vorgang.callcontext.CallContextUser;
import de.ozgcloud.vorgang.callcontext.CurrentUserService;
-import de.ozgcloud.vorgang.callcontext.CallContext;
import de.ozgcloud.vorgang.callcontext.User;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java
index 829eb20ce..640b3b65d 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/GrpcCommandService.java
@@ -30,10 +30,10 @@ import java.util.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandExecutedEvent;
import de.ozgcloud.command.CommandStatus;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.command.CommandResponse.ResponseCode;
import de.ozgcloud.vorgang.common.errorhandling.NotFoundException;
import de.ozgcloud.vorgang.common.security.PolicyService;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
index c6f95629e..c7c1af28a 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandService.java
@@ -39,14 +39,12 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Stream;
-import jakarta.activation.MimetypesFileTypeMap;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.ContentType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.postfach.AttachmentFile;
import de.ozgcloud.nachrichten.postfach.PersistPostfachNachrichtService;
import de.ozgcloud.nachrichten.postfach.PostfachAddress;
@@ -60,6 +58,7 @@ import de.ozgcloud.vorgang.callcontext.User;
import de.ozgcloud.vorgang.files.FileService;
import de.ozgcloud.vorgang.files.OzgFile;
import de.ozgcloud.vorgang.files.UploadedFilesReference;
+import jakarta.activation.MimetypesFileTypeMap;
import lombok.extern.log4j.Log4j2;
/**
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandler.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandler.java
index 7150a9075..d5a1c1691 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandler.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandler.java
@@ -27,8 +27,8 @@ import java.util.UUID;
import org.springframework.security.access.AccessDeniedException;
-import de.itvsh.kop.common.errorhandling.ExceptionUtil;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.ExceptionUtil;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import io.grpc.Metadata;
import io.grpc.Metadata.Key;
import io.grpc.Status;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/FunctionalException.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/FunctionalException.java
index 145bcf8d8..14f78a592 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/FunctionalException.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/FunctionalException.java
@@ -27,9 +27,9 @@ import java.util.Collections;
import java.util.Map;
import java.util.UUID;
-import de.itvsh.kop.common.errorhandling.ExceptionUtil;
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
-import de.itvsh.kop.common.errorhandling.IdentifiableException;
+import de.ozgcloud.common.errorhandling.ExceptionUtil;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.IdentifiableException;
import lombok.Getter;
public class FunctionalException extends RuntimeException implements IdentifiableException {
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/NotFoundException.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/NotFoundException.java
index 268b4411f..930f5593c 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/NotFoundException.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/NotFoundException.java
@@ -25,7 +25,7 @@ package de.ozgcloud.vorgang.common.errorhandling;
import java.util.Map;
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
import lombok.Getter;
@Getter
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/SearchServiceUnavailableException.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/SearchServiceUnavailableException.java
index 603dc84a5..37b0c0d9d 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/SearchServiceUnavailableException.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/errorhandling/SearchServiceUnavailableException.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.common.errorhandling;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
public class SearchServiceUnavailableException extends TechnicalException {
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/logging/RepositoryLoggingAspect.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/logging/RepositoryLoggingAspect.java
index b69b3ef1d..537b62b53 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/logging/RepositoryLoggingAspect.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/common/logging/RepositoryLoggingAspect.java
@@ -28,7 +28,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.common.logging.AspectLoggingUtils;
+import de.ozgcloud.common.logging.AspectLoggingUtils;
@Aspect
@Component
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileId.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileId.java
index f16e2bfea..10dedaad9 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileId.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/FileId.java
@@ -25,7 +25,7 @@ package de.ozgcloud.vorgang.files;
import java.util.UUID;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/UploadStreamObserver.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/UploadStreamObserver.java
index 00d42c67b..b864e5e64 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/UploadStreamObserver.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/UploadStreamObserver.java
@@ -33,7 +33,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.common.security.PolicyService;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileResponse;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java
index 3eea9b818..86405b872 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/status/StatusService.java
@@ -10,13 +10,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.command.CommandRevokedEvent;
-import de.ozgcloud.vorgang.vorgang.Vorgang.Status;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.command.PersistedCommand;
import de.ozgcloud.vorgang.vorgang.Vorgang;
+import de.ozgcloud.vorgang.vorgang.Vorgang.Status;
import lombok.extern.log4j.Log4j2;
@Service
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptor.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptor.java
index 71320c6f1..6a6b4d0e0 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptor.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptor.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.vorgang.user;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import java.util.UUID;
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/AktenzeichenProviderConfiguration.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/AktenzeichenProviderConfiguration.java
index 1cf20c5d0..13ffd166f 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/AktenzeichenProviderConfiguration.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/AktenzeichenProviderConfiguration.java
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
@Configuration
public class AktenzeichenProviderConfiguration {
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingService.java
index 231170de4..107bdfeaf 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingService.java
@@ -32,8 +32,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;
-import jakarta.mail.util.ByteArrayDataSource;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@@ -43,8 +41,8 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.util.MimeTypeUtils;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.command.Command;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.nachrichten.email.MailRecipient;
import de.ozgcloud.nachrichten.email.MailSendRequest;
import de.ozgcloud.nachrichten.email.MailSendRequest.MailAttachment;
@@ -57,6 +55,7 @@ import de.ozgcloud.vorgang.vorgang.redirect.Forwarding.Status;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
+import jakarta.mail.util.ByteArrayDataSource;
import lombok.extern.log4j.Log4j2;
@Service
diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java
index a2a3c8f04..aca6b9e0d 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ZipBuilderService.java
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.MimeTypeUtils;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.files.FileService;
import de.ozgcloud.vorgang.vorgang.Eingang;
import de.ozgcloud.vorgang.vorgang.IncomingFile;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java
index 96b9358a0..083f27922 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/attributes/ClientAttributeITCase.java
@@ -38,7 +38,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.nachrichten.common.grpc.NachrichtenCallContextAttachingInterceptor;
import de.ozgcloud.vorgang.VorgangManagerServerApplication;
import de.ozgcloud.vorgang.clientattribute.ClientAttribute;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerITCase.java
index 6b3a58c4e..9c4c93c8e 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachEventListenerITCase.java
@@ -38,9 +38,9 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.test.ITCase;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.VorgangManagerServerApplication;
import de.ozgcloud.vorgang.command.CommandService;
import de.ozgcloud.vorgang.command.CommandTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java
index 55c083e8d..bbf5af683 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/PostfachMailITCase.java
@@ -50,7 +50,7 @@ import org.springframework.test.web.client.ExpectedCount;
import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.web.client.RestTemplate;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.nachrichten.attributes.ClientAttributeService;
import de.ozgcloud.nachrichten.postfach.osi.MessageAttachmentTestFactory;
import de.ozgcloud.nachrichten.postfach.osi.MessageJsonReplyTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceITCase.java
index c716c9dcd..29d723c5c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceITCase.java
@@ -17,7 +17,7 @@ import org.springframework.core.io.Resource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.ws.test.client.MockWebServiceServer;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import de.ozgcloud.nachrichten.postfach.PostfachRuntimeException;
import de.ozgcloud.vorgang.VorgangManagerServerApplication;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceNoConfigurationITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceNoConfigurationITCase.java
index 89649ed47..96d79187d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceNoConfigurationITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/bayernid/BayernIdPostfachServiceNoConfigurationITCase.java
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.VorgangManagerServerApplication;
@RunWith(SpringRunner.class)
@@ -24,4 +24,3 @@ class BayernIdPostfachServiceNoConfigurationITCase {
assertThat(bayernIdPostfachRemoteService).isNull();
}
}
-
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachApiTestCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachApiTestCase.java
index a2ddd4604..6a6c7dacd 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachApiTestCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachApiTestCase.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.nachrichten.postfach.PostfachNachricht;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import de.ozgcloud.vorgang.VorgangManagerServerApplication;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachRemoteServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachRemoteServiceITCase.java
index 44365de88..6f763527d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachRemoteServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/nachrichten/postfach/osi/OsiPostfachRemoteServiceITCase.java
@@ -38,7 +38,7 @@ import org.springframework.http.MediaType;
import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.web.client.RestTemplate;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.nachrichten.postfach.FileId;
import de.ozgcloud.nachrichten.postfach.PostfachException;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/VorgangManagerServerApplicationTests.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/VorgangManagerServerApplicationTests.java
index 094880dc2..87497b70a 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/VorgangManagerServerApplicationTests.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/VorgangManagerServerApplicationTests.java
@@ -25,7 +25,7 @@ package de.ozgcloud.vorgang;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
@ITCase
class VorgangManagerServerApplicationTests {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemEventListenerITCase.java
index 289614006..3e5f8f244 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemEventListenerITCase.java
@@ -35,8 +35,8 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.test.ITCase;
import de.ozgcloud.command.RevokeCommandEvent;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.command.CommandCreatedEventTestFactory;
import de.ozgcloud.vorgang.command.CommandService;
import de.ozgcloud.vorgang.command.CommandTestFactory;
@@ -144,5 +144,4 @@ class VorgangAttachedItemEventListenerITCase {
}
-
}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java
index c553a214c..4ba2f9714 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemITCase.java
@@ -43,9 +43,9 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.access.AccessDeniedException;
-import de.itvsh.kop.common.test.DataITCase;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.callcontext.CallContextUserTestFactory;
import de.ozgcloud.vorgang.callcontext.CurrentUserService;
import de.ozgcloud.vorgang.command.CommandCreatedEventTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemRepositoryITCase.java
index f723844c1..8145e0f6c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemRepositoryITCase.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
@DataITCase
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceITCase.java
index 0404611f4..eccdc065f 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemServiceITCase.java
@@ -9,9 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.command.CommandTestFactory;
-
import jakarta.validation.ConstraintViolationException;
@ITCase
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemTestFactory.java
index 07e4fc76c..58bf4f855 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/attached_item/VorgangAttachedItemTestFactory.java
@@ -29,7 +29,7 @@ import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum;
-import de.itvsh.kop.common.binaryfile.FileId;
+import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
public class VorgangAttachedItemTestFactory {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeITCase.java
index c8e1c3c51..7fcd54122 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeITCase.java
@@ -34,14 +34,12 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.test.annotation.DirtiesContext;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.callcontext.TestCallContextAttachingInterceptor;
-import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc;
import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangRequestTestFactory;
import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangRequest;
import de.ozgcloud.vorgang.vorgang.Vorgang;
-import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc;
import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
import net.devh.boot.grpc.client.inject.GrpcClient;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeRepositoryITCase.java
index a17d2e4a6..c617677df 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeRepositoryITCase.java
@@ -40,7 +40,7 @@ import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.callcontext.CallContextTestFactory;
import de.ozgcloud.vorgang.clientattribute.ClientAttribute.AccessPermission;
import de.ozgcloud.vorgang.common.errorhandling.NotFoundException;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeServiceITCase.java
index 61fae3f11..32eff1609 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/clientattribute/ClientAttributeServiceITCase.java
@@ -32,9 +32,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
-
import jakarta.validation.ConstraintViolationException;
@ITCase
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandITCase.java
index c21ae7b2b..54a9d931b 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandITCase.java
@@ -40,9 +40,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandStatus;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.attached_item.VorgangAttachedItem;
import de.ozgcloud.vorgang.attached_item.VorgangAttachedItemTestFactory;
import de.ozgcloud.vorgang.common.errorhandling.NotFoundException;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandRepositoryITCase.java
index 59401f091..206065078 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandRepositoryITCase.java
@@ -44,9 +44,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Criteria;
-import de.itvsh.kop.common.test.DataITCase;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandStatus;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceITCase.java
index a3d089524..380948c31 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceITCase.java
@@ -37,9 +37,9 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandStatus;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.callcontext.CallContextUserTestFactory;
import de.ozgcloud.vorgang.callcontext.CurrentUserService;
import de.ozgcloud.vorgang.vorgang.Vorgang;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
index 2534095b0..416753a32 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/CommandServiceTest.java
@@ -43,10 +43,10 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandStatus;
import de.ozgcloud.command.RevokeCommandEvent;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.callcontext.CallContextTestFactory;
import de.ozgcloud.vorgang.callcontext.CallContextUserTestFactory;
import de.ozgcloud.vorgang.callcontext.CurrentUserService;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachMailByCommandServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachMailByCommandServiceITCase.java
index 14780ec8e..6f386a901 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachMailByCommandServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachMailByCommandServiceITCase.java
@@ -28,13 +28,16 @@ import static org.assertj.core.api.Assertions.*;
import java.util.Map;
import java.util.Optional;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
import de.ozgcloud.command.Command;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.nachrichten.postfach.PostfachNachrichtTestFactory;
import de.ozgcloud.vorgang.attached_item.VorgangAttachedItem;
import de.ozgcloud.vorgang.attached_item.VorgangAttachedItemTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandlerTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandlerTest.java
index 312b041b0..5988d1bde 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandlerTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/errorhandling/ExceptionHandlerTest.java
@@ -23,6 +23,7 @@
*/
package de.ozgcloud.vorgang.common.errorhandling;
+import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import java.util.Map;
@@ -34,10 +35,8 @@ import org.mockito.InjectMocks;
import org.mockito.Spy;
import org.springframework.security.access.AccessDeniedException;
-import static org.assertj.core.api.Assertions.*;
-
-import de.itvsh.kop.common.errorhandling.FunctionalErrorCode;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.FunctionalErrorCode;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
import io.grpc.Metadata;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M001_UpdateClientNameInClientAttributesITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M001_UpdateClientNameInClientAttributesITCase.java
index 441f00852..ebcdf7dbb 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M001_UpdateClientNameInClientAttributesITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M001_UpdateClientNameInClientAttributesITCase.java
@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M001_UpdateClientNameInClientAttributesITCase {
@@ -60,7 +60,7 @@ class M001_UpdateClientNameInClientAttributesITCase {
var vorgaenge = dbTestUtils.findVorgang(new Query());
assertThat(vorgaenge).hasSize(1);
- var clientAttribute = getClientAttribute((Document) vorgaenge.get(0), RenameTestFactory.DUMMY_ATTRIBUTE_NAME);
+ var clientAttribute = getClientAttribute(vorgaenge.get(0), RenameTestFactory.DUMMY_ATTRIBUTE_NAME);
assertThat(clientAttribute).containsExactly(
Map.entry(RenameTestFactory.CLIENT_ATTRIBUTE_ACCESS_KEY, RenameTestFactory.CLIENT_ATTRIBUTE_ACCESS_VALUE),
Map.entry(RenameTestFactory.CLIENT_ATTRIBUTE_VALUE_KEY, RenameTestFactory.CLIENT_ATTRIBUTE_VALUE_VALUE),
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M002_UpdateClientNameInGridFsITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M002_UpdateClientNameInGridFsITCase.java
index 8825a4aff..846c81fd6 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M002_UpdateClientNameInGridFsITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M002_UpdateClientNameInGridFsITCase.java
@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M002_UpdateClientNameInGridFsITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M003_UpdateClientNameInVorgangAttachedItemITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M003_UpdateClientNameInVorgangAttachedItemITCase.java
index 7b8ab7f20..e1572408f 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M003_UpdateClientNameInVorgangAttachedItemITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M003_UpdateClientNameInVorgangAttachedItemITCase.java
@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M003_UpdateClientNameInVorgangAttachedItemITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M004_UpdateNachrichtenManagerClientNameInVorgangAttachedItemITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M004_UpdateNachrichtenManagerClientNameInVorgangAttachedItemITCase.java
index ffa5f12e4..1c30c4708 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M004_UpdateNachrichtenManagerClientNameInVorgangAttachedItemITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M004_UpdateNachrichtenManagerClientNameInVorgangAttachedItemITCase.java
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M004_UpdateNachrichtenManagerClientNameInVorgangAttachedItemITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M005_UpdateNachrichtenManagerClientNameInClientAttributesITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M005_UpdateNachrichtenManagerClientNameInClientAttributesITCase.java
index 206d243ae..6c8a6333d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M005_UpdateNachrichtenManagerClientNameInClientAttributesITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M005_UpdateNachrichtenManagerClientNameInClientAttributesITCase.java
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M005_UpdateNachrichtenManagerClientNameInClientAttributesITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M006_UpdateMailServiceClientNameInVorgangAttachedItemITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M006_UpdateMailServiceClientNameInVorgangAttachedItemITCase.java
index dad17cae8..820f3ff50 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M006_UpdateMailServiceClientNameInVorgangAttachedItemITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M006_UpdateMailServiceClientNameInVorgangAttachedItemITCase.java
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M006_UpdateMailServiceClientNameInVorgangAttachedItemITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M007_UpdateMailServiceClientNameInClientAttributesITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M007_UpdateMailServiceClientNameInClientAttributesITCase.java
index f7444e3cf..33b9a258d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M007_UpdateMailServiceClientNameInClientAttributesITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M007_UpdateMailServiceClientNameInClientAttributesITCase.java
@@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M007_UpdateMailServiceClientNameInClientAttributesITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M008_UpdateMailServiceClientNameInGridFsITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M008_UpdateMailServiceClientNameInGridFsITCase.java
index d58a273f3..31bd5097c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M008_UpdateMailServiceClientNameInGridFsITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/M008_UpdateMailServiceClientNameInGridFsITCase.java
@@ -14,7 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class M008_UpdateMailServiceClientNameInGridFsITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/RenameUtilITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/RenameUtilITCase.java
index 31fc707a7..e20deb4d2 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/RenameUtilITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/migration/RenameUtilITCase.java
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class RenameUtilITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchITCase.java
index 2cef8f44f..80e398849 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchITCase.java
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
import org.springframework.test.context.ContextConfiguration;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchIndexInitializerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchIndexInitializerITCase.java
index 29bb29c17..4dd3b0c1d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchIndexInitializerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/search/SearchIndexInitializerITCase.java
@@ -40,8 +40,8 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.DisabledIf;
-import de.itvsh.kop.common.test.DbInitializer;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.DbInitializer;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangService;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/security/PolicyRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/security/PolicyRepositoryITCase.java
index 633c0b6d1..6007062d9 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/security/PolicyRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/common/security/PolicyRepositoryITCase.java
@@ -35,8 +35,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
import de.ozgcloud.command.Command;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.attached_item.VorgangAttachedItem;
import de.ozgcloud.vorgang.attached_item.VorgangAttachedItemTestFactory;
import de.ozgcloud.vorgang.command.CommandTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileITCase.java
index 4112d1dc9..28f67d902 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileITCase.java
@@ -24,8 +24,8 @@
package de.ozgcloud.vorgang.files;
import static org.assertj.core.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -54,9 +54,8 @@ import org.springframework.test.annotation.DirtiesContext;
import com.google.protobuf.ByteString;
import com.mongodb.client.gridfs.model.GridFSFile;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.callcontext.TestCallContextAttachingInterceptor;
-import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcFindFilesResponse;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileRepositoryITCase.java
index 0ca322f28..9e72b6495 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/BinaryFileRepositoryITCase.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.callcontext.UserTestFactory;
import de.ozgcloud.vorgang.vorgang.IncomingFileTestFactory;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java
index b86e40ad5..0159d03a6 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.vorgang.EingangTestFactory;
import de.ozgcloud.vorgang.vorgang.IncomingFile;
import de.ozgcloud.vorgang.vorgang.IncomingFileGroupTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java
index 9638a215e..a4174aa69 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java
@@ -37,7 +37,7 @@ import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsRequest;
import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsResponse;
import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsRequest;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/UploadStreamObserverTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/UploadStreamObserverTest.java
index 661a92a68..4efae165a 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/UploadStreamObserverTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/UploadStreamObserverTest.java
@@ -43,7 +43,7 @@ import org.mockito.Mock;
import com.google.protobuf.ByteString;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.common.security.PolicyService;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileResponse;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/statistic/StatisticRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/statistic/StatisticRepositoryITCase.java
index 72237ba8f..c87ec046d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/statistic/StatisticRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/statistic/StatisticRepositoryITCase.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.clientattribute.ClientAttributeTestFactory;
import de.ozgcloud.vorgang.clientattribute.ClientAttributesMapTestFactory;
import de.ozgcloud.vorgang.statistic.operator.OperatorBuilder;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusEventListenerITCase.java
index edaf14756..3c42d7fc8 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusEventListenerITCase.java
@@ -10,14 +10,13 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.test.ITCase;
import de.ozgcloud.command.RevokeCommandEvent;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.command.CommandCreatedEventTestFactory;
import de.ozgcloud.vorgang.command.CommandService;
import de.ozgcloud.vorgang.command.CommandTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusRepositoryITCase.java
index 2e8a0d4a8..131a00ecf 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusRepositoryITCase.java
@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.Vorgang.Status;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java
index 168e77b9e..52433c275 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/status/StatusServiceTest.java
@@ -16,10 +16,10 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.command.CommandRevokedEvent;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.vorgang.command.CommandTestFactory;
import de.ozgcloud.vorgang.command.PersistedCommand;
import de.ozgcloud.vorgang.vorgang.Vorgang;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptorTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptorTest.java
index 930fecfa3..0eaa4b8c1 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptorTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/user/VorgangManagerCallContextAttachingInterceptorTest.java
@@ -1,6 +1,6 @@
package de.ozgcloud.vorgang.user;
-import static de.itvsh.kop.common.grpc.GrpcUtil.*;
+import static de.ozgcloud.common.grpc.GrpcUtil.*;
import static de.ozgcloud.vorgang.user.VorgangManagerCallContextAttachingInterceptor.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/AktenzeichenServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/AktenzeichenServiceITCase.java
index 2b4f34308..eb3e74c97 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/AktenzeichenServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/AktenzeichenServiceITCase.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
@ITCase
class AktenzeichenServiceITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceITCase.java
index 1df5e06fe..0d75acbea 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/GrpcVorgangServiceITCase.java
@@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.common.grpc.GrpcFormDataTestFactory;
import de.ozgcloud.vorgang.common.grpc.GrpcFormFieldTestFactory;
import de.ozgcloud.vorgang.common.grpc.GrpcSubFormTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/IncomingFileTestFactory.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/IncomingFileTestFactory.java
index 046206a29..f5290d3dd 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/IncomingFileTestFactory.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/IncomingFileTestFactory.java
@@ -29,7 +29,7 @@ import java.io.InputStream;
import java.util.Random;
import java.util.UUID;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.vorgang.files.FileId;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
index afcffc0ce..75ac5a39c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangEventListenerITCase.java
@@ -12,9 +12,9 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.kop.common.test.ITCase;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangService;
import de.ozgcloud.command.VorgangCreatedEvent;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.notification.antragsteller.AntragstellerNotificationEventListener;
import de.ozgcloud.notification.user.UserNotificationEventListener;
import de.ozgcloud.processor.processor.ProcessorService;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryITCase.java
index f6c02bbc2..4ac9207bc 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryITCase.java
@@ -47,7 +47,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.callcontext.UserTestFactory;
import de.ozgcloud.vorgang.clientattribute.ClientAttribute;
import de.ozgcloud.vorgang.clientattribute.ClientAttributeMap;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryImplITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryImplITCase.java
index a5d02cb3b..680077bb4 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryImplITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangHeaderRepositoryImplITCase.java
@@ -39,7 +39,7 @@ import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.clientattribute.ClientAttribute;
import de.ozgcloud.vorgang.clientattribute.ClientAttributeTestFactory;
import de.ozgcloud.vorgang.clientattribute.ClientAttributesMap;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangITCase.java
index ec8b1eab2..c15c4a224 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangITCase.java
@@ -41,7 +41,7 @@ import org.springframework.context.annotation.Primary;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.VorgangManagerServerApplication;
import de.ozgcloud.vorgang.clientattribute.ClientAttributesMap;
import de.ozgcloud.vorgang.servicekonto.ServiceKontoTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangRepositoryITCase.java
index 4ee5673b9..9bcdb2bf2 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangRepositoryITCase.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
@DataITCase
class VorgangRepositoryITCase {
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceITCase.java
index 678a01b9d..f878fcca7 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/VorgangServiceITCase.java
@@ -36,7 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.notification.antragsteller.AntragstellerNotificationEventListener;
import de.ozgcloud.notification.user.UserNotificationEventListener;
import de.ozgcloud.vorgang.command.CommandService;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java
index ecc11135b..11b302357 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardVorgangITCase.java
@@ -44,9 +44,9 @@ import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.gridfs.GridFsTemplate;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandStatus;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.nachrichten.email.MailSendErrorEventTestFactory;
import de.ozgcloud.nachrichten.email.MailSendRequest;
import de.ozgcloud.nachrichten.email.MailSentEventTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerITCase.java
index ef54f3b1c..4fc182bdb 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingEventListenerITCase.java
@@ -36,8 +36,8 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.mail.javamail.JavaMailSender;
-import de.itvsh.kop.common.test.ITCase;
import de.ozgcloud.command.Command;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.nachrichten.email.MailSentEventTestFactory;
import de.ozgcloud.vorgang.command.CommandCreatedEventTestFactory;
import de.ozgcloud.vorgang.command.CommandTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingITCase.java
index f33dab501..3f3eb6683 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingITCase.java
@@ -14,7 +14,7 @@ import org.springframework.core.task.TaskExecutor;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.security.test.context.support.WithMockUser;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.nachrichten.email.MailSentEventTestFactory;
import de.ozgcloud.nachrichten.email.MailService;
import de.ozgcloud.vorgang.callcontext.CallContextTestFactory;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRepositoryITCase.java
index 8a63c91a1..635c09a3d 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRepositoryITCase.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.kop.common.test.DataITCase;
+import de.ozgcloud.common.test.DataITCase;
import de.ozgcloud.vorgang.vorgang.Vorgang;
import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
import de.ozgcloud.vorgang.vorgang.redirect.Forwarding.Status;
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingServiceITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingServiceITCase.java
index e9aebb3fa..056667c2e 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingServiceITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingServiceITCase.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.vorgang.vorgang.AntragstellerTestFactory;
import de.ozgcloud.vorgang.vorgang.EingangTestFactory;
import de.ozgcloud.vorgang.vorgang.Vorgang;
diff --git a/vorgang-manager-utils/pom.xml b/vorgang-manager-utils/pom.xml
index df7377c9f..97ab2abfd 100644
--- a/vorgang-manager-utils/pom.xml
+++ b/vorgang-manager-utils/pom.xml
@@ -28,9 +28,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.3.1</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-dependencies</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -51,8 +51,8 @@
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-lib</artifactId>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-lib</artifactId>
</dependency>
<dependency>
<groupId>de.ozgcloud.vorgang</groupId>
@@ -231,9 +231,9 @@
</configuration>
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-license</artifactId>
+ <version>${ozgcloud.license.version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/vorgang-manager-utils/src/test/java/de/ozgcloud/vorgang/common/grpc/GrpcObjectMapperTest.java b/vorgang-manager-utils/src/test/java/de/ozgcloud/vorgang/common/grpc/GrpcObjectMapperTest.java
index a5a35228a..831b3bb24 100644
--- a/vorgang-manager-utils/src/test/java/de/ozgcloud/vorgang/common/grpc/GrpcObjectMapperTest.java
+++ b/vorgang-manager-utils/src/test/java/de/ozgcloud/vorgang/common/grpc/GrpcObjectMapperTest.java
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
import org.mockito.Spy;
-import de.itvsh.kop.common.binaryfile.FileId;
+import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.vorgang.common.GrpcObject;
import de.ozgcloud.vorgang.common.GrpcProperty;
import de.ozgcloud.vorgang.common.GrpcSubObject;
--
GitLab