diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0720e77f383307561834d427012405416ba467e9..0000000000000000000000000000000000000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -#FROM 172.30.35.192:8082/openjdk:15-slim -FROM openjdk:15-slim - -COPY /target/intelliform-adapter.jar /opt/if-adapter.jar - -WORKDIR /opt -CMD java -jar if-adapter.jar \ No newline at end of file diff --git a/README.md b/intelliform-adapter/README.md similarity index 100% rename from README.md rename to intelliform-adapter/README.md diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..84e2957695238cf0dee05497ef333d86628c3633 --- /dev/null +++ b/intelliform-adapter/pom.xml @@ -0,0 +1,357 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + <version>0.13.0-SNAPSHOT</version> + </parent> + + <groupId>de.itvsh.ozg</groupId> + <artifactId>intelliform-adapter</artifactId> + <name>intelliform-adapter</name> + <description>IntelliForm-Adapter </description> + + + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> + <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> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + </dependency> + + + <!-- own projects --> + <dependency> + <groupId>de.itvsh.ozg.pluto</groupId> + <artifactId>pluto-interface</artifactId> + </dependency> + + + <!-- tools --> + <!-- commons --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> + </dependency> + + <!-- Dev --> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-devtools</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- Logging/Monitoring --> + <dependency> + <groupId>net.logstash.logback</groupId> + <artifactId>logstash-logback-encoder</artifactId> + </dependency> + + <dependency> + <groupId>io.micrometer</groupId> + <artifactId>micrometer-registry-prometheus</artifactId> + <scope>runtime</scope> + </dependency> + + <!-- tag::springws[] --> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + </dependency> + <!-- end::springws[] --> + + <!-- 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> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-junit-jupiter</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.ws</groupId> + <artifactId>spring-ws-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-configuration-processor</artifactId> + <optional>true</optional> + </dependency> + </dependencies> + + <build> + <finalName>${project.artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${java.version}</source> + <target>${java.version}</target> + <annotationProcessorPaths> + <path> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + </path> + <path> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct-processor</artifactId> + <version>${mapstruct.version}</version> + </path> + <!-- other annotation processors --> + </annotationProcessorPaths> + + <showWarnings>true</showWarnings> + <compilerArgs> + <compilerArg> + -Amapstruct.defaultComponentModel=spring + </compilerArg> + <compilerArg> + -Amapstruct.unmappedTargetPolicy=IGNORE + </compilerArg> + </compilerArgs> + </configuration> + </plugin> + + <plugin> + <groupId>pl.project13.maven</groupId> + <artifactId>git-commit-id-plugin</artifactId> + <configuration> + <offline>true</offline> + </configuration> + <executions> + <execution> + <id>get-the-git-infos</id> + <goals> + <goal>revision</goal> + </goals> + <phase>initialize</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + + <!-- tag::xsd[] --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>2.5.0</version> + <executions> + <execution> + <id>xjc</id> + <goals> + <goal>xjc</goal> + </goals> + </execution> + </executions> + <configuration> + <sources> + <source>${project.basedir}/src/main/resources/formsolutions/formdata.xsd</source> + </sources> + </configuration> + </plugin> + <!-- end::xsd[] --> + + <!-- tag::wsdl[] --> + <plugin> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <version>0.14.0</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <schemaLanguage>WSDL</schemaLanguage> + <generatePackage>de.itvsh.ozg.adapter.intelliform</generatePackage> + <schemas> + <schema> + <fileset> + <directory>${basedir}/src/main/resources/intelliform</directory> + <includes> + <include>*.wsdl</include> + </includes> + </fileset> + </schema> + </schemas> + </configuration> + </plugin> + <!-- end::wsdl[] --> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>${jacoco.plugin.version}</version> + <executions> + <execution> + <id>start-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>generate-report</id> + <phase>package</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>ozg-nexus</id> + <name>ozg nexus</name> + <url>https://nexus.ozg-sh.de/repository/ozg-group/</url> + </repository> + <repository> + <id>projectlombok.org</id> + <url>https://projectlombok.org/edge-releases</url> + </repository> + </repositories> + + <distributionManagement> + <repository> + <id>ozg-nexus</id> + <name>ozg-releases</name> + <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url> + </repository> + <snapshotRepository> + <id>ozg-nexus</id> + <name>ozg-snapshots</name> + <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> + </snapshotRepository> + </distributionManagement> + + <profiles> + <profile> + <id>docker-build</id> + <build> + <plugins> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>dockerfile-maven-plugin</artifactId> + <version>1.4.13</version> + <configuration> + <username>admin</username> + <password>admin</password> + <repository>registry.ozg-sh.de/sh-land/if-adapter</repository> + <tag>${git.branch}-${project.version}</tag> + <useMavenSettingsForAuth>true</useMavenSettingsForAuth> + <buildArgs> + <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> + </buildArgs> + </configuration> + <executions> + <execution> + <id>default</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>tag</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/src/main/java/de/itvsh/ozg/adapter/AdapterConfigurationException.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/AdapterConfigurationException.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/AdapterConfigurationException.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/AdapterConfigurationException.java diff --git a/src/main/java/de/itvsh/ozg/adapter/Application.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/Application.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/Application.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/Application.java diff --git a/src/main/java/de/itvsh/ozg/adapter/GrpcClientsProperties.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/GrpcClientsProperties.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/GrpcClientsProperties.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/GrpcClientsProperties.java diff --git a/src/main/java/de/itvsh/ozg/adapter/GrpcEingangMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/GrpcEingangMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/GrpcEingangMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/GrpcEingangMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/GrpcFormDataMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/GrpcFormDataMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/GrpcFormDataMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/GrpcFormDataMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/PlutoListProperties.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/PlutoListProperties.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/PlutoListProperties.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/PlutoListProperties.java diff --git a/src/main/java/de/itvsh/ozg/adapter/PlutoServerResolver.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/PlutoServerResolver.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/PlutoServerResolver.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/PlutoServerResolver.java diff --git a/src/main/java/de/itvsh/ozg/adapter/UnkownOrganisationseinheitException.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/UnkownOrganisationseinheitException.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/UnkownOrganisationseinheitException.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/UnkownOrganisationseinheitException.java diff --git a/src/main/java/de/itvsh/ozg/adapter/VorgangRemoteService.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/VorgangRemoteService.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/VorgangRemoteService.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/VorgangRemoteService.java diff --git a/src/main/java/de/itvsh/ozg/adapter/VorgangService.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/VorgangService.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/VorgangService.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/VorgangService.java diff --git a/src/main/java/de/itvsh/ozg/adapter/WebServiceConfiguration.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/WebServiceConfiguration.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/WebServiceConfiguration.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/WebServiceConfiguration.java diff --git a/src/main/java/de/itvsh/ozg/adapter/common/errorhandling/FunctionalException.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/common/errorhandling/FunctionalException.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/common/errorhandling/FunctionalException.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/common/errorhandling/FunctionalException.java diff --git a/src/main/java/de/itvsh/ozg/adapter/common/errorhandling/TechnicalException.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/common/errorhandling/TechnicalException.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/common/errorhandling/TechnicalException.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/common/errorhandling/TechnicalException.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formdata/Antragsteller.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/Antragsteller.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formdata/Antragsteller.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/Antragsteller.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formdata/FormData.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/FormData.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formdata/FormData.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/FormData.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formdata/FormHeader.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/FormHeader.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formdata/FormHeader.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/FormHeader.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFile.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFile.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFile.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFile.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroup.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroup.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroup.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroup.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formdata/ZustaendigeStelle.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/ZustaendigeStelle.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formdata/ZustaendigeStelle.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formdata/ZustaendigeStelle.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formsolutions/FormSolutionsMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formsolutions/FormSolutionsMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formsolutions/FormSolutionsMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formsolutions/FormSolutionsMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/formsolutions/SendFormEndpoint.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formsolutions/SendFormEndpoint.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/formsolutions/SendFormEndpoint.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/formsolutions/SendFormEndpoint.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdder.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdder.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdder.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdder.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParser.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParser.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParser.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParser.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAttachmentContentAdder.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAttachmentContentAdder.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAttachmentContentAdder.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderAttachmentContentAdder.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParser.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParser.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParser.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParser.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderScheduler.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderScheduler.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderScheduler.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileReaderScheduler.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FileUtil.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileUtil.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FileUtil.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FileUtil.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpoint.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpoint.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpoint.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpoint.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormDataMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/FormHeaderMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormHeaderMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/FormHeaderMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/FormHeaderMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculator.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculator.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculator.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculator.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapper.java diff --git a/src/main/java/de/itvsh/ozg/adapter/intelliform/ZustaendigeStelleMapper.java b/intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/ZustaendigeStelleMapper.java similarity index 100% rename from src/main/java/de/itvsh/ozg/adapter/intelliform/ZustaendigeStelleMapper.java rename to intelliform-adapter/src/main/java/de/itvsh/ozg/adapter/intelliform/ZustaendigeStelleMapper.java diff --git a/src/main/resources/application-dev.yml b/intelliform-adapter/src/main/resources/application-dev.yml similarity index 100% rename from src/main/resources/application-dev.yml rename to intelliform-adapter/src/main/resources/application-dev.yml diff --git a/src/main/resources/application-local.yml b/intelliform-adapter/src/main/resources/application-local.yml similarity index 85% rename from src/main/resources/application-local.yml rename to intelliform-adapter/src/main/resources/application-local.yml index b43459dc46be06fbac56876c0beb81323b7e38b0..ca271bcfb137490201c0be9666360eba9b096d2b 100644 --- a/src/main/resources/application-local.yml +++ b/intelliform-adapter/src/main/resources/application-local.yml @@ -4,6 +4,9 @@ grpc: address: static://127.0.0.1:9090 negotiationType: PLAINTEXT +management: + server: + port: 8082 kop: adapter: diff --git a/src/main/resources/application-oc.yml b/intelliform-adapter/src/main/resources/application-oc.yml similarity index 100% rename from src/main/resources/application-oc.yml rename to intelliform-adapter/src/main/resources/application-oc.yml diff --git a/src/main/resources/application-test.yml b/intelliform-adapter/src/main/resources/application-test.yml similarity index 100% rename from src/main/resources/application-test.yml rename to intelliform-adapter/src/main/resources/application-test.yml diff --git a/src/main/resources/application.yml b/intelliform-adapter/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to intelliform-adapter/src/main/resources/application.yml diff --git a/src/main/resources/banner.txt b/intelliform-adapter/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to intelliform-adapter/src/main/resources/banner.txt diff --git a/src/main/resources/formsolutions/formdata.xsd b/intelliform-adapter/src/main/resources/formsolutions/formdata.xsd similarity index 100% rename from src/main/resources/formsolutions/formdata.xsd rename to intelliform-adapter/src/main/resources/formsolutions/formdata.xsd diff --git a/src/main/resources/intelliform/ApplicationService.wsdl b/intelliform-adapter/src/main/resources/intelliform/ApplicationService.wsdl similarity index 100% rename from src/main/resources/intelliform/ApplicationService.wsdl rename to intelliform-adapter/src/main/resources/intelliform/ApplicationService.wsdl diff --git a/src/main/resources/intelliform/ApplicationService.xsd b/intelliform-adapter/src/main/resources/intelliform/ApplicationService.xsd similarity index 100% rename from src/main/resources/intelliform/ApplicationService.xsd rename to intelliform-adapter/src/main/resources/intelliform/ApplicationService.xsd diff --git a/src/main/resources/logback-spring.xml b/intelliform-adapter/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback-spring.xml rename to intelliform-adapter/src/main/resources/logback-spring.xml diff --git a/src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperITCase.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperITCase.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperITCase.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperITCase.java diff --git a/src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcEingangMapperTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/GrpcFormDataMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcFormDataMapperTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/GrpcFormDataMapperTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcFormDataMapperTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/GrpcFormFieldTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcFormFieldTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/GrpcFormFieldTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/GrpcFormFieldTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/IFAdapterApplicationTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/IFAdapterApplicationTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/IFAdapterApplicationTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/IFAdapterApplicationTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoListPropertiesTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverITCase.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverITCase.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverITCase.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverITCase.java diff --git a/src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/PlutoServerResolverTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/VorgangServiceTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/VorgangServiceTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/VorgangServiceTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/VorgangServiceTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/formdata/AntragstellerTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/AntragstellerTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/formdata/AntragstellerTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/AntragstellerTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/formdata/FormDataTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/FormDataTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/formdata/FormDataTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/FormDataTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/formdata/FormHeaderTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/FormHeaderTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/formdata/FormHeaderTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/FormHeaderTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroupTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroupTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroupTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileGroupTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/IncomingFileTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/formdata/ZustaendigsStelleTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/ZustaendigsStelleTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/formdata/ZustaendigsStelleTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/formdata/ZustaendigsStelleTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapperTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapperTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerMapperTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/AntragstellerTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdderTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdderTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdderTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/AttachmentsContentAdderTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapperTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapperTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/DepositRequestIncomingFileMapperTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/DepositTestFactory.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/DepositTestFactory.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/DepositTestFactory.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/DepositTestFactory.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParserTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParserTest.java similarity index 87% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParserTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParserTest.java index 4d35bb18faf8c3de76123d5d4d9a1ca5884047ad..25c7a0b58219d1b6b99eb3ad1fc54c1ab2731b55 100644 --- a/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParserTest.java +++ b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderAntragDirectoryParserTest.java @@ -7,37 +7,46 @@ import java.util.stream.Stream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Spy; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import de.itvsh.ozg.adapter.formdata.FormData; import de.itvsh.ozg.adapter.formdata.IncomingFile; +//TODO use itcase and start spring context class FileReaderAntragDirectoryParserTest { static final String TESTDATA_PATH = "classpath:intelliform/filereader/example/2021-07-06_1625570582084"; + @InjectMocks private FileReaderAntragDirectoryParser service; + @Spy + private DefaultResourceLoader loader = new DefaultResourceLoader(); + @Spy + private FormHeaderMapper headerMapper = new FormHeaderMapper(); + @Spy + private AntragstellerMapper antragstellerMapper = new AntragstellerMapper(); + @Spy + private ZustaendigeStelleMapper zustaendigeStelleMapper = new ZustaendigeStelleMapper(); + @Spy + private XmlToJavaMapsMapper xmlToJavaMapsMapper = new XmlToJavaMapsMapper(); + @Spy + private FormDataIncomingFileMapper incomingFileMapper = new FormDataIncomingFileMapper(); + @Spy + private FileReaderAttachmentContentAdder attachmentContentAdder = new FileReaderAttachmentContentAdder(); + private Resource testDataPath; @BeforeEach void init() { - service = new FileReaderAntragDirectoryParser(); - service.resourceLoader = new DefaultResourceLoader(); - service.formHeaderMapper = new FormHeaderMapper(); - service.antragstellerMapper = new AntragstellerMapper(); - service.zustaendigeStelleMapper = new ZustaendigeStelleMapper(); - service.xmlToJavaMapsMapper = new XmlToJavaMapsMapper(); - service.formDataIncomingFileMapper = new FormDataIncomingFileMapper(); - service.fileReaderAttachmentContentAdder = new FileReaderAttachmentContentAdder(); - testDataPath = new DefaultResourceLoader().getResource(TESTDATA_PATH); } @Test void readEingangShouldReturnFormData() { - FormData formData = service.readPath(testDataPath); assertThat(formData).isNotNull(); @@ -45,7 +54,6 @@ class FileReaderAntragDirectoryParserTest { @Test void loadFormDataFilesShouldReturnFilesInTestpath() { - Stream<Resource> files = service.loadFormDataFiles(testDataPath); assertThat(files).hasSize(4); @@ -53,7 +61,6 @@ class FileReaderAntragDirectoryParserTest { @Test void filterGeschaeftsgangFileShouldReturnMatchingResource() { - Stream<Resource> files = service.loadFormDataFiles(testDataPath); assertThat(service.filterGeschaeftsgangFile(files).getFilename()) @@ -65,7 +72,6 @@ class FileReaderAntragDirectoryParserTest { @Test void formDataShouldHaveId() { - FormData formData = service.readPath(testDataPath); assertThat(formData.getId()).isNotNull(); @@ -73,7 +79,6 @@ class FileReaderAntragDirectoryParserTest { @Test void formDataShouldHaveFormId() { - FormData formData = service.readPath(testDataPath); assertThat(formData.getHeader().getFormId()).isEqualTo("EA-Antragsassistent/EA-Antragsassistent"); @@ -81,7 +86,6 @@ class FileReaderAntragDirectoryParserTest { @Test void formDataShouldHaveAntragsteller() { - FormData formData = service.readPath(testDataPath); assertThat(formData.getAntragsteller().getVorname()).isEqualTo("Projekt"); @@ -89,7 +93,6 @@ class FileReaderAntragDirectoryParserTest { @Test void formDataShouldHaveZustaendigeStelle() { - FormData formData = service.readPath(testDataPath); assertThat(formData.getZustaendigeStelle().getOrganisationseinheitenId()).isEqualTo("10363455"); @@ -101,7 +104,6 @@ class FileReaderAntragDirectoryParserTest { @Test void shouldHaveNumberOfRepresentations() { - FormData formData = service.readPath(testDataPath); assertThat(formData.getNumberOfRepresentations()).isEqualTo(2); @@ -109,7 +111,6 @@ class FileReaderAntragDirectoryParserTest { @Test void shouldHaveXmlRepresentation() { - FormData formData = service.readPath(testDataPath); IncomingFile representation = formData.getRepresentations().stream().filter(r -> r.getName().endsWith(".xml")).findFirst() @@ -125,7 +126,6 @@ class FileReaderAntragDirectoryParserTest { @Test void shouldHavePdfRepresentation() { - FormData formData = service.readPath(testDataPath); IncomingFile representation = formData.getRepresentations().stream().filter(r -> r.getName().endsWith(".pdf")).findFirst() @@ -145,7 +145,6 @@ class FileReaderAntragDirectoryParserTest { @Test void shouldHaveNumberOfAttachments() { - FormData formData = service.readPath(testDataPath); assertThat(formData.getNumberOfAttachments()).isEqualTo(1); @@ -153,7 +152,6 @@ class FileReaderAntragDirectoryParserTest { @Test void shouldHaveAttachment() { - FormData formData = service.readPath(testDataPath); IncomingFile attachment = formData.getAttachments().get(0).getFiles().get(0); @@ -169,14 +167,12 @@ class FileReaderAntragDirectoryParserTest { @Test void getFilePartFromGeschaeftsgangRepresentation() { - assertThat(service.getFilePartFromGeschaeftsgangRepresentation("ee32b3e5-ab12-4aa1-88a6-3d56e73f7e3e_analytics-3088958_1920.jpg")) .isEqualTo("analytics-3088958_1920.jpg"); } @Test void getUuidFromGeschaeftsgangRepresentation() { - assertThat(service.getUuidFromGeschaeftsgangRepresentation("ee32b3e5-ab12-4aa1-88a6-3d56e73f7e3e_analytics-3088958_1920.jpg")) .isEqualTo("ee32b3e5-ab12-4aa1-88a6-3d56e73f7e3e"); } diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParserTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParserTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParserTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderGeschaeftsgangParserTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderSchedulerTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderSchedulerTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderSchedulerTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FileReaderSchedulerTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointITCase.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointITCase.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointITCase.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointITCase.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataEndpointTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapperTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapperTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataIncomingFileMapperTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataMapperTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataMapperTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/FormDataMapperTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculatorTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculatorTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculatorTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/RepresentationsCalculatorTest.java diff --git a/src/test/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapperTest.java b/intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapperTest.java similarity index 100% rename from src/test/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapperTest.java rename to intelliform-adapter/src/test/java/de/itvsh/ozg/adapter/intelliform/XmlToJavaMapsMapperTest.java diff --git a/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/intelliform-adapter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension similarity index 100% rename from src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension rename to intelliform-adapter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension diff --git a/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapRequest.xml b/intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapRequest.xml similarity index 100% rename from src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapRequest.xml rename to intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapRequest.xml diff --git a/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapResponse.xml b/intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapResponse.xml similarity index 100% rename from src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapResponse.xml rename to intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeSoapResponse.xml diff --git a/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDaten1.xml b/intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDaten1.xml similarity index 100% rename from src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDaten1.xml rename to intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDaten1.xml diff --git a/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDatenVerschachtelt.xml b/intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDatenVerschachtelt.xml similarity index 100% rename from src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDatenVerschachtelt.xml rename to intelliform-adapter/src/test/resources/intelliform/EinfachesFormularZweiAnhaengeXmlDatenVerschachtelt.xml diff --git a/src/test/resources/intelliform/FormularSoapRequest_WithContent_XML-Daten-1.xml b/intelliform-adapter/src/test/resources/intelliform/FormularSoapRequest_WithContent_XML-Daten-1.xml similarity index 100% rename from src/test/resources/intelliform/FormularSoapRequest_WithContent_XML-Daten-1.xml rename to intelliform-adapter/src/test/resources/intelliform/FormularSoapRequest_WithContent_XML-Daten-1.xml diff --git a/src/test/resources/intelliform/SimpleFormDataMapperTestFile.xml b/intelliform-adapter/src/test/resources/intelliform/SimpleFormDataMapperTestFile.xml similarity index 100% rename from src/test/resources/intelliform/SimpleFormDataMapperTestFile.xml rename to intelliform-adapter/src/test/resources/intelliform/SimpleFormDataMapperTestFile.xml diff --git a/src/test/resources/intelliform/XML-Daten-1.xml b/intelliform-adapter/src/test/resources/intelliform/XML-Daten-1.xml similarity index 100% rename from src/test/resources/intelliform/XML-Daten-1.xml rename to intelliform-adapter/src/test/resources/intelliform/XML-Daten-1.xml diff --git a/src/test/resources/intelliform/XML-Daten_Gewerbe.xml b/intelliform-adapter/src/test/resources/intelliform/XML-Daten_Gewerbe.xml similarity index 100% rename from src/test/resources/intelliform/XML-Daten_Gewerbe.xml rename to intelliform-adapter/src/test/resources/intelliform/XML-Daten_Gewerbe.xml diff --git a/src/test/resources/intelliform/XML-Daten_Strassengefaelle.xml b/intelliform-adapter/src/test/resources/intelliform/XML-Daten_Strassengefaelle.xml similarity index 100% rename from src/test/resources/intelliform/XML-Daten_Strassengefaelle.xml rename to intelliform-adapter/src/test/resources/intelliform/XML-Daten_Strassengefaelle.xml diff --git a/src/test/resources/intelliform/XML-Keine_Daten.xml b/intelliform-adapter/src/test/resources/intelliform/XML-Keine_Daten.xml similarity index 100% rename from src/test/resources/intelliform/XML-Keine_Daten.xml rename to intelliform-adapter/src/test/resources/intelliform/XML-Keine_Daten.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181-ohne-kodierungsprobleme/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/5137e6ee-5e1f-4b40-bf89-abdfb3988959_XML-Datensatz__Originalform_.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/61560022-d35c-11eb-bf9f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/db46d72b-a997-408a-a3ba-8cbabc69d73e_kleinerWaffenschein_condition.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-06-22_1624368182181/e2782835-eaa7-4943-b18f-cf6e1b7d1e03_XML-Daten.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/60c44129-de4b-11eb-b18f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/60c44129-de4b-11eb-b18f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/60c44129-de4b-11eb-b18f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/60c44129-de4b-11eb-b18f-005056ba7f94_Geschaeftsgang.Geschaeftsgang.0201.xml diff --git a/src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/7f605954-d863-4f11-8dd8-c5f78e2b4f62_XML-Daten.xml b/intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/7f605954-d863-4f11-8dd8-c5f78e2b4f62_XML-Daten.xml similarity index 100% rename from src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/7f605954-d863-4f11-8dd8-c5f78e2b4f62_XML-Daten.xml rename to intelliform-adapter/src/test/resources/intelliform/filereader/example/2021-07-06_1625570582084/7f605954-d863-4f11-8dd8-c5f78e2b4f62_XML-Daten.xml diff --git a/src/test/resources/intelliform/soaprequest-deposit.xml b/intelliform-adapter/src/test/resources/intelliform/soaprequest-deposit.xml similarity index 100% rename from src/test/resources/intelliform/soaprequest-deposit.xml rename to intelliform-adapter/src/test/resources/intelliform/soaprequest-deposit.xml diff --git a/src/test/resources/junit-platform.properties b/intelliform-adapter/src/test/resources/junit-platform.properties similarity index 100% rename from src/test/resources/junit-platform.properties rename to intelliform-adapter/src/test/resources/junit-platform.properties diff --git a/pom.xml b/pom.xml index 0fc7c029164690e5beb38120ce1665f94ccd8662..341976e62ce61ec2db57fe977d907fd7b8975f4e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> <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> + <groupId>de.itvsh.kop.eingangsadapter</groupId> + <artifactId>parent</artifactId> + <name>Eingangs Adapter - Parent</name> + <packaging>pom</packaging> + <version>0.13.0-SNAPSHOT</version> <parent> <groupId>org.springframework.boot</groupId> @@ -12,11 +16,10 @@ <relativePath /> <!-- lookup parent from repository --> </parent> - <groupId>de.itvsh.ozg</groupId> - <artifactId>intelliform-adapter</artifactId> - <version>0.13.0-SNAPSHOT</version> - <name>intelliform-adapter</name> - <description>IntelliForm-Adapter </description> + + <modules> + <module>intelliform-adapter</module> + </modules> <properties> <java.version>17</java.version> @@ -24,357 +27,70 @@ <mapstruct.version>1.4.2.Final</mapstruct.version> <pluto.version>0.15.0-SNAPSHOT</pluto.version> + <grpc.spring-boot-starter.version>2.12.0.RELEASE</grpc.spring-boot-starter.version> - <!-- plugins --> - <spring-boot.build-image.imageName>docker.ozg-sh.de/intelliform-adapter:build-latest</spring-boot.build-image.imageName> + <jsoup.version>1.14.3</jsoup.version> <lombok.version>edge-SNAPSHOT</lombok.version> - + <logstash-logback-encoder.version>6.6</logstash-logback-encoder.version> + <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> <jacoco.plugin.version>0.8.7</jacoco.plugin.version> </properties> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - <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> - <version>${grpc.spring-boot-starter.version}</version> - </dependency> - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - - <dependency> - <groupId>org.jsoup</groupId> - <artifactId>jsoup</artifactId> - <version>1.13.1</version> - </dependency> - - <!-- commons --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <!-- --> - - <!-- own projects --> - <dependency> - <groupId>de.itvsh.ozg.pluto</groupId> - <artifactId>pluto-interface</artifactId> - <version>${pluto.version}</version> - </dependency> - - - <!-- tools --> - <dependency> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct</artifactId> - <version>${mapstruct.version}</version> - </dependency> - - <!-- Dev --> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-devtools</artifactId> - <scope>runtime</scope> - </dependency> - - <!-- Logging/Monitoring --> - <dependency> - <groupId>net.logstash.logback</groupId> - <artifactId>logstash-logback-encoder</artifactId> - <version>6.3</version> - </dependency> - - <dependency> - <groupId>io.micrometer</groupId> - <artifactId>micrometer-registry-prometheus</artifactId> - <scope>runtime</scope> - </dependency> - - <!-- tag::springws[] --> - <dependency> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.ws.xmlschema</groupId> - <artifactId>xmlschema-core</artifactId> - <version>2.2.4</version> - </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - </dependency> - <!-- end::springws[] --> - - <!-- 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> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.ws</groupId> - <artifactId>spring-ws-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - <optional>true</optional> - </dependency> - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${java.version}</source> - <target>${java.version}</target> - <annotationProcessorPaths> - <path> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>${lombok.version}</version> - </path> - <path> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct-processor</artifactId> - <version>${mapstruct.version}</version> - </path> - <!-- other annotation processors --> - </annotationProcessorPaths> - - <showWarnings>true</showWarnings> - <compilerArgs> - <compilerArg> - -Amapstruct.defaultComponentModel=spring - </compilerArg> - <compilerArg> - -Amapstruct.unmappedTargetPolicy=IGNORE - </compilerArg> - </compilerArgs> - </configuration> - </plugin> - - <plugin> - <groupId>pl.project13.maven</groupId> - <artifactId>git-commit-id-plugin</artifactId> - <configuration> - <offline>true</offline> - </configuration> - <executions> - <execution> - <id>get-the-git-infos</id> - <goals> - <goal>revision</goal> - </goals> - <phase>initialize</phase> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - - <!-- tag::xsd[] --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxb2-maven-plugin</artifactId> - <version>2.5.0</version> - <executions> - <execution> - <id>xjc</id> - <goals> - <goal>xjc</goal> - </goals> - </execution> - </executions> - <configuration> - <sources> - <source>${project.basedir}/src/main/resources/formsolutions/formdata.xsd</source> - </sources> - </configuration> - </plugin> - <!-- end::xsd[] --> - - <!-- tag::wsdl[] --> - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>0.14.0</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <schemaLanguage>WSDL</schemaLanguage> - <generatePackage>de.itvsh.ozg.adapter.intelliform</generatePackage> - <schemas> - <schema> - <fileset> - <directory>${basedir}/src/main/resources/intelliform</directory> - <includes> - <include>*.wsdl</include> - </includes> - </fileset> - </schema> - </schemas> - </configuration> - </plugin> - <!-- end::wsdl[] --> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>${jacoco.plugin.version}</version> - <executions> - <execution> - <id>start-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>generate-report</id> - <phase>package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - </plugin> - </plugins> - </build> - - <repositories> - <repository> - <id>ozg-nexus</id> - <name>ozg nexus</name> - <url>https://nexus.ozg-sh.de/repository/ozg-group/</url> - </repository> - <repository> - <id>projectlombok.org</id> - <url>https://projectlombok.org/edge-releases</url> - </repository> - </repositories> - - <distributionManagement> - <repository> - <id>ozg-nexus</id> - <name>ozg-releases</name> - <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url> - </repository> - <snapshotRepository> - <id>ozg-nexus</id> - <name>ozg-snapshots</name> - <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> - </snapshotRepository> - </distributionManagement> + <dependencyManagement> + <dependencies> + + <!-- own projects --> + <dependency> + <groupId>de.itvsh.ozg.pluto</groupId> + <artifactId>pluto-interface</artifactId> + <version>${pluto.version}</version> + </dependency> + + <!-- spring --> + <dependency> + <groupId>net.devh</groupId> + <artifactId>grpc-client-spring-boot-starter</artifactId> + <version>${grpc.spring-boot-starter.version}</version> + </dependency> + + + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>${jsoup.version}</version> + </dependency> + + <!-- Tools --> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> + <version>${mapstruct.version}</version> + </dependency> + + <!-- Dev --> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>${lombok.version}</version> + </dependency> + + <!-- Logging/Monitoring --> + <dependency> + <groupId>net.logstash.logback</groupId> + <artifactId>logstash-logback-encoder</artifactId> + <version>${logstash-logback-encoder.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.ws.xmlschema</groupId> + <artifactId>xmlschema-core</artifactId> + <version>${xmlschema.version}</version> + </dependency> + </dependencies> + </dependencyManagement> - <profiles> - <profile> - <id>docker-build</id> - <build> - <plugins> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>dockerfile-maven-plugin</artifactId> - <version>1.4.13</version> - <configuration> - <username>admin</username> - <password>admin</password> - <repository>registry.ozg-sh.de/sh-land/if-adapter</repository> - <tag>${git.branch}-${project.version}</tag> - <useMavenSettingsForAuth>true</useMavenSettingsForAuth> - <buildArgs> - <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> - </buildArgs> - </configuration> - <executions> - <execution> - <id>default</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>tag</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project>