Skip to content
Snippets Groups Projects
Commit fc661b4b authored by OZGCloud's avatar OZGCloud
Browse files

OZG-1598 fix build issues for common module

parent 5e999b05
No related branches found
No related tags found
No related merge requests found
Showing
with 102 additions and 41 deletions
<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
package de.itvsh.kop.eingangsadapter.formdata;
package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.Map;
......
package de.itvsh.kop.eingangsadapter.formdata;
package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.List;
import java.util.Map;
......
package de.itvsh.kop.eingangsadapter.formdata;
package de.itvsh.kop.eingangsadapter.common.formdata;
import java.time.ZonedDateTime;
......
package de.itvsh.kop.eingangsadapter.formdata;
package de.itvsh.kop.eingangsadapter.common.formdata;
import lombok.Builder;
import lombok.Getter;
......
package de.itvsh.kop.eingangsadapter.formdata;
package de.itvsh.kop.eingangsadapter.common.formdata;
import java.util.ArrayList;
import java.util.List;
......
package de.itvsh.kop.eingangsadapter.formdata;
package de.itvsh.kop.eingangsadapter.common.formdata;
import lombok.Builder;
import lombok.Getter;
......
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 {
......
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 {
......
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 {
......
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 {
......
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 {
......
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 {
......
......@@ -15,20 +15,24 @@
<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>
......
......@@ -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);
......
......@@ -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
......
......@@ -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
......
......@@ -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;
......
......@@ -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 {
......
......@@ -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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment