From fc661b4b3a353ca2e7b976eb3ab0d462b036827a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 3 Nov 2021 13:39:47 +0100
Subject: [PATCH] OZG-1598 fix build issues for common module
---
common/pom.xml | 49 +++++++++++++++++++
.../common/formdata/Antragsteller.java | 2 +-
.../common/formdata/FormData.java | 2 +-
.../common/formdata/FormHeader.java | 2 +-
.../common/formdata/IncomingFile.java | 2 +-
.../common/formdata/IncomingFileGroup.java | 2 +-
.../common/formdata/ZustaendigeStelle.java | 2 +-
.../formdata/AntragstellerTestFactory.java | 4 +-
.../common/formdata/FormDataTestFactory.java | 4 +-
.../formdata/FormHeaderTestFactory.java | 4 +-
.../IncomingFileGroupTestFactory.java | 6 +--
.../formdata/IncomingFileTestFactory.java | 6 +--
.../ZustaendigsStelleTestFactory.java | 4 +-
intelliform-adapter/pom.xml | 26 +++++++---
.../eingangsadapter/GrpcEingangMapper.java | 8 +--
.../kop/eingangsadapter/VorgangService.java | 4 +-
.../formsolutions/FormSolutionsMapper.java | 8 +--
.../formsolutions/SendFormEndpoint.java | 2 +-
.../intelliform/AntragstellerMapper.java | 2 +-
.../intelliform/AttachmentsContentAdder.java | 4 +-
.../DepositRequestIncomingFileMapper.java | 2 +-
.../FileReaderAntragDirectoryParser.java | 6 +--
.../FileReaderAttachmentContentAdder.java | 4 +-
.../intelliform/FileReaderScheduler.java | 2 +-
.../intelliform/FormDataEndpoint.java | 2 +-
.../FormDataIncomingFileMapper.java | 4 +-
.../intelliform/FormDataMapper.java | 6 +--
.../intelliform/FormHeaderMapper.java | 2 +-
.../RepresentationsCalculator.java | 4 +-
.../intelliform/ZustaendigeStelleMapper.java | 2 +-
.../GrpcEingangMapperITCase.java | 8 +--
.../GrpcEingangMapperTest.java | 8 +--
.../eingangsadapter/VorgangServiceTest.java | 6 +--
.../AttachmentsContentAdderTest.java | 8 +--
.../DepositRequestIncomingFileMapperTest.java | 4 +-
.../intelliform/DepositTestFactory.java | 2 +-
.../FileReaderAntragDirectoryParserTest.java | 4 +-
.../intelliform/FormDataEndpointTest.java | 2 +-
.../FormDataIncomingFileMapperTest.java | 4 +-
.../intelliform/FormDataMapperTest.java | 8 +--
.../RepresentationsCalculatorTest.java | 8 +--
pom.xml | 27 ++++++++--
42 files changed, 174 insertions(+), 92 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index 3c6ebf727..fe39eb21f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,7 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>de.itvsh.kop.eingangsadapter</groupId>
<artifactId>parent</artifactId>
@@ -9,4 +11,51 @@
</parent>
<artifactId>common</artifactId>
<name>Eingangs Adapter - Common</name>
+
+ <dependencies>
+ <!-- spring -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
+
+ <!-- Dev -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/Antragsteller.java b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/Antragsteller.java
index e2df77bd5..ccab78123 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/Antragsteller.java
+++ b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/Antragsteller.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.Map;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
index 7ad42d9de..2f72e711c 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
+++ b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormData.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.List;
import java.util.Map;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeader.java b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeader.java
index ef1efb6e9..aa3b109c0 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeader.java
+++ b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeader.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.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/itvsh/kop/eingangsadapter/common/formdata/IncomingFile.java
index 332daf441..cb702a6c6 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFile.java
+++ b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFile.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import lombok.Builder;
import lombok.Getter;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroup.java b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroup.java
index 5b6d9e008..2f299cb75 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroup.java
+++ b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroup.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.ArrayList;
import java.util.List;
diff --git a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelle.java b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelle.java
index 37005806a..547eef516 100644
--- a/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelle.java
+++ b/common/src/main/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigeStelle.java
@@ -1,4 +1,4 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import lombok.Builder;
import lombok.Getter;
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/AntragstellerTestFactory.java b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/AntragstellerTestFactory.java
index a00bac1b4..3e8295a3b 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/AntragstellerTestFactory.java
+++ b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/AntragstellerTestFactory.java
@@ -1,9 +1,9 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.Map;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.formdata.Antragsteller;
+import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
public class AntragstellerTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataTestFactory.java b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataTestFactory.java
index 71816ed1e..49641cc24 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataTestFactory.java
+++ b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormDataTestFactory.java
@@ -1,9 +1,9 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.List;
import java.util.Map;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
public class FormDataTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeaderTestFactory.java b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeaderTestFactory.java
index 0a8082fe1..a56b0e003 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeaderTestFactory.java
+++ b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/FormHeaderTestFactory.java
@@ -1,8 +1,8 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.time.ZonedDateTime;
-import de.itvsh.kop.eingangsadapter.formdata.FormHeader;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
public class FormHeaderTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroupTestFactory.java b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroupTestFactory.java
index 6e4d60000..3b1304c5e 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroupTestFactory.java
+++ b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileGroupTestFactory.java
@@ -1,9 +1,9 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.List;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
public class IncomingFileGroupTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTestFactory.java b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTestFactory.java
index 9699c7b9d..ad72cbc27 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTestFactory.java
+++ b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/IncomingFileTestFactory.java
@@ -1,9 +1,9 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile.IncomingFileBuilder;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile.IncomingFileBuilder;
public class IncomingFileTestFactory {
diff --git a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigsStelleTestFactory.java b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigsStelleTestFactory.java
index bfe107775..9b5038529 100644
--- a/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigsStelleTestFactory.java
+++ b/common/src/test/java/de/itvsh/kop/eingangsadapter/common/formdata/ZustaendigsStelleTestFactory.java
@@ -1,6 +1,6 @@
-package de.itvsh.kop.eingangsadapter.formdata;
+package de.itvsh.kop.eingangsadapter.common.formdata;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigeStelle;
+import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
public class ZustaendigsStelleTestFactory {
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index b4f42b023..3194cd985 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -14,21 +14,25 @@
<artifactId>intelliform-adapter</artifactId>
<name>intelliform-adapter</name>
<description>IntelliForm-Adapter </description>
+
+ <properties>
+ <spring-boot.build-image.imageName>docker.ozg-sh.de/intelliform-adapter:build-latest</spring-boot.build-image.imageName>
+ </properties>
<dependencies>
+ <!-- own projects -->
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
+ <groupId>de.itvsh.kop.eingangsadapter</groupId>
+ <artifactId>common</artifactId>
</dependency>
+
+ <!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web-services</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
+
<dependency>
<groupId>net.devh</groupId>
<artifactId>grpc-client-spring-boot-starter</artifactId>
@@ -150,6 +154,14 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>de.itvsh.kop.eingangsadapter</groupId>
+ <artifactId>common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -213,5 +225,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapper.java
index 75bcff407..5dfe863f5 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapper.java
@@ -11,9 +11,9 @@ import org.mapstruct.ReportingPolicy;
import com.google.protobuf.ByteString;
-import de.itvsh.kop.eingangsadapter.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+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.ozg.pluto.vorgang.GrpcAntragsteller;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFileGroup;
@@ -43,7 +43,7 @@ interface GrpcEingangMapper {
@Mapping(source = "files", target = "filesList")
GrpcIncomingFileGroup map(IncomingFileGroup fileGroup);
- GrpcZustaendigeStelle toZustaendigeStelle(de.itvsh.kop.eingangsadapter.formdata.ZustaendigeStelle zustaendigeStelle);
+ GrpcZustaendigeStelle toZustaendigeStelle(de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle zustaendigeStelle);
GrpcAntragsteller map(Antragsteller antragsteller);
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/VorgangService.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/VorgangService.java
index 54991c009..49518c728 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/VorgangService.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/VorgangService.java
@@ -5,8 +5,8 @@ import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigeStelle;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
@Service
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsMapper.java
index 6a96ad869..ee1124ed7 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/FormSolutionsMapper.java
@@ -6,10 +6,10 @@ import java.util.UUID;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.FormHeader;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigeStelle;
+import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
+import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
import de.ozg_sh.forms.formsolutions.SendFormRequest;
@Component
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpoint.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpoint.java
index 8d8c2c685..3931edfca 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpoint.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/formsolutions/SendFormEndpoint.java
@@ -7,7 +7,7 @@ import org.springframework.ws.server.endpoint.annotation.RequestPayload;
import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
import de.itvsh.kop.eingangsadapter.VorgangService;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import de.ozg_sh.forms.formsolutions.SendFormRequest;
import de.ozg_sh.forms.formsolutions.SendFormResponse;
import lombok.extern.log4j.Log4j2;
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AntragstellerMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AntragstellerMapper.java
index 594a3c00b..3ba8412f2 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AntragstellerMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AntragstellerMapper.java
@@ -7,7 +7,7 @@ import java.util.Objects;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.formdata.Antragsteller;
+import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
@Component
class AntragstellerMapper {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdder.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdder.java
index 3a92cb203..24adb7b44 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdder.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdder.java
@@ -4,8 +4,8 @@ import java.util.List;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
@Component
public class AttachmentsContentAdder {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapper.java
index 33963265e..dcc20b1d8 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapper.java
@@ -6,7 +6,7 @@ import java.util.stream.Collectors;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
@Component
class DepositRequestIncomingFileMapper {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParser.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParser.java
index 7a2934b09..86b7ce777 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParser.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParser.java
@@ -18,9 +18,9 @@ import org.springframework.stereotype.Service;
import org.w3c.dom.Document;
import de.itvsh.kop.eingangsadapter.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
@Service
class FileReaderAntragDirectoryParser {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAttachmentContentAdder.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAttachmentContentAdder.java
index 7d7f3a609..889415726 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAttachmentContentAdder.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAttachmentContentAdder.java
@@ -8,8 +8,8 @@ import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import de.itvsh.kop.eingangsadapter.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
@Service
class FileReaderAttachmentContentAdder {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderScheduler.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderScheduler.java
index d6eb4deea..3a79210b1 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderScheduler.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderScheduler.java
@@ -27,7 +27,7 @@ import org.springframework.util.FileSystemUtils;
import de.itvsh.kop.eingangsadapter.VorgangService;
import de.itvsh.kop.eingangsadapter.common.errorhandling.TechnicalException;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import lombok.extern.log4j.Log4j2;
@Service
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java
index 5890bd239..bc395a302 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpoint.java
@@ -15,7 +15,7 @@ import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
import org.xml.sax.SAXException;
import de.itvsh.kop.eingangsadapter.VorgangService;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
import lombok.extern.log4j.Log4j2;
@Endpoint
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapper.java
index a7c9ab765..bb44b080c 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapper.java
@@ -9,8 +9,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
@Component
class FormDataIncomingFileMapper {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapper.java
index 952f79642..b716fcbf0 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapper.java
@@ -9,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.w3c.dom.Document;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+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 lombok.RequiredArgsConstructor;
@Component
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormHeaderMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormHeaderMapper.java
index 03de04d40..b4d6daaa9 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormHeaderMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/FormHeaderMapper.java
@@ -6,7 +6,7 @@ import java.time.format.DateTimeFormatter;
import org.springframework.stereotype.Component;
import org.w3c.dom.Document;
-import de.itvsh.kop.eingangsadapter.formdata.FormHeader;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
@Component
class FormHeaderMapper {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculator.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculator.java
index 640d5bb56..24cae42a2 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculator.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculator.java
@@ -5,8 +5,8 @@ import java.util.stream.Collectors;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
@Component
public class RepresentationsCalculator {
diff --git a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/ZustaendigeStelleMapper.java b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/ZustaendigeStelleMapper.java
index eabcb6657..2acd3b5d1 100644
--- a/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/ZustaendigeStelleMapper.java
+++ b/intelliform-adapter/src/main/java/de/itvsh/kop/eingangsadapter/intelliform/ZustaendigeStelleMapper.java
@@ -4,7 +4,7 @@ import java.util.Map;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigeStelle;
+import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
@Component
class ZustaendigeStelleMapper {
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperITCase.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperITCase.java
index 1cb9c9fd3..c33c2fa53 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperITCase.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperITCase.java
@@ -15,10 +15,10 @@ import org.mockito.Spy;
import de.itvsh.kop.eingangsadapter.GrpcEingangMapper;
import de.itvsh.kop.eingangsadapter.GrpcFormDataMapper;
-import de.itvsh.kop.eingangsadapter.formdata.AntragstellerTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigsStelleTestFactory;
+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.ZustaendigsStelleTestFactory;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFile;
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperTest.java
index bcb0ecf9c..edf2a7e28 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/GrpcEingangMapperTest.java
@@ -14,10 +14,10 @@ import org.mockito.Mock;
import de.itvsh.kop.eingangsadapter.GrpcEingangMapper;
import de.itvsh.kop.eingangsadapter.GrpcFormDataMapper;
-import de.itvsh.kop.eingangsadapter.formdata.AntragstellerTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigsStelleTestFactory;
+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.ZustaendigsStelleTestFactory;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
import de.itvsh.ozg.pluto.vorgang.GrpcIncomingFile;
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/VorgangServiceTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/VorgangServiceTest.java
index 2aa395579..1073ef438 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/VorgangServiceTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/VorgangServiceTest.java
@@ -15,9 +15,9 @@ import org.mockito.Mock;
import de.itvsh.kop.eingangsadapter.GrpcEingangMapper;
import de.itvsh.kop.eingangsadapter.VorgangRemoteService;
import de.itvsh.kop.eingangsadapter.VorgangService;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.FormDataTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigsStelleTestFactory;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
+import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigsStelleTestFactory;
import de.itvsh.ozg.pluto.vorgang.GrpcEingang;
class VorgangServiceTest {
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdderTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdderTest.java
index fdcbdeddb..94990287c 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdderTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/AttachmentsContentAdderTest.java
@@ -7,10 +7,10 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileTestFactory;
+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.intelliform.AttachmentsContentAdder;
class AttachmentsContentAdderTest {
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapperTest.java
index 6912f564b..a27ef5208 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositRequestIncomingFileMapperTest.java
@@ -7,8 +7,8 @@ import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileTestFactory;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
import de.itvsh.kop.eingangsadapter.intelliform.DepositRequestIncomingFileMapper;
class DepositRequestIncomingFileMapperTest {
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositTestFactory.java
index 5ebb89352..63278640e 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositTestFactory.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/DepositTestFactory.java
@@ -2,7 +2,7 @@ package de.itvsh.kop.eingangsadapter.intelliform;
import java.util.List;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileTestFactory;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileTestFactory;
public class DepositTestFactory {
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParserTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParserTest.java
index 360ab19e7..de7a24534 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParserTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FileReaderAntragDirectoryParserTest.java
@@ -12,8 +12,8 @@ import org.mockito.Spy;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
import de.itvsh.kop.eingangsadapter.intelliform.AntragstellerMapper;
import de.itvsh.kop.eingangsadapter.intelliform.FileReaderAntragDirectoryParser;
import de.itvsh.kop.eingangsadapter.intelliform.FileReaderAttachmentContentAdder;
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpointTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpointTest.java
index 5fea0f6f7..69c34df79 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpointTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataEndpointTest.java
@@ -19,7 +19,7 @@ import org.mockito.Mock;
import org.xml.sax.SAXException;
import de.itvsh.kop.eingangsadapter.VorgangService;
-import de.itvsh.kop.eingangsadapter.formdata.FormDataTestFactory;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormDataTestFactory;
class FormDataEndpointTest {
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapperTest.java
index b3fd42de3..cbb4817cd 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataIncomingFileMapperTest.java
@@ -18,8 +18,8 @@ import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFile;
+import de.itvsh.kop.eingangsadapter.common.formdata.IncomingFileGroup;
import de.itvsh.kop.eingangsadapter.intelliform.FormDataIncomingFileMapper;
class FormDataIncomingFileMapperTest {
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapperTest.java
index 93aacc193..8abed85e3 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/FormDataMapperTest.java
@@ -15,10 +15,10 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
-import de.itvsh.kop.eingangsadapter.formdata.Antragsteller;
-import de.itvsh.kop.eingangsadapter.formdata.FormData;
-import de.itvsh.kop.eingangsadapter.formdata.FormHeader;
-import de.itvsh.kop.eingangsadapter.formdata.ZustaendigeStelle;
+import de.itvsh.kop.eingangsadapter.common.formdata.Antragsteller;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormData;
+import de.itvsh.kop.eingangsadapter.common.formdata.FormHeader;
+import de.itvsh.kop.eingangsadapter.common.formdata.ZustaendigeStelle;
import de.itvsh.kop.eingangsadapter.intelliform.AntragstellerMapper;
import de.itvsh.kop.eingangsadapter.intelliform.AttachmentsContentAdder;
import de.itvsh.kop.eingangsadapter.intelliform.FormDataIncomingFileMapper;
diff --git a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculatorTest.java b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculatorTest.java
index 5c93ade04..968e7a613 100644
--- a/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculatorTest.java
+++ b/intelliform-adapter/src/test/java/de/itvsh/kop/eingangsadapter/intelliform/RepresentationsCalculatorTest.java
@@ -8,10 +8,10 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFile;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroup;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileGroupTestFactory;
-import de.itvsh.kop.eingangsadapter.formdata.IncomingFileTestFactory;
+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.intelliform.RepresentationsCalculator;
class RepresentationsCalculatorTest {
diff --git a/pom.xml b/pom.xml
index f6df6cf58..53e624fc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<modules>
<module>intelliform-adapter</module>
-<!-- <module>common</module> -->
+ <module>common</module>
</modules>
<properties>
@@ -37,7 +37,6 @@
<xmlschema.version>2.3.0</xmlschema.version>
<!-- plugins -->
- <spring-boot.build-image.imageName>docker.ozg-sh.de/intelliform-adapter:build-latest</spring-boot.build-image.imageName>
<jaxb2-plugin.version>0.14.0</jaxb2-plugin.version>
<mojo-jaxb2-plugin.version>2.5.0</mojo-jaxb2-plugin.version>
<jacoco-plugin.version>0.8.7</jacoco-plugin.version>
@@ -47,6 +46,11 @@
<dependencies>
<!-- own projects -->
+ <dependency>
+ <groupId>de.itvsh.kop.eingangsadapter</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
<artifactId>pluto-interface</artifactId>
@@ -60,7 +64,6 @@
<version>${grpc.spring-boot-starter.version}</version>
</dependency>
-
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
@@ -79,6 +82,7 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
+ <scope>provided</scope>
</dependency>
<!-- Logging/Monitoring -->
@@ -93,6 +97,15 @@
<artifactId>xmlschema-core</artifactId>
<version>${xmlschema.version}</version>
</dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>de.itvsh.kop.eingangsadapter</groupId>
+ <artifactId>common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -131,6 +144,14 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>de.itvsh.kop.eingangsadapter.Application</mainClass>
+ </configuration>
+ </plugin>
+
<!-- tag::webservice[] -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
--
GitLab