From d2954a4d59a2629e3b1d2ae8725358e4d0d6c962 Mon Sep 17 00:00:00 2001
From: thomasJ <thomas.jablonka@dataport.de>
Date: Mon, 15 May 2023 19:53:02 +0200
Subject: [PATCH] OZG-3799: Rename package in common -> de.ozgcloud.eingang
---
.../formdata/PostfachAddressIdentifier.java | 5 -----
.../eingang}/Application.java | 2 +-
.../errorhandling/FunctionalException.java | 2 +-
.../common/errorhandling/TechnicalException.java | 2 +-
.../eingang}/common/formdata/Antragsteller.java | 2 +-
.../formdata/DeleteOnCloseInputStream.java | 2 +-
.../eingang}/common/formdata/FormData.java | 2 +-
.../eingang}/common/formdata/FormDataUtils.java | 2 +-
.../eingang}/common/formdata/FormHeader.java | 2 +-
.../eingang}/common/formdata/IncomingFile.java | 2 +-
.../common/formdata/IncomingFileGroup.java | 2 +-
.../formdata/PostfachAddressIdentifier.java | 5 +++++
.../eingang}/common/formdata/ServiceKonto.java | 2 +-
.../common/formdata/StringBasedIdentifier.java | 2 +-
.../common/formdata/ZustaendigeStelle.java | 2 +-
.../eingang}/EingangAdapterApplicationTest.java | 2 +-
.../formdata/AntragstellerTestFactory.java | 2 +-
.../formdata/DeleteOnCloseInputStreamTest.java | 2 +-
.../common/formdata/FormDataTestFactory.java | 2 +-
.../common/formdata/FormHeaderTestFactory.java | 2 +-
.../formdata/FormSolutionsTestFactory.java | 2 +-
.../formdata/IncomingFileGroupTestFactory.java | 2 +-
.../common/formdata/IncomingFileTest.java | 2 +-
.../common/formdata/IncomingFileTestFactory.java | 4 ++--
.../formdata/PostfachAddressTestFactory.java | 4 ++--
.../common/formdata/ServiceKontoTestFactory.java | 2 +-
.../formdata/ZustaendigeStelleTestFactory.java | 2 +-
.../formcycle/FormCycleFormDataMapper.java | 2 +-
.../eingang/formcycle/FormDataController.java | 14 +++++++-------
.../FormCycleAttachmentGroupTestFactory.java | 4 ++--
.../formcycle/FormCycleFormDataTestFactory.java | 2 +-
.../FormCyclePostfachAddressTestFactory.java | 2 +-
.../formcycle/FormDataControllerITCase.java | 6 +++---
.../formcycle/FormDataControllerTest.java | 16 ++++++++--------
.../FormSolutionsAttachmentsMapper.java | 2 +-
.../FormSolutionsFileMapperUtils.java | 2 +-
.../FormSolutionsRepresentationsMapper.java | 2 +-
.../FormSolutionsRequestMapper.java | 4 ++--
.../FormSolutionsAttachmentsMapperTest.java | 4 ++--
.../FormSolutionsFileMapperUtilsTest.java | 2 +-
.../FormSolutionsFilesTestFactory.java | 2 +-
.../FormSolutionsRepresentationsMapperTest.java | 6 +++---
.../FormSolutionsRequestMapperITCase.java | 8 ++++----
.../FormSolutionsRequestMapperTest.java | 4 ++--
.../FormsolutionsAdapterApplicationTest.java | 2 +-
.../formsolutions/SendFormEndpointITCase.java | 2 +-
.../formsolutions/SendFormEndpointTest.java | 6 +++---
.../forwarder/RouteForwardingService.java | 2 +-
.../forwarder/ForwarderApplicationTest.java | 2 +-
.../intelliform/AttachmentsContentAdder.java | 4 ++--
.../DepositRequestIncomingFileMapper.java | 2 +-
.../intelliform/FormDataIncomingFileMapper.java | 4 ++--
.../intelliform/RepresentationsCalculator.java | 4 ++--
.../intelliform/SemantikFormDataMapper.java | 6 +++---
.../eingang/intelliform/XmlToJavaMapsMapper.java | 2 +-
.../intelliform/AttachmentsContentAdderTest.java | 8 ++++----
.../DepositRequestIncomingFileMapperTest.java | 2 +-
.../eingang/intelliform/DepositTestFactory.java | 2 +-
.../intelliform/FormDataEndpointITCase.java | 4 ++--
.../intelliform/FormDataEndpointTest.java | 2 +-
.../FormDataIncomingFileMapperTest.java | 4 ++--
.../RepresentationsCalculatorTest.java | 8 ++++----
.../intelliform/SemantikFormDataMapperTest.java | 6 +++---
.../eingang/router/GrpcEingangMapper.java | 8 ++++----
.../eingang/router/ServiceKontoMapper.java | 8 ++++----
.../eingang/router/VorgangRemoteService.java | 6 +++---
.../ozgcloud/eingang/router/VorgangService.java | 4 ++--
.../eingang/router/GrpcEingangMapperITCase.java | 8 ++++----
.../eingang/router/GrpcEingangMapperTest.java | 8 ++++----
.../router/GrpcIncomingFileTestFactory.java | 2 +-
.../eingang/router/IncomingFileTestFactory.java | 2 +-
.../eingang/router/ServiceKontoMapperTest.java | 6 +++---
.../eingang/router/VorgangRemoteServiceTest.java | 12 ++++++------
.../eingang/router/VorgangServiceTest.java | 6 +++---
.../semantik/SemantikAdapter.java | 2 +-
.../semantik/common/ZipAttachmentReader.java | 6 +++---
.../semantik/enginebased/EngineBasedMapper.java | 2 +-
.../enginebased/EngineBasedSemantikAdapter.java | 2 +-
.../semantik/enginebased/FilesMapperHelper.java | 8 ++++----
.../enginebased/ServiceKontoBuildHelper.java | 10 +++++-----
.../enginebased/afm/AfmAntragstellerMapper.java | 4 ++--
.../enginebased/afm/AfmAttachedFilesMapper.java | 2 +-
.../afm/AfmEmpfangeneStelleMapper.java | 2 +-
.../enginebased/afm/AfmEngineBasedAdapter.java | 4 ++--
.../enginebased/afm/AfmEngineBasedMapper.java | 2 +-
.../enginebased/afm/AfmErklaerungenMapper.java | 2 +-
.../enginebased/afm/AfmHeaderMapper.java | 6 +++---
.../afm/AfmZustaendigeStelleMapper.java | 4 ++--
.../formcycle/FormCycleEngineBasedAdapter.java | 2 +-
.../FormSolutionsAntragstellerMapper.java | 6 +++---
.../FormSolutionsEngineBasedAdapter.java | 4 ++--
.../formsolutions/FormSolutionsFilesMapper.java | 6 +++---
.../formsolutions/FormSolutionsHeaderMapper.java | 6 +++---
.../formsolutions/FormSolutionsPanelMapper.java | 2 +-
.../FormSolutionsZustaendigeStelleMapper.java | 4 ++--
.../formsolutions/IdentifierValueParser.java | 2 +-
.../enginebased/xta/XtaEngineBasedAdapter.java | 2 +-
.../xta/XtaZipRepresentationsMapper.java | 4 ++--
.../formbased/DFoerdermittelFormBasedMapper.java | 8 ++++----
.../semantik/formbased/FormBasedMapper.java | 2 +-
.../formbased/FormBasedSemantikAdapter.java | 2 +-
.../semantik/SemantikAdapterTest.java | 2 +-
.../semantik/common/ZipAttachmentReaderTest.java | 2 +-
.../enginebased/FilesMapperHelperTest.java | 13 +++++++------
.../FormSolutionsEngineBasedAdapterITCase.java | 14 +++++++-------
.../enginebased/ServiceKontoBuildHelperTest.java | 12 ++++++------
.../afm/AfmAntragstellerMapperTest.java | 4 ++--
.../afm/AfmAntragstellerTestFactory.java | 2 +-
.../afm/AfmAttachedFilesMapperTest.java | 12 ++++++------
.../afm/AfmEmpfangeneStelleMapperTest.java | 4 ++--
.../afm/AfmEngineBasedAdapterTest.java | 2 +-
.../afm/AfmErklaerungenMapperTest.java | 4 ++--
.../enginebased/afm/AfmHeaderMapperTest.java | 4 ++--
.../afm/AfmZustaendigeStelleMapperTest.java | 4 ++--
.../FormCycleEngineBasedAdapterTest.java | 2 +-
.../FormSolutionsAntragstellerMapperTest.java | 10 +++++-----
.../FormSolutionsEngineBasedAdapterTest.java | 4 ++--
.../FormSolutionsFilesMapperTest.java | 10 +++++-----
.../FormSolutionsHeaderMapperTest.java | 6 +++---
.../FormSolutionsHeaderTestFactory.java | 2 +-
.../FormSolutionsPanelMapperTest.java | 3 ++-
.../FormSolutionsPanelTestFactory.java | 2 +-
...FormSolutionsZustaendigeStelleMapperTest.java | 6 +++---
.../formsolutions/IdentifierValueParserTest.java | 8 ++++----
.../xta/XtaZipRepresentationsMapperTest.java | 6 +++---
.../DFoerdermittelFormBasedMapperTest.java | 14 +++++++-------
.../DFoerdermittelFormDataTestFactory.java | 2 +-
.../formbased/FormBasedSemantikAdapterTest.java | 4 ++--
128 files changed, 277 insertions(+), 275 deletions(-)
delete mode 100644 common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/PostfachAddressIdentifier.java
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/Application.java (97%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/errorhandling/FunctionalException.java (95%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/errorhandling/TechnicalException.java (95%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/Antragsteller.java (96%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/DeleteOnCloseInputStream.java (96%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/FormData.java (97%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/FormDataUtils.java (97%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/FormHeader.java (96%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/IncomingFile.java (97%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/IncomingFileGroup.java (95%)
create mode 100644 common/src/main/java/de/ozgcloud/eingang/common/formdata/PostfachAddressIdentifier.java
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/ServiceKonto.java (87%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/StringBasedIdentifier.java (81%)
rename common/src/main/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/ZustaendigeStelle.java (95%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/EingangAdapterApplicationTest.java (96%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/AntragstellerTestFactory.java (97%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/DeleteOnCloseInputStreamTest.java (90%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/FormDataTestFactory.java (98%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/FormHeaderTestFactory.java (97%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/FormSolutionsTestFactory.java (98%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/IncomingFileGroupTestFactory.java (97%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/IncomingFileTest.java (98%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/IncomingFileTestFactory.java (94%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/PostfachAddressTestFactory.java (83%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/ServiceKontoTestFactory.java (86%)
rename common/src/test/java/de/{itvsh/kop/eingangsadapter => ozgcloud/eingang}/common/formdata/ZustaendigeStelleTestFactory.java (96%)
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 5614ce7c6..000000000
--- 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 1d2cf2ad4..9ba0845dd 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 5f5675342..23d3d1ed4 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 5e883305b..e27ecc57c 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 ffd400aa2..d5f6c9ef5 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 8aee1e7ff..d7109f66a 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 0eb3c4d76..44a034a84 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 1cf0a8adf..28192f790 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 f637172c3..59c9ff40d 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 97c3308d8..7d195f08f 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 c393845a6..16f8726e0 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 000000000..5b30bbf83
--- /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 408ba0350..793570456 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 85a8b8cce..f4d3eb31b 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 4331a939c..4de3040e5 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 17e8aab73..95b9b771b 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 25176afe8..ed3ed7816 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 320f77b1c..62d595e59 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 382505cbb..05bdcffff 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 8ed80008b..676210d67 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 072b5f876..2f21dc56e 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 51860a3bb..bdc37befd 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 aa73c1aba..336af887e 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 4cc9e1899..4ae396d8d 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 0d8a7c8d7..2d25ee587 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 43e2ec902..eaa45e45b 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 c01e062db..2ffa27d9f 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 db8021e1c..4da7a597a 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 1f12b52ff..7199daf2c 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 a89ab6b8e..033711485 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 3d2aac490..bcfc7be0b 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 399ca28bf..2b5ff4229 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 5ca0ab8b1..1667145bd 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 d5bb079c7..4046e9e38 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 4781b6343..ce7873362 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 7f7edd6d5..2d0de49a1 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 b6ad13f7c..18f74e4df 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 039c6da7d..5343293ff 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 35bf7169c..2b466394f 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 79db1ffd6..17f56acbb 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 48a893289..c004e922e 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 69d3587df..a47867236 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 f0a012b1d..d69321b3f 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 9f9cdaac3..bfb676b87 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 f6bfea00f..0b6589f11 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 39debcaba..6f72b4092 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 44bb1e514..db5d989e6 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 a5145f1a1..feca46f38 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 440c69675..b72c4b8f6 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 f1b553f09..2d121ec6c 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 27e63c8e1..771c8a8da 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 742f5fc8c..6cd2ec7ce 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 d492f7489..9018f3326 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 2c4debc0b..0bcd1ccaf 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 c48eb17e9..c972c32f3 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 34bd89a3f..bd6d32845 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 43a6ce8de..2ae6057c3 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 11c5e3e3a..49c38a83b 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 a1c0d3365..4683b4daf 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 f073fce93..0bddf5341 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 afa6a60c7..fb4a1c993 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 86e26594d..36ac0cb7e 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 1ae242a35..b559e3a2b 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 81a4cfca6..089c7fb8b 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 daab838fb..06e7cb17e 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 18df370b5..0f3deaad1 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 8bda9fcc0..c9250df82 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 1ce02c3d0..3534e2bc2 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 4dcc2de66..b151a1270 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 61877757f..a84c19b01 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 34f97576f..013444ba9 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 bb9d38dee..ada6f4b9d 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 c1b0f4139..8b1634ee1 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 b26bd2644..56af91ba4 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 88431f84f..42de91d24 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 ba36758d2..c1e6d37b5 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 6e4c6806b..0441e01d7 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 9d68792ba..b412a5803 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 4b1bdb824..61e1868a5 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 9e052241a..870022b3b 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 2b0ca76db..ee00680d1 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 02322a172..6dd8175ef 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 34fa96ceb..f140d6ac8 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 1d5b85bff..5f732c8d7 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 a3c6d2d91..6ea1a0fca 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 359b8218d..aa3514ee0 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 fa8557b5c..a185c4a09 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 43b2bb475..66f800740 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 899099828..5c3527ca1 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 6a9c12e14..32bf78f21 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 529f5a947..7fcea64ef 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 c8e1ad324..4a64a804f 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 b9990e766..3966bb31c 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 9b3e68345..173743d6e 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 fc778b1df..ad44c755d 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 59eb0465c..6c0fcc0c6 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 b73429c68..d813b11b2 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 45cb44892..984ab3dbf 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 01481d14a..20592e2f5 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 b82b02951..32ad74667 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 10d752e5f..236d2fa9b 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 f02a5fd2e..37ab8d016 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 be45d442c..f132d3354 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 62fc53baa..137b1f3d3 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 c4ca4ef95..f4f3fa93b 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 f55672e44..055e6cfd1 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 6c70f9dc6..4544d433d 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 e3bf390a6..64dcfc1cf 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 dffb5edf4..5e3bab267 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 25c649884..7b2433dff 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 f3cbf9b8e..f2cb408ae 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 64c5a43b8..b78856422 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 da8dcd951..fbd554afa 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 091469aea..214174cc0 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 56c1ed948..f1b2c2124 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 b6fc00d00..494e47efc 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 9af5c6bf6..f3ac84791 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 77b17e9ae..63f522d6a 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 457e458d5..f9bccb93f 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 57ad22fc9..3a89c5a17 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 25ac8fc1c..2b6a067cd 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 8c492a71b..5c087c63a 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 908082dc7..22dcfa7e6 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 d01c5e792..b4a3c9e19 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 48238ace8..fbd6bd6aa 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 ee2f48122..e38ae1461 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 dcfd37140..dfcd8b63a 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 e46383d93..6c8ea959e 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 {
--
GitLab