From f163cf26d01741ddef56dc687e40c5c1e7bc31f1 Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Tue, 18 Mar 2025 11:17:24 +0100
Subject: [PATCH 1/3] replace field injection with constructor injection
---
.../de/ozgcloud/eingang/xta/XtaRunner.java | 9 ++++----
.../de/ozgcloud/eingang/xta/XtaService.java | 23 ++++++++-----------
...esentationsAttachmentsPairTestFactory.java | 4 ++--
.../de/ozgcloud/eingang/xta/XtaITCase.java | 19 ++++++++-------
4 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
index 8601abbe..1cc22ae3 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
@@ -23,7 +23,8 @@
*/
package de.ozgcloud.eingang.xta;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
@@ -34,13 +35,13 @@ 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 d3cf1e2b..db1eeac9 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 e88a8b47..8c08c71d 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 446fa54f..50b61961 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
@@ -23,10 +23,6 @@
*/
package de.ozgcloud.eingang.xta;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -34,6 +30,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 +46,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,9 +60,9 @@ 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;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
@SpringBootTest(classes = {
Application.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);
}
}
}
--
GitLab
From 55834666eaa77a02e8a9886f4f5ce1b0e1532378 Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Wed, 19 Mar 2025 12:57:06 +0100
Subject: [PATCH 2/3] update dependencies
---
pom.xml | 8 ++++----
.../de/ozgcloud/eingang/xta/XtaResponseTestFactory.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ca15c3b0..4383312d 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/test/java/de/ozgcloud/eingang/xta/XtaResponseTestFactory.java b/src/test/java/de/ozgcloud/eingang/xta/XtaResponseTestFactory.java
index 5eca0d33..6013e5a4 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);
}
}
--
GitLab
From ffd250be5845375a2bc08c57c407c575a6d947a6 Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Wed, 19 Mar 2025 16:04:10 +0100
Subject: [PATCH 3/3] import order
---
src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java | 3 +--
src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
index 1cc22ae3..f089eae7 100644
--- a/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
+++ b/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java
@@ -25,12 +25,11 @@ package de.ozgcloud.eingang.xta;
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
diff --git a/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java b/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
index 50b61961..dc5400f0 100644
--- a/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
+++ b/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
@@ -23,6 +23,10 @@
*/
package de.ozgcloud.eingang.xta;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -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 static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
@SpringBootTest(classes = {
Application.class,
XtaITCase.ActivateXTARunnerConfig.class
--
GitLab