From d79d521344542b4dd54b14e6fb8cfb5df6782b7d Mon Sep 17 00:00:00 2001
From: OZG-Cloud Team <noreply@ozg-sh.de>
Date: Mon, 13 May 2024 11:52:22 +0200
Subject: [PATCH] OZG-5412 intelliform: Revert to generic class names
---
.../{IntelliFormMapper.java => DepositDataMapper.java} | 2 +-
.../{IntelliFormEndpoint.java => FormDataEndpoint.java} | 7 +++----
...elliFormMapperTest.java => DepositDataMapperTest.java} | 8 ++------
...ormEndpointITCase.java => FormDataEndpointITCase.java} | 2 +-
...lliFormEndpointTest.java => FormDataEndpointTest.java} | 8 ++++----
5 files changed, 11 insertions(+), 16 deletions(-)
rename intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/{IntelliFormMapper.java => DepositDataMapper.java} (99%)
rename intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/{IntelliFormEndpoint.java => FormDataEndpoint.java} (94%)
rename intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/{IntelliFormMapperTest.java => DepositDataMapperTest.java} (96%)
rename intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/{IntelliFormEndpointITCase.java => FormDataEndpointITCase.java} (99%)
rename intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/{IntelliFormEndpointTest.java => FormDataEndpointTest.java} (92%)
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
similarity index 99%
rename from intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormMapper.java
rename to intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
index b073dd97..7bfe6675 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositDataMapper.java
@@ -47,7 +47,7 @@ import lombok.RequiredArgsConstructor;
@Component
@RequiredArgsConstructor
-class IntelliFormMapper {
+class DepositDataMapper {
public FormData mapToFormData(DepositData depositData) {
// Transform deposit data attachments to incoming files
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpoint.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataEndpoint.java
similarity index 94%
rename from intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpoint.java
rename to intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataEndpoint.java
index bf079af2..f9caf285 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpoint.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/FormDataEndpoint.java
@@ -37,12 +37,11 @@ import org.springframework.ws.server.endpoint.annotation.RequestPayload;
import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
-import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
@Endpoint
@Log4j2
-public class IntelliFormEndpoint {
+public class FormDataEndpoint {
private static final String NAMESPACE_URI = "http://xmlns.cit.de/intelliform/2009/webservices/backend";
@@ -53,7 +52,7 @@ public class IntelliFormEndpoint {
@Autowired
- private IntelliFormMapper intelliFormMapper;
+ private DepositDataMapper depositDataMapper;
@Autowired
private SemantikAdapter semantikAdapter;
@@ -62,7 +61,7 @@ public class IntelliFormEndpoint {
public JAXBElement<DepositResponse> inputFormData(@RequestPayload Deposit deposit)
throws IOException, ParserConfigurationException {
try {
- var formData = intelliFormMapper.mapToFormData(deposit.getData());
+ var formData = depositDataMapper.mapToFormData(deposit.getData());
semantikAdapter.processFormData(formData);
} catch (Exception e) {
LOG.error("Error processing form data", e);
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
similarity index 96%
rename from intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormMapperTest.java
rename to intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
index c394c2b2..ac6a615b 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/DepositDataMapperTest.java
@@ -46,10 +46,10 @@ import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import lombok.SneakyThrows;
-class IntelliFormMapperTest {
+class DepositDataMapperTest {
@Spy
- private IntelliFormMapper mapper;
+ private DepositDataMapper mapper;
@DisplayName("map to form data")
@Nested
@@ -133,10 +133,6 @@ class IntelliFormMapperTest {
return mapper.mapToFormData(depositData);
}
- private List<String> expectedAttachmentIds(List<Attachment> attachmentList) {
- return attachmentList.stream().map(attachment -> attachment.id).toList();
- }
-
}
@DisplayName("map attachment to incoming file")
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointITCase.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
similarity index 99%
rename from intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointITCase.java
rename to intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
index 06ea34c2..03c8db43 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointITCase.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointITCase.java
@@ -56,7 +56,7 @@ import de.ozgcloud.vorgang.vorgang.GrpcIncomingFileGroup;
import lombok.SneakyThrows;
@SpringBootTest
-class IntelliFormEndpointITCase {
+class FormDataEndpointITCase {
private final static String TEST_FILE_PATH = "classpath:itcase/";
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
similarity index 92%
rename from intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointTest.java
rename to intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
index 2466e384..b58584e8 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/IntelliFormEndpointTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
@@ -42,18 +42,18 @@ import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
-class IntelliFormEndpointTest {
+class FormDataEndpointTest {
@InjectMocks
- private IntelliFormEndpoint formdataEndpointIntelli;
+ private FormDataEndpoint formdataEndpointIntelli;
@Mock
- private IntelliFormMapper intelliFormMapper;
+ private DepositDataMapper depositDataMapper;
@Mock
private SemantikAdapter semantikAdapter;
@BeforeEach
void init() throws SAXException, IOException, ParserConfigurationException {
- when(intelliFormMapper.mapToFormData(any())).thenReturn(FormDataTestFactory.create());
+ when(depositDataMapper.mapToFormData(any())).thenReturn(FormDataTestFactory.create());
}
@Test
--
GitLab