diff --git a/pom.xml b/pom.xml
index ca15c3b07c05c0879996b48e68e078722fad4bcd..4383312d07f932d1924ebe379e8e322ac071b3f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.9.0</version>
+ <version>4.11.0</version>
</parent>
<groupId>de.ozgcloud.eingang</groupId>
@@ -42,9 +42,9 @@
<description>Eingangs Adapter - XTA</description>
<properties>
- <eingang-manager.version>2.18.0</eingang-manager.version>
- <intelliform-semantik.version>2.18.0</intelliform-semantik.version>
- <dfoerdermittel-semantik.version>2.18.0</dfoerdermittel-semantik.version>
+ <eingang-manager.version>2.18.1</eingang-manager.version>
+ <intelliform-semantik.version>2.18.1</intelliform-semantik.version>
+ <dfoerdermittel-semantik.version>2.18.1</dfoerdermittel-semantik.version>
<xta-client-lib.version>0.2.0</xta-client-lib.version>
<xmlschema.version>2.3.0</xmlschema.version>
diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
index 8601abbea6525fb5e0775011c9061360510e4138..f089eae743a6665b935dcad950bb3e9eabff752a 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
@@ -23,24 +23,24 @@
*/
package de.ozgcloud.eingang.xta;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
-import lombok.extern.log4j.Log4j2;
-
import de.ozgcloud.xta.client.exception.XtaClientException;
@Log4j2
@Component
+@RequiredArgsConstructor
class XtaRunner implements ApplicationListener<ContextRefreshedEvent> {
- @Autowired
- private XtaService service;
+ private final XtaService service;
@Override
- public void onApplicationEvent(ContextRefreshedEvent event) {
+ public void onApplicationEvent(@NonNull ContextRefreshedEvent event) {
LOG.info("Fetching XTA Messages");
runGetXtaMessages();
}
diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaService.java b/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
index d3cf1e2bae722d2874176223b62054f2132e0fee..db1eeac979c4d597f86f00cdd0054cf3bec29d19 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
@@ -30,10 +30,10 @@ import java.util.Optional;
import java.util.function.Consumer;
import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
@@ -54,6 +54,7 @@ import de.ozgcloud.xta.client.model.XtaTransportReport;
@Service
@Log4j2
+@RequiredArgsConstructor
class XtaService {
static final String XDOMEA_0201_MESSAGE_TYPE = "Geschaeftsgang.Geschaeftsgang.0201";
@@ -62,19 +63,13 @@ class XtaService {
final Consumer<XtaMessage> messageProcessor = this::processMessage;
- @Autowired
- private XtaClient xtaClient;
- @Autowired
- private SemantikAdapter semantikAdapter;
-
- @Autowired
- private XtaMessageMapper mapper;
- @Autowired
- private VorgangNummerSupplier vorgangNummerSupplier;
- @Autowired
- private XdomeaMessageDataMapper xdomeaMessageDataMapper;
- @Autowired
- private XtaIncomingFilesMapper xtaIncomingFilesMapper;
+ private final XtaClient xtaClient;
+ private final SemantikAdapter semantikAdapter;
+
+ private final XtaMessageMapper mapper;
+ private final VorgangNummerSupplier vorgangNummerSupplier;
+ private final XdomeaMessageDataMapper xdomeaMessageDataMapper;
+ private final XtaIncomingFilesMapper xtaIncomingFilesMapper;
public void fetchMessages() throws XtaClientException {
diff --git a/src/test/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPairTestFactory.java b/src/test/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPairTestFactory.java
index e88a8b47ea4624aaa6c5f6c3f4c53f2f12988f6d..8c08c71dfe32cb0cd879cc3196434f0d2ab958db 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPairTestFactory.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/RepresentationsAttachmentsPairTestFactory.java
@@ -31,12 +31,12 @@ import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
public class RepresentationsAttachmentsPairTestFactory {
- static List<IncomingFile> PAIR_REPRESENTATIONS = List.of(
+ static final List<IncomingFile> PAIR_REPRESENTATIONS = List.of(
IncomingFileTestFactory.createBuilder().name("representation1.xml").build(),
IncomingFileTestFactory.createBuilder().name("representation1.pdf").build()
);
- static List<IncomingFileGroup> PAIR_ATTACHMENTS = List.of(
+ static final List<IncomingFileGroup> PAIR_ATTACHMENTS = List.of(
IncomingFileGroupTestFactory.create(),
IncomingFileGroupTestFactory.create(),
IncomingFileGroupTestFactory.create()
diff --git a/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java b/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
index 446fa54f65506d645464cac68c04f01e814eb28a..dc5400f0edd5540f61deab41cf8eee2761d161b0 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
@@ -23,8 +23,8 @@
*/
package de.ozgcloud.eingang.xta;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import java.lang.annotation.ElementType;
@@ -34,6 +34,8 @@ import java.lang.annotation.Target;
import java.util.List;
import java.util.function.Consumer;
+import io.grpc.Channel;
+import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -48,6 +50,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import de.ozgcloud.eingang.Application;
import de.ozgcloud.eingang.common.formdata.FormData;
@@ -60,10 +64,6 @@ import de.ozgcloud.vorgang.vorgang.VorgangServiceGrpc.VorgangServiceBlockingStub
import de.ozgcloud.xta.client.XtaClient;
import de.ozgcloud.xta.client.model.XtaMessage;
-import io.grpc.Channel;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
-
@SpringBootTest(classes = {
Application.class,
XtaITCase.ActivateXTARunnerConfig.class
@@ -346,10 +346,13 @@ class XtaITCase {
@interface TestZipFileNames {
}
+ @RequiredArgsConstructor
static class ActivateXTARunnerConfig {
+ private final XtaService xtaService;
+
@Bean
XtaRunner xtaRunner() {
- return new XtaRunner();
+ return new XtaRunner(xtaService);
}
}
}
diff --git a/src/test/java/de/ozgcloud/eingang/xta/XtaResponseTestFactory.java b/src/test/java/de/ozgcloud/eingang/xta/XtaResponseTestFactory.java
index 5eca0d3322540b3fed2d9e3d8c4da1b398ac8904..6013e5a48871a38747e3903b8bcb2adcd315f9cb 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaResponseTestFactory.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaResponseTestFactory.java
@@ -151,6 +151,6 @@ public class XtaResponseTestFactory {
}
private static String getAttachmentFilePath(String xtaAttachmentFileName) {
- return "mock-responses/getMessage/%s/%s".formatted(getMessageType(xtaAttachmentFileName), xtaAttachmentFileName);
+ return "/mock-responses/getMessage/%s/%s".formatted(getMessageType(xtaAttachmentFileName), xtaAttachmentFileName);
}
}