From 7f24977d9c299137467f3840fcb66f8ea22f7cea Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 18 Jul 2024 09:15:45 +0200 Subject: [PATCH] OZG-5156 Accept FIM messages in XTA adapter test with new pom --- fim-adapter/pom.xml | 31 +++++++++---------- .../ozgcloud/eingang/fim/FimBasedAdapter.java | 12 ++----- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/fim-adapter/pom.xml b/fim-adapter/pom.xml index b5c5d81c7..55f7ccc7a 100644 --- a/fim-adapter/pom.xml +++ b/fim-adapter/pom.xml @@ -20,16 +20,6 @@ <artifactId>semantik-adapter</artifactId> </dependency> - <!--spring--> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <!--test --> <dependency> <groupId>de.ozgcloud.eingang</groupId> @@ -42,23 +32,30 @@ <build> <plugins> <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> </plugin> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> </plugin> </plugins> </build> diff --git a/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java b/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java index b64d3b92f..0335a6abb 100644 --- a/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java +++ b/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java @@ -5,7 +5,6 @@ import de.ozgcloud.eingang.common.formdata.FormHeader; import de.ozgcloud.eingang.common.formdata.IncomingFile; import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter; import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.w3c.dom.Document; @@ -19,7 +18,7 @@ import java.util.Optional; @Log4j2 @Component -public class FimBasedAdapter implements EngineBasedSemantikAdapter, InitializingBean { +public class FimBasedAdapter implements EngineBasedSemantikAdapter { static final String FIM_FORM_ENGINE_NAME = "FIM"; @@ -28,9 +27,7 @@ public class FimBasedAdapter implements EngineBasedSemantikAdapter, Initializing @Override public boolean isResponsible(final FormData formData) { - // FIXME remove - String formEngineName = formData.getHeader().getFormEngineName(); - LOG.info("Check for FIM Adapter - " + formEngineName); + final String formEngineName = formData.getHeader().getFormEngineName(); return FIM_FORM_ENGINE_NAME.equals(formEngineName); } @@ -74,9 +71,4 @@ public class FimBasedAdapter implements EngineBasedSemantikAdapter, Initializing final DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); return builder.parse(incomingFile.getContentStream()); } - - @Override - public void afterPropertiesSet() throws Exception { - LOG.debug("Bean for FIMBasedMapper created"); - } } -- GitLab