diff --git a/bescheid-manager/pom.xml b/bescheid-manager/pom.xml
index 26c000e1094ffed947886cb79662f6da2d0870fd..682843b725efeba484cd8b5666c0283a2fa7e659 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 419b07d7d45a555cf4eb5fdf8091b11e0f5120e2..e66c3a241d7abd436d0002ab65fe4879c998dd75 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 4fce105cfcbb5e1ac49ac15bae55885574a8b184..c3e424ba83e903aee750e69067b037cd5a6e4875 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 21f21a390743263028cb3e99d9071d4bf0348105..22eb1b3ff3e0e63edd27d85f59851219641b34a5 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 613a0fb9d0ee0c78b61a82b27b46d027046c46f5..b24103919995d4dc8d445537f36ad8fdb72ccd59 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 825a14ba26d42ae22648ca11592c53e04a6b02b9..d92b4024521b151c049a71edc1f22f3bafa55de0 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 5c225a4f756834d37d24c0c3bda401247e74326a..8b65837276138c6f93a0b2b9d351a4f0c9db78f4 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 0a35a6217a81b4f0262cdbda4564c465c8d5f392..2f7a4097f8d00bb6cc69d682f226199e8a3895a7 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 8efef32ad1696d48835a1740c70cbb1d9a0ae698..1f352d1d9efab6714236d1fbd00b01b33c1ea0dc 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 7864d82a760daf0b67b4c4c6fd1503c6456a236a..b8fd29a9345542580177104549207a731e2c7139 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 e57013c3a90e028f5b7517e31cbf9c578e5c309d..45bba2af3b3d076f92ed3b114fccd601a52ea2b4 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 42d57dcf61ae06efd0de8b6e218b7f8a3e95ad75..54090eea7d84b574e6f376cdf6b4feaba72ea995 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 f23cac9489d4c17821a943889bbe6f2b24a76760..6acd44134ce5f77d25f5dfa01f5429d4e438a65e 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 263acb398478a318a18486c10698984c91a1126c..0a3b48dbe0074d56570a050af1f196edf4da2222 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 368cdff21a37f29ae4237f4a71722d3f762ff386..2cb8785e563dbbff842baa5996e971d905be1bc7 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 7ee549d1ed0e6bc975032afa1f46de2f84f19418..cb898c7a60179b045bed3b2cf99bf727bd2612ee 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 66beb3d5614d58d21c0464a7ed24b63d6989f9c2..28c3e88f5c362906b9288319b4062347daeea5f2 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 9dc6516cf33e6e1be8884f24345103b98f0c8b05..28e3f21a63c80e3192c5a4a6f92f51c4a5eb3381 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 79fa8c20435c05640b889adc3fc647e4a6c344dd..471fdfd64f8d2f39220b85a306efb2b187ac7ff5 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 3daf43861b9a50230b13983464a0d1569cdf2f6a..6bbf4083b967a58576187f18ff047699cc6b8f24 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 4a28c6289a2ae0b5cf0d16943373a89d6fd2c6be..24461739a7d75cfade8c23c8b6be2877faef53b4 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 54f1f08febbd7c5c31a5189d273ef9409895a309..307353addb43e18be2ccc745c9f139f08bee5b2a 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 52ece2e4a955906146b7149fab88728842dcc0df..d3fa03da97bf23b79dfc2d31325b28777260d8be 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 8dd528362d4d0294726d3ba71599b4819cbbe210..8f5c54e5ddc42b29e9c78810d1fa423db98adb4d 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 e178277928f419d1530a17a18c0d3c43497e4398..785167921385774bb9e5ebd5917fc73f0e2a2523 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 43e1cc5ac906af79165a4d478acb1b96bc7ca63e..ea357f1ae907b414f8ae85b2dfabc958a37dc6f6 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 a093438781d995bebcc4bf487cc83fbe749dcc73..a7e145a81a209d2ef48acfdcc54db99b6f46d287 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 8906eb9780f300dd7d7db696c36a802f088b0ee8..7d7dc82600c46c94e133ded45fa60c5c5b0f2733 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 8150ff9b3d26d6dddd2b83cdc91c55f3f69c84c6..1a75a2c8524853395c07bf52c9a9ab98985e3414 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 c011650b7c910a172916070c498fe5b063c17d00..f767196e68fb6b5e85096daf69b3e021899099e6 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 6186a3a6454b3b8b9d1835c658ad11e83aa149c3..f2ab4441f08032de38d70d231c3435283c92df33 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 a62f35ee2909a6f01592093a7d81bd6d7d35e472..5c95757fd8585ad442a672faaadde129545044d8 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 9e949f04230e642f2b72eda7da0f9c6829cffd4f..7c15e2129f61532d4bf53b33b545a9ec3eebb6ea 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 f3a8f699789690217a0fd366d919e881b89f23bf..e3c50bbd606c952b3d3eefadebfef0148e0a995c 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 a71dbe30c009415ef3bd44bdcc3f91967038dd62..7c28db1270edac0fde4eca40fa61b92a672e8f53 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 ea4e0c7de5016dda9d960c7f514c9918e3ae9ee6..8a31c3fc6a4a39cfe3c31faffde96fb02fbbec6b 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 d903865fdc39e0238e2ce0b380c271de143d68e0..54de9746da494d9d9fbd6cf26e516cf53a04df98 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 62d562b442f57950d8c5df15d99c3d418b1e2589..ff799cfa364bfed118000e4913625df4daa97234 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 c813a83a4e05556b8187903001d29678b18aee48..56e9cdb76596b9f4132f18412dd9e15ee981161c 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 78bf0754257f92e1e6a489b53c3f8c02972921de..667559f545415a0ad26e523bb3a7391793438431 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 9d774b2632adccaa6390e06e94f6f2479e34905c..7da69943951ca8f20abf4d5daf4c1c222d03a4d7 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 9cc7b8b461fc35d714c6a9dd58e6f5805ce72587..a51e03e3c90e2a91f798d3afd15c06c0a35739ca 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 923ec5ca586b00a5206139e8529303ae6af729df..db8a5e4767015f49745405be293ba86b56c271ab 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 56f471a1a2d15a367ce919d62eadd4e75a22c0fc..518fc07f0a7a81f2a930d357184230ead2c04d43 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 6818c1d6bc817cde8ee85b6eba002ed24bfaf100..e3ee4977f1e8d6f50c6971a8062d7a4e8d2d69fe 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 f4f0d656a7cd454e002c5d6880be46efa6ca9006..1c0a7a281d5eae7742c99da73edfc3e3c519cb4a 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 48fcbc3ad0bbd45e48b4d724045812cc633f66da..99eff692d011e27c5cc100bc2eef01bcb6c82b60 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 2cdf8d6410e70a9f22a864c152d4ac276dc56f00..299842d0107668702192aeef758074c29395a5ae 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 a7e1664964e6516080a6ace48772b7ac77d2d58b..a1ae7a95e2b03344bc8e2c497c443e875a4b0879 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 829eb20ce865993dfcf780555711edb2ea5ccda6..640b3b65db1c59280c8c0069684059c1c4fa177e 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 c6f95629ec8b0679456efdf4013360978fddf302..c7c1af28a64349b20b7915debc542ab5f6df46e2 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 7150a9075ebfbdfe56e636a1fc572df20026082c..d5a1c169125ab7a84e1d734ad6e85f6adf5adccf 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 145bcf8d81b938e5e43740d44dd50febe96dc3cd..14f78a59208f2a332397f0c18956e383a022153b 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 268b4411f54ee42e181c3e1f83b307a0dada67f4..930f5593cc800e9668ea9d7b877d3942dc323631 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 603dc84a5c8854910f6b84235b8cea7814e6f3d4..37b0c0d9d3e2dbaa810198dc2c308f5b549193f3 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 b69b3ef1d7140b010ba4bb16eae95661c1fe49d8..537b62b53868d84b7d0f5b05a9d1e274bd89db3e 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 f16e2bfeac1927f63d4877f76d4e9fdc035c258b..10dedaad905f9ab5c067f92b3a41871241911c33 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 00d42c67ba2468f24f12519951dcda5467e1384e..b864e5e641104fbff596794e7865783b4a403245 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 3eea9b81858111bb0f8bdd8d9bfdd1e18eb9fe26..86405b8721e4ce6bb3699e812908c0294130ae2e 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 71320c6f127b66ae4a1d07d0801852c6d1737c02..6a6b4d0e03a0633d7fdffda03c02caffe2bba2bb 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 1cf20c5d06390336265cd0961684863baaf7abb3..13ffd166fbc79fb6021c8fea1ad0fe055772d7df 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 231170de4ab9b2ae797fa3744aeb0dc9e188ed42..107bdfeaf3f71de9a98a597bebfa29d3efd43d88 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 a2a3c8f0466a2f2ae53578654c57856ff182f531..aca6b9e0dda1fb84e340e38589be81a36871fa47 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 96b9358a08c96c510eda494556f94a27ae0f4bfe..083f27922bf3c360ceb20112a5d430a932ebce91 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 6b3a58c4e80a7fdf4113dc007e6a326a8a5f136a..9c4c93c8eda78e10efa6bf44ba37e1750382a29c 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 55c083e8db9ce99f261a081fb7205c42ba1f9ec1..bbf5af6833eb045cea844e4e1cb5bc7bc9024b27 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 c716c9dcdf9f25bdc2ca82fdd7e92f42ce18f3c0..29d723c5cc255009850bfea716239dda6bdd4683 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 89649ed476847be465fef05839a8edcbbae9588a..96d79187d6cf199897b158f6d71685dce61aae8d 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 a2ddd46044afa8b16fde74972c61fcc3b87525af..6a6c7dacd4c1b5dae5e83912b382e5155d2b603d 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 44365de881583783552c37c20a92f8b9e26d57be..6f763527d951d3e031ac7d9063b1a579e6a5dfdb 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 094880dc2b63abc37a6152b328f9d8ef51dcf5f8..87497b70a129d02695efc350f13f92885ff577e8 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 289614006b095791f859da52f6d3ee28296d47d1..3e5f8f24435015755d364aa2ecfe3feb88d53519 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 c553a214ccba7591c33d72dfd754b55d7bd5c8ad..4ba2f9714b9441f9d894588df60087c91fb68857 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 f723844c1051112c6627953a40e644fb8a2c68d3..8145e0f6cd15c9f4c51d9323b9e2f2fae33ff819 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 0404611f4b6733381c4696702d99b5375f5ec0c5..eccdc065fd841e0119aa7074808c44d9aa23655c 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 07e4fc76c0e82acc188671e234efc08cfc63ed2a..58bf4f855c2a2d04302354cdc898ca1e5afbde38 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 c8e1c3c5162dccfe4a757dc7d9f8dfd66629870e..7fcd541225c733c4b21794e5b0d371401c09b7e1 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 a17d2e4a6e8e0e46525968c57bc6dca01ecdf1a8..c617677df87467774e80f8089ddf9cdcb1e4a606 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 61fae3f1186acea8080b4ed54959a1c047eade8d..32eff160986660b2c57c69f1557d0e5bae704648 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 c21ae7b2bcd79188d5c2a82a140cd29e3c570eca..54a9d931b23977e7394190b2d9ab0692642fa98c 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 59401f091a048293a0957a429adeec19ec3231e2..206065078ec22df89bad8fbbc6860e33b9d89490 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 a3d089524955dea2637b2c908a120c0502655536..380948c313155b75fa8a156a1ab10b8733d85ac0 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 2534095b031209d64d8ddc1665cca2957ab2a248..416753a32ef384eeaa6edb97b055338d07f00fbf 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 14780ec8eb1b09542b0bfb17785cd76823c80d88..6f386a9017ddec6bc2e7dd1c452a997caf4e6379 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 312b041b08e76b5baa0441025838b5e6d2e57c01..5988d1bde47af660ad42c7ee6d613ad9aff7c3f5 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 441f008522644da9ab1b000ac7c79f998077bf1a..ebcdf7dbb641529bd9b2fc0c82606cceff3498f2 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 8825a4aff96f941efc1da90b38dc09c3da071746..846c81fd6dcd40a9e1839df047db6ad54fcedfd3 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 7b8ab7f2058e5bda6a778a9ae5a3b3bc0d1ab9e3..e1572408ff81cd46f1ba4216347c79d0902042aa 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 ffa5f12e45e5fcb284c866bc879ed29bfda662e9..1c30c4708436511b6c031bcc9d6e3acc0c418a64 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 206d243ae46da8f734f3f0ba392c83b725f23e1f..6c8a6333d55aeffb09f8b7b4f576785870298d15 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 dad17cae81630a6ad83157bce74e31f530a0b3f4..820f3ff50747b8a956725ae8360cb6d0b6f0244a 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 f7444e3cff42e4b548408deb1b29103e48e428e3..33b9a258d7213342ebeed3e460af82a04d2b7850 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 d58a273f3999a403abb138772fd7d539a714e90a..31bd5097c551843cb2d47b240b32234e43eaeb9a 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 31fc707a78506b3ebb9232fdb9c7ade14e807ef9..e20deb4d222bd7bb07f5e853ec2aa5b294ce3f8a 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 2cef8f44fc0fecbb175e25f7d5ec658f09112c97..80e398849d43b98f7acdc2e93d77c0555c9a3b09 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 29bb29c1745b513fefefab050cb1293c180ec4aa..4dd3b0c1ddfdec2c9fad5b46a7f0c2d4c9dcc28c 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 633c0b6d197285840da1f8ac4b1620b3538c1e8e..6007062d9b67f46696c926f8948e97bb90d60dee 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 4112d1dc9a5652f4373128e8b06f0a3f432a3788..28f67d90266e4d5e663eafefc9dbbaad5a79c7d9 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 0ca322f285af2aa516e051ac8b68290f9d34131c..9e72b6495e72329e59881b3d84c568e01123689c 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 b86e40ad5bda123e0cc1748e8fdd2fa71b2c211e..0159d03a6f45f5a725e8ef49a6047bd6747c45c3 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 9638a215eca5a23fc21e8d9fd80003e2f44de7ec..a4174aa6923d32d4a7ef2b78f67e56c9a0f8f2b6 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 661a92a683cf98f2fed3b852c2e149e4a9980be3..4efae165aeb5c0960cb935b82492624acdf74e81 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 72237ba8f70818212ada9d3e8b3ca6989e1ac7f0..c87ec046d5e0485c224ab8c304d0dad05ca46104 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 edaf147569e2e81afb5bd6d3725c52980be807bb..3c42d7fc8618ac79b402e238139ebb24befb0d9a 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 2e8a0d4a82116552f07418fdc198cd40c9fe4101..131a00ecf5d886fb2ec7a4399d27d8708ec99836 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 168e77b9ed31a91e44367524eb52704aa9eea341..52433c2752979236c6a33a61cce44dd50ceb6ea1 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 930fecfa3d77adaf0d9aa35a549e885b2b2a3518..0eaa4b8c19178b93ab64f33186d22a1912e021da 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 2b4f34308ce655863b4562d2e838757e2fe4247f..eb3e74c976697909d658e0833e8f3b4369ac1ef4 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 1df5e06fede055fbeb0c06c077b05f23fb2ee903..0d75acbea4c07b1ccbf15503b7588657b67e71db 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 046206a29643171d6d331851f4f947fe1b888c99..f5290d3dd68e8390f59997a03beee26c71297749 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 afcffc0ceb5973c91275b2a1d390873dcfd20002..75ac5a39ce1df818bc21ba88214512a6ca341beb 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 f6c02bbc20e3fb52162f8c1afee1822498d00b1c..4ac9207bc054a16e6b9876dcde87e78d2d08afce 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 a5d02cb3be4671c600dda3662595ccf7ef953b74..680077bb424e60d31be3123b059d6ccaa2f467df 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 ec8b1eab2ebad4e6a4835b9368f41144e495045b..c15c4a2244378fdedae6b7608784aed4876aeb9a 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 4ee5673b9ebc458ee7b7d8ebcd6fb6c5b7ad30e9..9bcdb2bf2e6fab2b2f26e35863b037e9090fb8a0 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 678a01b9db9f58ba8f7c84e6af6670cba2de7cbb..f878fcca7827bde6314b8b8b57fe8cfc65827872 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 ecc11135bc7c1f6d6415aa81ba58d8c06ae7e157..11b302357b277b02742b8d80c48cdf4621f40340 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 ef54f3b1ca30067a1e6296f585e986b913474ef5..4fc182bdb6a5387ee2b3b626c98c921700942ef1 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 f33dab50129ac0b32f1039d0dee9c4039ab86c8c..3f3eb66838ec42f6eca38f5ee4dc94f4e9ec94f6 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 8a63c91a15300227ab4f87f7e697ac2fa7c4d023..635c09a3defa81591b9ad4405feba1daa41cab3d 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 e9aebb3fa0ba2262f2a71bbfa84a4061b9ab77e4..056667c2e6e2cb0eae5709a3ab2d1dd89deb21f7 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 df7377c9ff819c8c6a6d27f49b9ffef3728c51d5..97ab2abfd7e48a258e774c1fef80e66481ce92ff 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 a5a35228a879037bc2d265f02eccda27ce2042ea..831b3bb245ad83453275f78d0ef4de2aa7964e81 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;