diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/PostfachAddressIdentifier.java b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/PostfachAddressIdentifier.java
deleted file mode 100644
index 5614ce7c65c181df9936010a9e89be9885276466..0000000000000000000000000000000000000000
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/PostfachAddressIdentifier.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package de.itvsh.kop.eingangsadapter.common.formdata;
-
-public interface PostfachAddressIdentifier {
-
-}
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/Application.java b/common/src/main/java/de/ozgcloud/eingang/Application.java
similarity index 97%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/Application.java
rename to common/src/main/java/de/ozgcloud/eingang/Application.java
index 1d2cf2ad415119685a59f7d5f7759bac810e1e59..9ba0845dd5e75092e6a599bfce3a771e0eb7b2ce 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/Application.java
+++ b/common/src/main/java/de/ozgcloud/eingang/Application.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter;
+package de.ozgcloud.eingang;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/errorhandling/FunctionalException.java b/common/src/main/java/de/ozgcloud/eingang/common/errorhandling/FunctionalException.java
similarity index 95%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/errorhandling/FunctionalException.java
rename to common/src/main/java/de/ozgcloud/eingang/common/errorhandling/FunctionalException.java
index 5f56753420ebc01a6442095c424d5891eba5abca..23d3d1ed4831e53f92f9ca6fb021906d3dac4c3e 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/errorhandling/FunctionalException.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/errorhandling/FunctionalException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.errorhandling;
+package de.ozgcloud.eingang.common.errorhandling;
public class FunctionalException extends RuntimeException {
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/errorhandling/TechnicalException.java b/common/src/main/java/de/ozgcloud/eingang/common/errorhandling/TechnicalException.java
similarity index 95%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/errorhandling/TechnicalException.java
rename to common/src/main/java/de/ozgcloud/eingang/common/errorhandling/TechnicalException.java
index 5e883305b2f5d6c0046b27b24e11e959b5c5d810..e27ecc57c3857b64ec89bf0d871302df40f3b933 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/errorhandling/TechnicalException.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/errorhandling/TechnicalException.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.errorhandling;
+package de.ozgcloud.eingang.common.errorhandling;
public class TechnicalException extends RuntimeException {
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/Antragsteller.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/Antragsteller.java
similarity index 96%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/Antragsteller.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/Antragsteller.java
index ffd400aa20941ff1dd59866b9bc1c3f43422cf24..d5f6c9ef528895e290290279889cb2fbb464c3e0 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/Antragsteller.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/Antragsteller.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.Map;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/DeleteOnCloseInputStream.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStream.java
similarity index 96%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/DeleteOnCloseInputStream.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStream.java
index 8aee1e7ff5e246f47c1673652a520ddaccd5ddb6..d7109f66a1eb810812c82c2e795559c0a6f99e7a 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/DeleteOnCloseInputStream.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStream.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.io.File;
import java.io.FileInputStream;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormData.java
similarity index 97%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/FormData.java
index 0eb3c4d763d886a5e7d7596ce5e5ae537d14c0e0..44a034a849e5b5a34f20f4a369122aac82cf6d80 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormData.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.Collections;
import java.util.List;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataUtils.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormDataUtils.java
similarity index 97%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataUtils.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/FormDataUtils.java
index 1cf0a8adfe6f7f57c247ce61664f10849b48359e..28192f79056b5b12d454cbe900ca53565f9e465a 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataUtils.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormDataUtils.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeader.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormHeader.java
similarity index 96%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeader.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/FormHeader.java
index f637172c3141726b8e4d827832485d81835b19f7..59c9ff40de61d79844db7c2abb904439e52cacc1 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeader.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/FormHeader.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.time.ZonedDateTime;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFile.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFile.java
similarity index 97%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFile.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFile.java
index 97c3308d87326b22f659367135c758fe787122a3..7d195f08fce4e94f2856ea3fca6385b03677b29e 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFile.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFile.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.io.File;
import java.io.FileInputStream;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroup.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroup.java
similarity index 95%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroup.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroup.java
index c393845a6afc948326ca3129ffe2900b9b6f05f0..16f8726e0a5db9736aef8a2ebd8917f30097419f 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroup.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroup.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.List;
diff --git a/common/src/main/java/de/ozgcloud/eingang/common/formdata/PostfachAddressIdentifier.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/PostfachAddressIdentifier.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b30bbf835a6ec0bc69a47321483b21fc2502368
--- /dev/null
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/PostfachAddressIdentifier.java
@@ -0,0 +1,5 @@
+package de.ozgcloud.eingang.common.formdata;
+
+public interface PostfachAddressIdentifier {
+
+}
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ServiceKonto.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java
similarity index 87%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ServiceKonto.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java
index 408ba0350f20eaec657a563d5e6a0a9d285cf59e..79357045680ca8699dfed084c791f48032e6b577 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ServiceKonto.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.List;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/StringBasedIdentifier.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/StringBasedIdentifier.java
similarity index 81%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/StringBasedIdentifier.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/StringBasedIdentifier.java
index 85a8b8cce44879ab561f228e32f61180a6e3f12a..f4d3eb31bd5b42d1737bdeda08b32bdb4fb8f1b6 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/StringBasedIdentifier.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/StringBasedIdentifier.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import lombok.Builder;
import lombok.Getter;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelle.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ZustaendigeStelle.java
similarity index 95%
rename from common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelle.java
rename to common/src/main/java/de/ozgcloud/eingang/common/formdata/ZustaendigeStelle.java
index 4331a939cf9d23f43d10f2daeef0e1a7a500c9f9..4de3040e543b837699024b45c710d1b7abb8d7e0 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelle.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ZustaendigeStelle.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import lombok.Builder;
import lombok.Getter;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/EingangAdapterApplicationTest.java b/common/src/test/java/de/ozgcloud/eingang/EingangAdapterApplicationTest.java
similarity index 96%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/EingangAdapterApplicationTest.java
rename to common/src/test/java/de/ozgcloud/eingang/EingangAdapterApplicationTest.java
index 17e8aab73c9baab569bc73504b79977d56d3e1d6..95b9b771bbecb0080688ee6b24e030af553d940a 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/EingangAdapterApplicationTest.java
+++ b/common/src/test/java/de/ozgcloud/eingang/EingangAdapterApplicationTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter;
+package de.ozgcloud.eingang;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/AntragstellerTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/AntragstellerTestFactory.java
similarity index 97%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/AntragstellerTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/AntragstellerTestFactory.java
index 25176afe87c00ce6ca2cc01bf68cf010a2c95c2d..ed3ed7816b082b0139413eceee38a8196b63e968 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/AntragstellerTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/AntragstellerTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.Map;
import java.util.UUID;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/DeleteOnCloseInputStreamTest.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStreamTest.java
similarity index 90%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/DeleteOnCloseInputStreamTest.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStreamTest.java
index 320f77b1cd78cca4f5a78ffbf6ebf9ece6895917..62d595e591d0d0622488016f14d7304ecd5c7df9 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/DeleteOnCloseInputStreamTest.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStreamTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import static org.assertj.core.api.Assertions.*;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
similarity index 98%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
index 382505cbb60eb0b26bdc35fe808018678aec5721..05bdcffff581a6e8ce7e4f56fe5d86cb53054bb0 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormDataTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.Arrays;
import java.util.Collections;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeaderTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormHeaderTestFactory.java
similarity index 97%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeaderTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/FormHeaderTestFactory.java
index 8ed80008b849b0f32105cbc2b1096bf60e2a1122..676210d6754ed4aab7dbc4891d7190277313b1ab 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeaderTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormHeaderTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.time.ZonedDateTime;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormSolutionsTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormSolutionsTestFactory.java
similarity index 98%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormSolutionsTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/FormSolutionsTestFactory.java
index 072b5f876d898043f672f6d55423dea9825b965d..2f21dc56e491bd3f5f4e472114b71b617736477f 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormSolutionsTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormSolutionsTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.List;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroupTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroupTestFactory.java
similarity index 97%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroupTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroupTestFactory.java
index 51860a3bbd50d1180ec5ca2030d9f92b301a0124..bdc37befd95752882bb96a2d809725d2259527ba 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroupTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileGroupTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.List;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTest.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTest.java
similarity index 98%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTest.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTest.java
index aa73c1abac24a857f878cce2977f624bd2b9720e..336af887e45b857dc54b35113d89a8b82e7894a3 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTest.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
similarity index 94%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
index 4cc9e18993faf7e6cea281cfa5a1d28f6c0d5596..4ae396d8d6ec10a3d4c205578c3cf54d5dbd198e 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.io.ByteArrayInputStream;
import java.util.UUID;
@@ -29,7 +29,7 @@ import java.util.UUID;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockMultipartFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile.IncomingFileBuilder;
+import de.ozgcloud.eingang.common.formdata.IncomingFile.IncomingFileBuilder;
import lombok.SneakyThrows;
public class IncomingFileTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/PostfachAddressTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/PostfachAddressTestFactory.java
similarity index 83%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/PostfachAddressTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/PostfachAddressTestFactory.java
index 0d8a7c8d7b86a12d00f57320b233d4ef8f53c512..2d25ee58700394251782ea7ab84537cd8750efbe 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/PostfachAddressTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/PostfachAddressTestFactory.java
@@ -1,8 +1,8 @@
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto.PostfachAddress;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
public class PostfachAddressTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ServiceKontoTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/ServiceKontoTestFactory.java
similarity index 86%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ServiceKontoTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/ServiceKontoTestFactory.java
index 43e2ec90264f00dc2f270ef47b6cf5bd130b69de..eaa45e45b2b3265b3a0227fd126cacfdd5384a84 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ServiceKontoTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/ServiceKontoTestFactory.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
public class ServiceKontoTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelleTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/ZustaendigeStelleTestFactory.java
similarity index 96%
rename from common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelleTestFactory.java
rename to common/src/test/java/de/ozgcloud/eingang/common/formdata/ZustaendigeStelleTestFactory.java
index c01e062db23ccad9a1b4391058d783acb6409170..2ffa27d9f2daba7531f0f06438e7f5624d56f467 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelleTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/ZustaendigeStelleTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.itvsh.kop.eingangsadapter.common.formdata;
+package de.ozgcloud.eingang.common.formdata;
public class ZustaendigeStelleTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataMapper.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataMapper.java
index db8021e1c220df0311320e525a83bc8f6f905f25..4da7a597ae45a430bf018284b8df99152c9f16cd 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataMapper.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataMapper.java
@@ -26,9 +26,9 @@ package de.itvsh.kop.eingang.formcycle;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Mapper(uses = GrpcFormDataMapper.class)
public interface FormCycleFormDataMapper {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java
index 1f12b52ffe4efc2b1f4731ff88181b2968759f32..7199daf2c18a16020b698885a26168c3a928d52d 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/itvsh/kop/eingang/formcycle/FormDataController.java
@@ -39,13 +39,6 @@ import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
-import de.itvsh.kop.eingangsadapter.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto.PostfachAddress;
-import de.itvsh.kop.eingangsadapter.common.formdata.StringBasedIdentifier;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleConfirmationResponse;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
@@ -53,6 +46,13 @@ import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto;
import de.itvsh.kop.eingangsadapter.semantik.SemantikAdapter;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
index a89ab6b8e74f5084cdcaa15a245fc2ffa0e684df..03371148582193a4117fe3de659270c2bc0a8397 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
@@ -23,9 +23,9 @@
*/
package de.itvsh.kop.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
public class FormCycleAttachmentGroupTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataTestFactory.java
index 3d2aac4909fe767cd37d234aaf6cce4b0229ac91..bcfc7be0b0ffda44fa30fe9b7b0a3e50db4b0520 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCycleFormDataTestFactory.java
@@ -23,11 +23,11 @@
*/
package de.itvsh.kop.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData.Builder;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
class FormCycleFormDataTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCyclePostfachAddressTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
index 399ca28bf475c44eb4875f6b5b92fd03e0fae6de..2b5ff42290a940db1a810e12135b2e6bbb346d14 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
@@ -2,9 +2,9 @@ package de.itvsh.kop.eingang.formcycle;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.common.formdata.PostfachAddressTestFactory;
import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress.Builder;
+import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
public class FormCyclePostfachAddressTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerITCase.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerITCase.java
index 5ca0ab8b1cd96f8cfe5c06331d77c015e8aa875b..1667145bd415272e4cf130723c721d743e0b8740 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerITCase.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerITCase.java
@@ -23,7 +23,7 @@
*/
package de.itvsh.kop.eingang.formcycle;
-import static de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -37,9 +37,9 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import de.itvsh.kop.common.test.ITCase;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.kop.eingangsadapter.semantik.SemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import lombok.SneakyThrows;
@ITCase
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java
index d5bb079c7c955bc8601e83cd5bb074fe901e511b..4046e9e38db32568a84835e634d6e7b6815f3264 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/itvsh/kop/eingang/formcycle/FormDataControllerTest.java
@@ -23,7 +23,7 @@
*/
package de.itvsh.kop.eingang.formcycle;
-import static de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -47,16 +47,16 @@ import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import de.itvsh.kop.eingang.formcycle.common.protobuf.ProtobufMessageConverter;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto.PostfachAddress;
-import de.itvsh.kop.eingangsadapter.common.formdata.StringBasedIdentifier;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleConfirmationResponse;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.itvsh.kop.eingangsadapter.semantik.SemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormHeader;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
import lombok.SneakyThrows;
class FormDataControllerTest {
diff --git a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapper.java b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapper.java
index 4781b63438dd76f538f64ae9eb58cde6d1357ffa..ce7873362f61fd9003c79c36703c8e90db9ef309 100644
--- a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapper.java
+++ b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapper.java
@@ -33,7 +33,7 @@ import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
@Component
class FormSolutionsAttachmentsMapper {
diff --git a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtils.java b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtils.java
index 7f7edd6d5c074cbd682a7088b2c6ca0bfe8af670..2d0de49a1e9fac8a43d3d00658eb3e89ade70db3 100644
--- a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtils.java
+++ b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtils.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
import java.util.Base64;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapper.java b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapper.java
index b6ad13f7cd390340bdb6d6d05fdebd105fb191da..18f74e4df0e01feef6728830954fe6deeaf09979 100644
--- a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapper.java
+++ b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapper.java
@@ -35,7 +35,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
@Component
class FormSolutionsRepresentationsMapper {
diff --git a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
index 039c6da7d4dd0604acb52de36fbf57f980cf5986..5343293fff0f886ee3c82930d7f27a84d9188160 100644
--- a/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
+++ b/formsolutions-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapper.java
@@ -34,9 +34,9 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
@Component
class FormSolutionsRequestMapper {
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapperTest.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapperTest.java
index 35bf7169cdb3057e00c13f0ae8ae35b9d30cb16e..2b466394f96ff0ebe073ed8dd124cfee47a7611b 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapperTest.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsAttachmentsMapperTest.java
@@ -33,8 +33,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import lombok.SneakyThrows;
class FormSolutionsAttachmentsMapperTest {
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtilsTest.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtilsTest.java
index 79db1ffd693cb73b920fb503813c5a31cf709775..17f56acbb41d3fc0c03d5f23da6c9d20a8570911 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtilsTest.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFileMapperUtilsTest.java
@@ -34,7 +34,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.SneakyThrows;
class FormSolutionsFileMapperUtilsTest {
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFilesTestFactory.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFilesTestFactory.java
index 48a89328939273f56fce9efc4a18ac3da42724a5..c004e922e7e4474e745c71474fa3c80f89545185 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFilesTestFactory.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsFilesTestFactory.java
@@ -29,7 +29,7 @@ import static de.itvsh.kop.eingangsadapter.formsolutions.FormSolutionsRepresenta
import java.util.Base64;
import java.util.Map;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
public class FormSolutionsFilesTestFactory {
public static final String ZIP_ENCODED = "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";
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapperTest.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapperTest.java
index 69d3587df67f2090d3b55edc09469fcbf6447c22..a47867236a19b0ecdbe12ee1a56867d6f2e3cb5b 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapperTest.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRepresentationsMapperTest.java
@@ -23,9 +23,9 @@
*/
package de.itvsh.kop.eingangsadapter.formsolutions;
-import static de.itvsh.kop.eingangsadapter.common.formdata.FormSolutionsTestFactory.*;
import static de.itvsh.kop.eingangsadapter.formsolutions.FormSolutionsFilesTestFactory.*;
import static de.itvsh.kop.eingangsadapter.formsolutions.FormSolutionsRepresentationsMapper.*;
+import static de.ozgcloud.eingang.common.formdata.FormSolutionsTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import java.util.List;
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormSolutionsTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.FormSolutionsTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.SneakyThrows;
class FormSolutionsRepresentationsMapperTest {
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperITCase.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperITCase.java
index f0a012b1d513e3f72f917dcd923d85ccf85ffd34..d69321b3ff358e8248b798ac3f31bd2d84e7bdb0 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperITCase.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperITCase.java
@@ -23,7 +23,7 @@
*/
package de.itvsh.kop.eingangsadapter.formsolutions;
-import static de.itvsh.kop.eingangsadapter.common.formdata.FormSolutionsTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.FormSolutionsTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import java.util.List;
@@ -36,11 +36,11 @@ import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.ActiveProfiles;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import lombok.SneakyThrows;
@SpringBootTest
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperTest.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperTest.java
index 9f9cdaac34a856eb1213fe8d2adf88f45c92ba29..bfb676b87eec05a43e8fa4cec5635d2d201873f0 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperTest.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsRequestMapperTest.java
@@ -23,8 +23,8 @@
*/
package de.itvsh.kop.eingangsadapter.formsolutions;
-import static de.itvsh.kop.eingangsadapter.common.formdata.FormSolutionsTestFactory.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
+import static de.ozgcloud.eingang.common.formdata.FormSolutionsTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -47,8 +47,8 @@ import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class FormSolutionsRequestMapperTest {
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormsolutionsAdapterApplicationTest.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormsolutionsAdapterApplicationTest.java
index f6bfea00f362bededd85f54fd694f98353b28b4a..0b6589f11e50343349e8a33f6645802fd60fd3b7 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormsolutionsAdapterApplicationTest.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/FormsolutionsAdapterApplicationTest.java
@@ -26,7 +26,7 @@ package de.itvsh.kop.eingangsadapter.formsolutions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import de.itvsh.kop.eingangsadapter.Application;
+import de.ozgcloud.eingang.Application;
@SpringBootTest(classes = Application.class)
class FormsolutionsAdapterApplicationTest {
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointITCase.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointITCase.java
index 39debcabaa8ad65c9cd1aa399def413812187401..6f72b4092895197319a1c4cbdf8ef8daae33a57f 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointITCase.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointITCase.java
@@ -22,10 +22,10 @@ import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
import org.springframework.test.context.ActiveProfiles;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.ozg.pluto.common.GrpcObject;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcPostfachAddress;
+import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.router.VorgangRemoteService;
import lombok.SneakyThrows;
diff --git a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointTest.java b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointTest.java
index 44bb1e51496903582f8928cd5e37318fb5af3f51..db5d989e653ede5e12f3d7d7a95091571be91a57 100644
--- a/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointTest.java
+++ b/formsolutions-adapter/src/test/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpointTest.java
@@ -35,10 +35,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormSolutionsTestFactory;
import de.itvsh.kop.eingangsadapter.semantik.SemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormSolutionsTestFactory;
@DisplayName("Send form endpoint")
class SendFormEndpointTest {
diff --git a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java
index a5145f1a190e02d59c7e595728c8a42a48dd67a9..feca46f38c08d5caa37d9d5aa72b4cf3844adc3a 100644
--- a/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java
+++ b/forwarder/src/main/java/de/ozgcloud/eingang/forwarder/RouteForwardingService.java
@@ -25,7 +25,7 @@ package de.ozgcloud.eingang.forwarder;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Service
class RouteForwardingService {
diff --git a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/ForwarderApplicationTest.java b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/ForwarderApplicationTest.java
index 440c696757c2c6f209775fddd927b72062165b8a..b72c4b8f618196ab4887d86c5867a78e6b794e70 100644
--- a/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/ForwarderApplicationTest.java
+++ b/forwarder/src/test/java/de/ozgcloud/eingang/forwarder/ForwarderApplicationTest.java
@@ -26,7 +26,7 @@ package de.ozgcloud.eingang.forwarder;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import de.itvsh.kop.eingangsadapter.Application;
+import de.ozgcloud.eingang.Application;
@SpringBootTest(classes = Application.class)
class ForwarderApplicationTest {
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdder.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdder.java
index f1b553f09d738b60b5ac6937018850798f952613..2d121ec6c1b8f1816b64c8685adf0b80a6c1b67e 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdder.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdder.java
@@ -30,8 +30,8 @@ import java.util.List;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
@Component
public class AttachmentsContentAdder {
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java
index 27e63c8e11763703fcbb0ba15431558b6f82ae86..771c8a8da2e5151b2150788415537e012e6e4757 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java
@@ -29,7 +29,7 @@ import java.util.UUID;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
@Component
class DepositRequestIncomingFileMapper {
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapper.java
index 742f5fc8c9a182a4e07e75ea2b6c2948e9754f1e..6cd2ec7ceadb5a02f19ce3560858d3cb224d26eb 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapper.java
@@ -32,8 +32,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
@Component
class FormDataIncomingFileMapper {
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculator.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculator.java
index d492f74895ebe4adcdf383cb424a373a55ab180f..9018f33263566ab69c239614ca9d6f07aec81afc 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculator.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculator.java
@@ -28,8 +28,8 @@ import java.util.stream.Collectors;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
@Component
public class RepresentationsCalculator {
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapper.java
index 2c4debc0b89da1f4f24df64c650b710ce92c6d27..0bcd1ccaf97219b9d67bde30c268ebc72c6b34d9 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapper.java
@@ -35,10 +35,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.w3c.dom.Document;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import lombok.RequiredArgsConstructor;
//TODO Naming prüfen - er scheint mir nicht semantik zu mappen und befindet sich auch nicht im entsprechenden Modul
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapper.java
index c48eb17e9813a0faa80b8961add4dd0fabf1749c..c972c32f36571953a3c3ea0ffe6a7845a44c6cb3 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapper.java
@@ -43,7 +43,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import de.itvsh.kop.eingangsadapter.common.errorhandling.TechnicalException;
+import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdderTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdderTest.java
index 34bd89a3f68d59aedf1bbc6c597a10a389488cd0..bd6d3284579f86d5c1ea90ce7495458be8553550 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdderTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/AttachmentsContentAdderTest.java
@@ -31,10 +31,10 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import lombok.SneakyThrows;
class AttachmentsContentAdderTest {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapperTest.java
index 43a6ce8de51d517fcc0c3d69354ca5bb8ec4e626..2ae6057c37562eedfee982df019ca6be54bcc7d0 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapperTest.java
@@ -30,7 +30,7 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
class DepositRequestIncomingFileMapperTest {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositTestFactory.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositTestFactory.java
index 11c5e3e3aa31d05c2652aeb963384b3613e8b7b2..49c38a83bab24294079f8e37f2b548a3cb9f1ca9 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositTestFactory.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositTestFactory.java
@@ -25,7 +25,7 @@ package de.ozgcloud.eingang.intelliform;
import java.util.List;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
public class DepositTestFactory {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
index a1c0d33653e3eea978abe2b1aa588e6277414629..4683b4daf734c6e1b72382a4569edf93823923b7 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
@@ -46,12 +46,12 @@ import org.springframework.ws.test.server.RequestCreators;
import org.springframework.ws.test.server.ResponseActions;
import org.springframework.ws.test.server.ResponseMatchers;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.PostfachAddressTestFactory;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFile;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
import de.ozgcloud.eingang.router.VorgangRemoteService;
import lombok.SneakyThrows;
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
index f073fce93fb2460e9dc0033b288b307ed3270ec7..0bddf5341678a0cf279827f6ea92abd7301aabfe 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
@@ -39,8 +39,8 @@ import org.mockito.Mock;
import org.xml.sax.SAXException;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
import de.itvsh.kop.eingangsadapter.semantik.SemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class FormDataEndpointTest {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java
index afa6a60c7a0d099919ce3eaa9424fdd3bcb4cb4b..fb4a1c99336319deb4206a5cf41327d0c7954870 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java
@@ -40,8 +40,8 @@ import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
class FormDataIncomingFileMapperTest {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculatorTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculatorTest.java
index 86e26594da08fae257cc61e1ab800bea6a0cc7a9..36ac0cb7e2cff2cd68c210262b7d1360b8a68d9e 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculatorTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/RepresentationsCalculatorTest.java
@@ -31,10 +31,10 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
class RepresentationsCalculatorTest {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapperTest.java
index 1ae242a3530e2be9f5c30404c1ed9858f32e254d..b559e3a2bcf1364116d0fd8010d9cf838ebbc436 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/SemantikFormDataMapperTest.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.eingang.intelliform;
-import static de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import java.io.IOException;
@@ -37,9 +37,9 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
class SemantikFormDataMapperTest {
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java b/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
index 81a4cfca6a2a98f251ea8053de0447b95a0f9061..089c7fb8b31f0f1fc60a7ebef1c7524e0c3d70d0 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/GrpcEingangMapper.java
@@ -34,14 +34,14 @@ import org.mapstruct.ReportingPolicy;
import com.google.protobuf.ByteString;
-import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
import de.itvsh.ozg.pluto.vorgang.GrpcAntragsteller;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFileGroup;
import de.itvsh.ozg.pluto.vorgang.GrpcZustaendigeStelle;
+import de.ozgcloud.eingang.common.formdata.Antragsteller;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, //
unmappedSourcePolicy = ReportingPolicy.WARN, //
@@ -77,7 +77,7 @@ public interface GrpcEingangMapper {
@Mapping(target = "unknownFields", ignore = true)
@Mapping(target = "allFields", ignore = true)
- GrpcZustaendigeStelle toZustaendigeStelle(de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle zustaendigeStelle);
+ GrpcZustaendigeStelle toZustaendigeStelle(de.ozgcloud.eingang.common.formdata.ZustaendigeStelle zustaendigeStelle);
GrpcAntragsteller toAntragsteller(Antragsteller antragsteller);
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java b/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java
index daab838fb442557aa28bb9d18d0fbc62580a6c36..06e7cb17e390625bc329658751559ad40de1d5a2 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/ServiceKontoMapper.java
@@ -6,14 +6,14 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.PostfachAddressIdentifier;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto.PostfachAddress;
-import de.itvsh.kop.eingangsadapter.common.formdata.StringBasedIdentifier;
import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.itvsh.ozg.pluto.common.GrpcObject;
import de.itvsh.ozg.pluto.vorgang.GrpcPostfachAddress;
import de.itvsh.ozg.pluto.vorgang.GrpcServiceKonto;
+import de.ozgcloud.eingang.common.formdata.PostfachAddressIdentifier;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
@Component
class ServiceKontoMapper {
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
index 18df370b5dbd010707970548e744c1081810a8d3..0f3deaad1c2e83029b1fa3b9125e554bc5bc8f95 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
@@ -39,9 +39,6 @@ import com.google.protobuf.ByteString;
import de.itvsh.kop.common.binaryfile.GrpcFileUploadUtils;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
@@ -53,6 +50,9 @@ import de.itvsh.ozg.pluto.vorgang.GrpcFinishCreationRequest;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFile;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFileGroup;
import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import io.grpc.stub.CallStreamObserver;
import io.grpc.stub.StreamObserver;
import lombok.Getter;
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
index 8bda9fcc0658e1365e858977888585643204b815..c9250df82bca02981537461af4eed0e0ee271186 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangService.java
@@ -28,8 +28,8 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
@Service
public class VorgangService {
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
index 1ce02c3d0ab09861de3c6ef2d39feaf7937b3917..3534e2bc2a2002c8c71aaff24879b4bc153a6795 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperITCase.java
@@ -35,12 +35,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import de.itvsh.kop.eingangsadapter.common.formdata.AntragstellerTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelleTestFactory;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFile;
+import de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory;
@SpringBootTest
class GrpcEingangMapperITCase {
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
index 4dcc2de6688d2c1f2f030b6dfce6c8c33a8fb508..b151a1270c4a1a728f323ac749b5ec275ad815f6 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcEingangMapperTest.java
@@ -35,16 +35,16 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.eingangsadapter.common.formdata.AntragstellerTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelleTestFactory;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
import de.itvsh.ozg.pluto.vorgang.GrpcAntragsteller;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
import de.itvsh.ozg.pluto.vorgang.GrpcServiceKonto;
import de.itvsh.ozg.pluto.vorgang.GrpcZustaendigeStelle;
+import de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory;
class GrpcEingangMapperTest {
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/GrpcIncomingFileTestFactory.java b/router/src/test/java/de/ozgcloud/eingang/router/GrpcIncomingFileTestFactory.java
index 61877757f3262dfa51238317eb61987f672c07bb..a84c19b0171d78f70064ab1ba2171915420e5550 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/GrpcIncomingFileTestFactory.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/GrpcIncomingFileTestFactory.java
@@ -25,8 +25,8 @@ package de.ozgcloud.eingang.router;
import com.google.protobuf.ByteString;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
public class GrpcIncomingFileTestFactory {
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/IncomingFileTestFactory.java b/router/src/test/java/de/ozgcloud/eingang/router/IncomingFileTestFactory.java
index 34f97576f63fa761ffb05a3461c28270fea1a10f..013444ba93b565b29b03400f127650ba361453cd 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/IncomingFileTestFactory.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/IncomingFileTestFactory.java
@@ -27,7 +27,7 @@ import java.io.ByteArrayInputStream;
import java.util.UUID;
import de.itvsh.kop.common.binaryfile.FileId;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java b/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java
index bb9d38dee9ae4c307be77d889c687792c5bac0cb..ada6f4b9d17c0909e52fba6398d78b0031382de8 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/ServiceKontoMapperTest.java
@@ -11,13 +11,13 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.eingangsadapter.common.formdata.PostfachAddressTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKontoTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.StringBasedIdentifier;
import de.itvsh.kop.pluto.common.grpc.GrpcObjectMapper;
import de.itvsh.ozg.pluto.common.GrpcObject;
import de.itvsh.ozg.pluto.common.GrpcProperty;
import de.itvsh.ozg.pluto.vorgang.GrpcServiceKonto;
+import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
+import de.ozgcloud.eingang.common.formdata.ServiceKontoTestFactory;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
class ServiceKontoMapperTest {
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
index c1b0f4139e26b2cc366e72ff294b1498897401c7..8b1634ee12f084227bd6b5c68c4e38b79a0941bb 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
@@ -47,12 +47,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import de.itvsh.kop.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.ozg.pluto.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileMetaData;
import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcUploadBinaryFileRequest;
@@ -63,6 +57,12 @@ import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcFinishCreationRequest;
import de.itvsh.ozg.pluto.vorgang.GrpcFinishCreationResponse;
import de.itvsh.ozg.pluto.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import de.ozgcloud.eingang.router.VorgangRemoteService.VorgangCreator;
import io.grpc.stub.CallStreamObserver;
import lombok.SneakyThrows;
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
index b26bd2644162bd27807d633dec1d02b87bdc7401..56af91ba4af1912155b970f60c6d6d6ab3e6bef1 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangServiceTest.java
@@ -34,10 +34,10 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelleTestFactory;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory;
class VorgangServiceTest {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
index 88431f84f80fded026b5e61e08483a080ef7b388..42de91d24d4fd87a93fc9c19eac8a17165ec97e8 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapter.java
@@ -28,9 +28,9 @@ import java.util.Objects;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedSemantikAdapter;
import de.itvsh.kop.eingangsadapter.semantik.formbased.FormBasedSemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.router.VorgangService;
@Service
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReader.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReader.java
index ba36758d2e4a7efbf2f3c0bdd0a95f0bffd50170..c1e6d37b5bbe903a2b582240fd674ef39dc81345 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReader.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReader.java
@@ -42,9 +42,9 @@ import java.util.zip.ZipInputStream;
import org.springframework.util.MimeTypeUtils;
-import de.itvsh.kop.eingangsadapter.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.common.formdata.DeleteOnCloseInputStream;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
+import de.ozgcloud.eingang.common.formdata.DeleteOnCloseInputStream;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedMapper.java
index 6e4c6806b57f8b9532ab02490eb9a84ce55dc96c..0441e01d752e9b1e430c4b92f12b20752690e4bb 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedMapper.java
@@ -23,7 +23,7 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
public interface EngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedSemantikAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedSemantikAdapter.java
index 9d68792ba07436c3808072e36be01307c0337683..b412a58031d37fad2ba3ed8131e8b67e6e9082ab 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedSemantikAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/EngineBasedSemantikAdapter.java
@@ -23,7 +23,7 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
public interface EngineBasedSemantikAdapter {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelper.java
index 4b1bdb824e99f69de2cabe6ca2ae39772e306605..61e1868a50012a66903adf13d5d6f586e672eb45 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelper.java
@@ -29,10 +29,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelper.java
index 9e052241a6bc083a015b611098a402510c5d5311..870022b3b4d6ab9fa44bf553e1f2529a2df6776b 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelper.java
@@ -8,11 +8,11 @@ import java.util.Optional;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.PostfachAddressIdentifier;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto.PostfachAddress;
-import de.itvsh.kop.eingangsadapter.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.PostfachAddressIdentifier;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
@Component
public class ServiceKontoBuildHelper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapper.java
index 2b0ca76db1de5e6e18ebcdbc1b5d5970bd5e0844..ee00680d1c0d8b8ac088c8667fb1b4b9787992b6 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapper.java
@@ -33,8 +33,8 @@ import java.util.Optional;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.Antragsteller;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Component
class AfmAntragstellerMapper implements AfmEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapper.java
index 02322a172fe0027f07eaf2db4c33844c73848ecc..6dd8175efcd82798c6b94ce671f1a1ec23de4aae 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapper.java
@@ -25,8 +25,8 @@ package de.itvsh.kop.eingangsadapter.semantik.enginebased.afm;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Component
class AfmAttachedFilesMapper implements AfmEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapper.java
index 34fa96ceb7f07a44e5c32bd9b079db3385580ac9..f140d6ac856ddc04ca1ab6a0cad8608b2c496fde 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapper.java
@@ -25,7 +25,7 @@ package de.itvsh.kop.eingangsadapter.semantik.enginebased.afm;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Component
class AfmEmpfangeneStelleMapper implements AfmEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapter.java
index 1d5b85bff3216e7a2ff7d46bf4c9a7b56f7231f3..5f732c8d76514e42796b17d5629ad2c06ba7942b 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapter.java
@@ -27,9 +27,9 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedSemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
public class AfmEngineBasedAdapter implements EngineBasedSemantikAdapter {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedMapper.java
index a3c6d2d91a913163c656c54ecf627345bbc2ba65..6ea1a0fcabd25ec8c63684935a78896696736691 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedMapper.java
@@ -28,8 +28,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Optional;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedMapper;
+import de.ozgcloud.eingang.common.formdata.FormData;
interface AfmEngineBasedMapper extends EngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapper.java
index 359b8218de50e0d434ce86ef6fde4b535aa7ea4a..aa3514ee0264ddec0be58cc558e4dbc46eacc0f4 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapper.java
@@ -25,7 +25,7 @@ package de.itvsh.kop.eingangsadapter.semantik.enginebased.afm;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Component
class AfmErklaerungenMapper implements AfmEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapper.java
index fa8557b5c9951b3269ec66d6969aa88573920187..a185c4a0933782654564c1afefc2b4f98af4767e 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapper.java
@@ -31,10 +31,10 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
+import de.ozgcloud.eingang.common.formdata.FormHeader;
@Component
class AfmHeaderMapper implements AfmEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
index 43b2bb4752206e1d371db7f922afc3f62ac12426..66f80074068b45a2917cb0659d0f5836a23b0eee 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapper.java
@@ -31,8 +31,8 @@ import java.util.Optional;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
@Component
class AfmZustaendigeStelleMapper implements AfmEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapter.java
index 89909982874645c75ffda4852d71bbaef15a5926..5c3527ca146412e9c941d2b34e0d55a70804d93d 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapter.java
@@ -23,8 +23,8 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased.formcycle;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedSemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
public class FormCycleEngineBasedAdapter implements EngineBasedSemantikAdapter {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapper.java
index 6a9c12e14517887b25a1b13544c863e5ece43c03..32bf78f21a8fce87820f87e3b9b1cddf16bf3219 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapper.java
@@ -25,9 +25,9 @@ package de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
+import de.ozgcloud.eingang.common.formdata.Antragsteller;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
@Component
class FormSolutionsAntragstellerMapper implements FormSolutionsEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java
index 529f5a947ba26ba343c8af0a364bffcb973a734a..7fcea64efb2a18cf0abc96d8f1142ca07c18a917 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapter.java
@@ -27,9 +27,9 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedSemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
public class FormSolutionsEngineBasedAdapter implements EngineBasedSemantikAdapter {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapper.java
index c8e1ad324f73bbd083b2802e95a046931f698ae5..4a64a804f7f4b7d30de4c059725406fd4209d1f9 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapper.java
@@ -28,11 +28,11 @@ import java.util.List;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
import de.itvsh.kop.eingangsadapter.semantik.common.ZipAttachmentReader;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import lombok.extern.log4j.Log4j2;
@Component
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
index b9990e7663eae32144e32c036f252d5daa72a291..3966bb31c3cf3baf59d4e9504fd42e39e8696965 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
@@ -31,10 +31,10 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
+import de.ozgcloud.eingang.common.formdata.FormHeader;
@Component
class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java
index 9b3e683458f91d7bd8254105e8b6e3c9dfd72667..173743d6ed426342efb3d8b6eabc1b8c42e931a8 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapper.java
@@ -33,7 +33,7 @@ import java.util.Optional;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Component
class FormSolutionsPanelMapper implements FormSolutionsEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java
index fc778b1df3125da617bb0887599f42ff694a4de5..ad44c755dcadc6df52c6b04740b472b3347ce9fd 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapper.java
@@ -29,8 +29,8 @@ import java.util.Map;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
@Component
class FormSolutionsZustaendigeStelleMapper implements FormSolutionsEngineBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParser.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParser.java
index 59eb0465c6d227969ee3a3f1f7904a2ea22c2563..6c0fcc0c6b4952078f0293e85db2442d0d78197f 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParser.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParser.java
@@ -30,7 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaEngineBasedAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaEngineBasedAdapter.java
index b73429c6871fe4c0838d96803b427e54512ddf24..d813b11b2f396e75628350e56a9cf5f617df9fac 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaEngineBasedAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaEngineBasedAdapter.java
@@ -4,8 +4,8 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedSemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
public class XtaEngineBasedAdapter implements EngineBasedSemantikAdapter {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapper.java
index 45cb44892e05eb5b08b85185a77c4f87b534040f..984ab3dbf901d9f3d14b04b8a549719728ea982b 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapper.java
@@ -6,9 +6,9 @@ import java.util.function.Predicate;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
import de.itvsh.kop.eingangsadapter.semantik.common.ZipAttachmentReader;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.extern.log4j.Log4j2;
@Component
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapper.java
index 01481d14ad1fe65f63b4cd0081dd8a49c78791af..20592e2f589e02fdb8585333fdf147cb41516af9 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapper.java
@@ -16,11 +16,11 @@ import org.springframework.stereotype.Component;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedMapper.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedMapper.java
index b82b02951c5a5b1bc76bde00fc90a1e0a7946827..32ad74667b788c06453952a677caf4251d4f98a5 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedMapper.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedMapper.java
@@ -23,7 +23,7 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.formbased;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
interface FormBasedMapper {
diff --git a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapter.java b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapter.java
index 10d752e5fe8662ea308a9a414e6bbf086cd0f020..236d2fa9b1b7fc73b496d817ee99abb138db60cf 100644
--- a/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapter.java
+++ b/semantik-adapter/src/main/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapter.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
@Service
public class FormBasedSemantikAdapter {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapterTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapterTest.java
index f02a5fd2e565405eb67000c6da97d7f170820f64..37ab8d01681461ff79b75bb6cab1f79a70462a1d 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/SemantikAdapterTest.java
@@ -32,9 +32,9 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedSemantikAdapter;
import de.itvsh.kop.eingangsadapter.semantik.formbased.FormBasedSemantikAdapter;
+import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.router.VorgangService;
class SemantikAdapterTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReaderTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReaderTest.java
index be45d442c36bc85aec0ca7856256842052216719..f132d3354e85d44afebcd37d59a8ca10026d9161 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReaderTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/common/ZipAttachmentReaderTest.java
@@ -46,7 +46,7 @@ import org.mockito.Spy;
import org.springframework.util.MimeTypeUtils;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.SneakyThrows;
class ZipAttachmentReaderTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelperTest.java
index 62fc53baa510f1ff709ed5c8eb973c29ec5b7247..137b1f3d3a7ad54b17c089c89d0b287dd82c64da 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FilesMapperHelperTest.java
@@ -23,11 +23,12 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
+
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -35,7 +36,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;
-import static de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.*;
import static org.assertj.core.api.Assertions.*;
class FilesMapperHelperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsEngineBasedAdapterITCase.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsEngineBasedAdapterITCase.java
index c4ca4ef958174919e48d9ceea438bc8314142b4e..f4f3fa93b1ec2ac77fdfd7accf2597d311aedf36 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsEngineBasedAdapterITCase.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/FormSolutionsEngineBasedAdapterITCase.java
@@ -23,9 +23,9 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased;
-import static de.itvsh.kop.eingangsadapter.common.formdata.FormSolutionsTestFactory.*;
-import static de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
+import static de.ozgcloud.eingang.common.formdata.FormSolutionsTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper.*;
import static org.assertj.core.api.Assertions.*;
@@ -36,10 +36,12 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter;
+import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import lombok.SneakyThrows;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -53,8 +55,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.SemantikAdapter;
import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelperTest.java
index f55672e44d3001aa706f01b29ac663e6d812af29..055e6cfd1986d5c172fc7e64be3fefbb4c746155 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/ServiceKontoBuildHelperTest.java
@@ -12,13 +12,13 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.PostfachAddressTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKonto.PostfachAddress;
-import de.itvsh.kop.eingangsadapter.common.formdata.StringBasedIdentifier;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.afm.AfmHeaderTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
+import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
class ServiceKontoBuildHelperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapperTest.java
index 6c70f9dc6b1df3a22e2dd5ce916817e6bb511fdc..4544d433da958e7b055221296d102fff3f00b61b 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerMapperTest.java
@@ -34,8 +34,8 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.Antragsteller;
+import de.ozgcloud.eingang.common.formdata.FormData;
class AfmAntragstellerMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerTestFactory.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerTestFactory.java
index e3bf390a6cad35e7c2655b5c10ed9de30f5cafd4..64dcfc1cf0af9a0d690dc2eee938d81c71b141df 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerTestFactory.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAntragstellerTestFactory.java
@@ -31,7 +31,7 @@ import java.util.UUID;
import org.assertj.core.data.MapEntry;
-import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
+import de.ozgcloud.eingang.common.formdata.Antragsteller;
public class AfmAntragstellerTestFactory {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapperTest.java
index dffb5edf406d37352552b3f6ddfd33a2d894e582..5e3bab267a8918275619e2640101b058fbf6e201 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmAttachedFilesMapperTest.java
@@ -30,14 +30,14 @@ import java.util.Map;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.afm.AfmAttachedFilesMapper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
+
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import org.mockito.InjectMocks;
import org.mockito.Spy;
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapperTest.java
index 25c649884b1e7771e641150886b32bf7ebca79b4..7b2433dfffa5561ee4f5564c692112863d9f1faa 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEmpfangeneStelleMapperTest.java
@@ -33,8 +33,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class AfmEmpfangeneStelleMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
index f3cbf9b8e507c902385ed3b377b669795df3bb11..f2cb408ae061ebd5904be9d9e4a4a15d74ffcf7a 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmEngineBasedAdapterTest.java
@@ -40,8 +40,8 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.EngineBasedMapper;
+import de.ozgcloud.eingang.common.formdata.FormData;
class AfmEngineBasedAdapterTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapperTest.java
index 64c5a43b88f18a3d921b773dfbf6f980d33121fe..b7885642200be8c73075b35705c44f0999a96e71 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmErklaerungenMapperTest.java
@@ -33,8 +33,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class AfmErklaerungenMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapperTest.java
index da8dcd9510e5e1833ccb09a6ff7dd8f6c3ab8cf0..fbd554afa437bb2b6434efbf062e26331ab22457 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmHeaderMapperTest.java
@@ -34,9 +34,9 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
class AfmHeaderMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
index 091469aea71877c18450915c7cf6bad65c124cf0..214174cc0d9b2dd2a6c7dfb0715fd94516a6599c 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/afm/AfmZustaendigeStelleMapperTest.java
@@ -34,8 +34,8 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class AfmZustaendigeStelleMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapterTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapterTest.java
index 56c1ed9481f1927ebd0346a4dd0840a9132ac89b..f1b2c2124c862d62359e6ac6706a74b9ca9a128d 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formcycle/FormCycleEngineBasedAdapterTest.java
@@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class FormCycleEngineBasedAdapterTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java
index b6fc00d00628bc85b20fd71366be3a5a3f958b37..494e47efc72113769a3296898e0c56fd444764bc 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsAntragstellerMapperTest.java
@@ -23,11 +23,11 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions;
-import static de.itvsh.kop.eingangsadapter.common.formdata.AntragstellerTestFactory.*;
-import static de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsAntragstellerMapper.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsPanelMapper.*;
+import static de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -40,9 +40,9 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.Antragsteller;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class FormSolutionsAntragstellerMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java
index 9af5c6bf67cf69e06bd4d7df75c17edf7e96c022..f3ac84791b6f5b2a899ba5a14548e1f3ca79a4a6 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterTest.java
@@ -40,8 +40,8 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class FormSolutionsEngineBasedAdapterTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapperTest.java
index 77b17e9aee4015ae28e4dbe435f7c480400d5912..63f522d6aabf067cf913e6d848a8596cc16cc0ac 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsFilesMapperTest.java
@@ -41,14 +41,14 @@ import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.kop.eingangsadapter.semantik.common.ReadZipException;
import de.itvsh.kop.eingangsadapter.semantik.common.ZipAttachmentReader;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.FilesMapperHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
+import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import lombok.SneakyThrows;
class FormSolutionsFilesMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
index 457e458d58eeba1b8b219f93459b7941e593b312..f9bccb93f2684cbf4548903c31e80dabbf8a46fa 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
@@ -35,10 +35,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataUtils;
+import de.ozgcloud.eingang.common.formdata.FormHeader;
class FormSolutionsHeaderMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java
index 57ad22fc93bfc57cebae4c6919cb00f51792577d..3a89c5a17d43a0ec21dd740d78ff2b031ce29619 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsHeaderTestFactory.java
@@ -29,7 +29,7 @@ import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.Fo
import java.util.Map;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
public class FormSolutionsHeaderTestFactory {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java
index 25ac8fc1c10859408894d0ff90727c67ce1b5713..2b6a067cd11b72fa468f25fad18eeea04b2ef02b 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelMapperTest.java
@@ -29,11 +29,12 @@ import static org.assertj.core.api.Assertions.*;
import java.util.Map;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
+import de.ozgcloud.eingang.common.formdata.FormData;
+
class FormSolutionsPanelMapperTest {
private FormSolutionsPanelMapper mapper = new FormSolutionsPanelMapper();
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelTestFactory.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelTestFactory.java
index 8c492a71bf4f7bda0dd17bb511341a78774e2d29..5c087c63a52eb1a78b728b0b163129fd76c3b8d4 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelTestFactory.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsPanelTestFactory.java
@@ -29,7 +29,7 @@ import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.Fo
import java.util.List;
import java.util.Map;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
public class FormSolutionsPanelTestFactory {
public static final String PANEL_0 = "Panel_0_1";
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java
index 908082dc7dbfa4398de8c4b0cc9c2a8ed83fc199..22dcfa7e61686bf357bbab772b8842d206819128 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/FormSolutionsZustaendigeStelleMapperTest.java
@@ -23,8 +23,8 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions;
-import static de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelleTestFactory.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsZustaendigeStelleMapper.*;
+import static de.ozgcloud.eingang.common.formdata.ZustaendigeStelleTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import java.util.Map;
@@ -35,8 +35,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class FormSolutionsZustaendigeStelleMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParserTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParserTest.java
index d01c5e792317772d9b35418f8aaca08818f37b1a..b4a3c9e1920fca9a4adadb72abce57980bae5ae0 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParserTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/formsolutions/IdentifierValueParserTest.java
@@ -23,11 +23,11 @@
*/
package de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions;
-import static de.itvsh.kop.eingangsadapter.common.formdata.AntragstellerTestFactory.*;
-import static de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsAntragstellerMapper.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapter.*;
import static de.itvsh.kop.eingangsadapter.semantik.enginebased.formsolutions.FormSolutionsPanelMapper.*;
+import static de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory.*;
+import static de.ozgcloud.eingang.common.formdata.FormDataTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import java.util.List;
@@ -35,8 +35,8 @@ import java.util.Map;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class IdentifierValueParserTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapperTest.java
index 48238ace836d814af1ac7a34e5a8b4f859617faa..fbd6bd6aa4986fa1617193b8334d50558f0901bb 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/enginebased/xta/XtaZipRepresentationsMapperTest.java
@@ -13,10 +13,10 @@ import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.kop.eingangsadapter.semantik.common.ZipAttachmentReader;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import lombok.SneakyThrows;
class XtaZipRepresentationsMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapperTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
index ee2f48122124b14ea5535ffe7eafed9aa748cacd..e38ae1461cf6fa70c6cedfc95966f7c3b7a32b31 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
@@ -18,14 +18,14 @@ import org.mockito.Mock;
import org.mockito.Spy;
import de.itvsh.kop.common.test.TestUtils;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.common.formdata.PostfachAddressTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.ServiceKontoTestFactory;
-import de.itvsh.kop.eingangsadapter.common.formdata.StringBasedIdentifier;
-import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
import de.itvsh.kop.eingangsadapter.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.IncomingFile;
+import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
+import de.ozgcloud.eingang.common.formdata.ServiceKontoTestFactory;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
class DFoerdermittelFormBasedMapperTest {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormDataTestFactory.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormDataTestFactory.java
index dcfd37140e236ef88da055202975a3be4d693e9a..dfcd8b63a096355aa74761da8215e962b2c96b4c 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormDataTestFactory.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/DFoerdermittelFormDataTestFactory.java
@@ -2,7 +2,7 @@ package de.itvsh.kop.eingangsadapter.semantik.formbased;
import java.util.Map;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormData;
class DFoerdermittelFormDataTestFactory {
diff --git a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapterTest.java b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapterTest.java
index e46383d9333d7df315ad3e91743b9d4492289f9f..6c8ea959e72d348766e96b7b9a06d66061171e56 100644
--- a/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/itvsh/kop/eingangsadapter/semantik/formbased/FormBasedSemantikAdapterTest.java
@@ -37,8 +37,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
class FormBasedSemantikAdapterTest {