diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java
similarity index 98%
rename from semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java
rename to semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java
index 4f86ad7d1a283a92538e224b315d14e9ea96e0fb..4c16e1473625ace69c74a8ee064973fcb035f346 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.eingang.semantik.enginebased;
+package de.ozgcloud.eingang.semantik.common;
import java.util.Collections;
import java.util.List;
@@ -21,7 +21,7 @@ import lombok.extern.log4j.Log4j2;
@Component
@Log4j2
-public class ServiceKontoBuildHelper {
+public class ServiceKontoFactory {
public static final int POSTFACH_ADDRESS_DEFAULT = 1;
public static final String POSTFACH_TYPE_OSI = "OSI";
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
index 4d2f5ef1528095ef8366e6db9e408fcf572587f4..df134be93dbf148d8cc9f2009d9f2ad6ec6d581d 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.Antragsteller;
import de.ozgcloud.eingang.common.formdata.FormData;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
@Component
public class AfmAntragstellerHeaderMapper {
@@ -33,7 +33,7 @@ public class AfmAntragstellerHeaderMapper {
Antragsteller buildAntragsteller(Map<String, Object> headers) {
return Antragsteller.builder()
- .postfachId(MapUtils.getString(headers, ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID))
+ .postfachId(MapUtils.getString(headers, ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID))
.vorname(MapUtils.getString(headers, KEY_VORNAME))
.nachname(MapUtils.getString(headers, KEY_NACHNAME))
.geburtsname(MapUtils.getString(headers, KEY_GEBURTSNAME))
@@ -48,8 +48,8 @@ public class AfmAntragstellerHeaderMapper {
public boolean isResponsible(FormData formData) {
var headers = getHeaders(formData);
- return headers.containsKey(ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID)
- && isPostfachIdNotBlank(headers.get(ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID));
+ return headers.containsKey(ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID)
+ && isPostfachIdNotBlank(headers.get(ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID));
}
@SuppressWarnings("unchecked")
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
index d88c0f8589dd986ef1833d7f7761b5a4f7102ca6..0f63ef3686963482d332dd1d844e75ae4d2ec865 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapper.java
@@ -35,7 +35,7 @@ import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataUtils;
import de.ozgcloud.eingang.common.formdata.FormHeader;
import de.ozgcloud.eingang.common.formdata.ServiceKonto;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
@Component
class AfmHeaderMapper implements AfmEngineBasedMapper {
@@ -53,7 +53,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
static final String SENDER = "t:sender";
@Autowired
- private ServiceKontoBuildHelper serviceKontoBuildHelper;
+ private ServiceKontoFactory serviceKontoFactory;
@Override
public FormData parseFormData(FormData formData) {
@@ -84,7 +84,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
}
Optional<ServiceKonto> createBayernIdServiceKonto(FormData formData) {
- return serviceKontoBuildHelper.createBayernIdServiceKonto(getHeaderMap(formData));
+ return serviceKontoFactory.createBayernIdServiceKonto(getHeaderMap(formData));
}
@SuppressWarnings("unchecked")
@@ -93,7 +93,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
}
Optional<ServiceKonto> createOsiServiceKonto(FormData formData) {
- return getNameId(formData).map(nameId -> serviceKontoBuildHelper.buildOsiServiceKonto(nameId, formData));
+ return getNameId(formData).map(nameId -> serviceKontoFactory.buildOsiServiceKonto(nameId, formData));
}
private Optional<String> getNameId(FormData formData) {
@@ -102,7 +102,7 @@ class AfmHeaderMapper implements AfmEngineBasedMapper {
private FormData removeMappedData(FormData formData) {
return FormDataUtils.from(formData)
- .remove(ServiceKontoBuildHelper.REST_RESPONSE_NAME)
+ .remove(ServiceKontoFactory.REST_RESPONSE_NAME)
.build();
}
}
\ No newline at end of file
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java
index aedb47f05d7d39b109d67b5ba214ac90b3e1d8f7..b4b5ab0ce07bdc25f63cfab3d61dd1c414be2c87 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapter.java
@@ -21,7 +21,7 @@ import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.ServiceKonto;
import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
@@ -37,7 +37,7 @@ public class DFoerdermittelEngineBasedSemantikAdapter implements EngineBasedSema
private static final String KEY_ORGANISATIONS_EINHEIT_ID = "MetaText1";
@Autowired
- private ServiceKontoBuildHelper serviceKontoHelper;
+ private ServiceKontoFactory serviceKontoHelper;
@Override
public FormData parseFormData(FormData formData) {
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
index 0c8bc2d63bcbf51bdfba7f6963cac424c773c7e8..c2b0de118717b7bb54f0af27ef37e123788f3368 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapper.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataUtils;
import de.ozgcloud.eingang.common.formdata.FormHeader;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
@Component
class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper {
@@ -48,7 +48,7 @@ class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper {
public static final String POSTKORBHANDLE = "postkorbhandle";
@Autowired
- private ServiceKontoBuildHelper serviceKontoBuildHelper;
+ private ServiceKontoFactory serviceKontoFactory;
@Override
public FormData parseFormData(FormData formData) {
@@ -66,7 +66,7 @@ class FormSolutionsHeaderMapper implements FormSolutionsEngineBasedMapper {
.requestId(getRequestId(formData))
.formEngineName(FORM_ENGINE_NAME);
- Optional.ofNullable(getPostkorbhandle(formData)).map(serviceKontoBuildHelper::buildOsiServiceKonto).ifPresent(formHeaderBuilder::serviceKonto);
+ Optional.ofNullable(getPostkorbhandle(formData)).map(serviceKontoFactory::buildOsiServiceKonto).ifPresent(formHeaderBuilder::serviceKonto);
return formHeaderBuilder.build();
}
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java
similarity index 91%
rename from semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java
rename to semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java
index 97b0b6a357e393dfaee8dcdc390bf34125c18f2a..825659d38be377fbcee1dfc5ebb60bcc1ba4cbf2 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/ServiceKontoBuildHelperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.eingang.semantik.enginebased;
+package de.ozgcloud.eingang.semantik.common;
import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -8,7 +8,6 @@ import static org.mockito.Mockito.*;
import java.util.List;
import java.util.Map;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
@@ -28,11 +27,11 @@ import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
import de.ozgcloud.eingang.semantik.enginebased.afm.AfmHeaderTestFactory;
-class ServiceKontoBuildHelperTest {
+class ServiceKontoFactoryTest {
@Spy
@InjectMocks
- private ServiceKontoBuildHelper helper;
+ private ServiceKontoFactory helper;
@DisplayName("OSI service konto")
@Nested
@@ -55,7 +54,7 @@ class ServiceKontoBuildHelperTest {
void shouldContainsType() {
var serviceKonto = getServiceKonto(FORM_DATA);
- assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoBuildHelper.POSTFACH_TYPE_OSI);
+ assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoFactory.POSTFACH_TYPE_OSI);
}
@Test
@@ -101,7 +100,7 @@ class ServiceKontoBuildHelperTest {
assertThat(addresses.get(0).getIdentifier()).isInstanceOf(StringBasedIdentifier.class);
assertThat(((StringBasedIdentifier) addresses.get(0).getIdentifier()).getPostfachId())
.isEqualTo(AfmHeaderTestFactory.POSTFACH_NAME_ID);
- assertThat(addresses.get(0).getVersion()).isEqualTo(ServiceKontoBuildHelper.POSTFACH_VERSION);
+ assertThat(addresses.get(0).getVersion()).isEqualTo(ServiceKontoFactory.POSTFACH_VERSION);
assertThat(addresses.get(0).getType()).isEqualTo(PostfachAddressTestFactory.POSTFACH_ADDRESS_TYPE);
}
@@ -115,7 +114,7 @@ class ServiceKontoBuildHelperTest {
class TestWithoutRestResponseName {
private static final FormData FORM_DATA_WITHOUT_REST_RESPONSE_NAME = FormDataUtils.from(FORM_DATA)
- .remove(ServiceKontoBuildHelper.REST_RESPONSE_NAME).build();
+ .remove(ServiceKontoFactory.REST_RESPONSE_NAME).build();
@Test
void shouldBuildDefault() {
@@ -134,7 +133,7 @@ class ServiceKontoBuildHelperTest {
assertThat(((StringBasedIdentifier) addresses.get(0).getIdentifier()).getPostfachId())
.isEqualTo(AfmHeaderTestFactory.POSTFACH_NAME_ID);
- assertThat(addresses.get(0).getVersion()).isEqualTo(ServiceKontoBuildHelper.POSTFACH_VERSION);
+ assertThat(addresses.get(0).getVersion()).isEqualTo(ServiceKontoFactory.POSTFACH_VERSION);
assertThat(addresses.get(0).getType()).isEqualTo(1);
}
@@ -156,8 +155,8 @@ class ServiceKontoBuildHelperTest {
private static final PostfachAddress POSTFACH_ADDRESS = PostfachAddressTestFactory.create();
private final Map<String, Object> formDataHeaders = Map.of(
- ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID, POSTFACH_ID,
- ServiceKontoBuildHelper.KEY_BAYERN_ID_TRUST_LEVEL, "STORK-QAA-Level-2"
+ ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID, POSTFACH_ID,
+ ServiceKontoFactory.KEY_BAYERN_ID_TRUST_LEVEL, "STORK-QAA-Level-2"
);
@DisplayName("should return empty when headers map is null")
@@ -212,8 +211,8 @@ class ServiceKontoBuildHelperTest {
private static final String TRUST_LEVEL = "STORK-QAA-Level-2";
private final Map<String, Object> formDataHeaders = Map.of(
- ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID, POSTFACH_ID,
- ServiceKontoBuildHelper.KEY_BAYERN_ID_TRUST_LEVEL, TRUST_LEVEL);
+ ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID, POSTFACH_ID,
+ ServiceKontoFactory.KEY_BAYERN_ID_TRUST_LEVEL, TRUST_LEVEL);
@BeforeEach
void init() {
@@ -224,7 +223,7 @@ class ServiceKontoBuildHelperTest {
void shouldSetType() {
var serviceKonto = buildBayernIdServiceKonto();
- assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoBuildHelper.POSTFACH_TYPE_BAYERN_ID);
+ assertThat(serviceKonto.getType()).isEqualTo(ServiceKontoFactory.POSTFACH_TYPE_BAYERN_ID);
}
@Test
@@ -267,7 +266,7 @@ class ServiceKontoBuildHelperTest {
private static final String TRUST_LEVEL = "STORK-QAA-Level-2";
- private final Map<String, Object> formDataHeaders = Map.of(ServiceKontoBuildHelper.KEY_BAYERN_ID_TRUST_LEVEL, TRUST_LEVEL);
+ private final Map<String, Object> formDataHeaders = Map.of(ServiceKontoFactory.KEY_BAYERN_ID_TRUST_LEVEL, TRUST_LEVEL);
@Test
void shouldCallValidateTrustLevel() {
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java
index cfcf063d1e081e8841e18404849ebe1b4ab5c448..c5c99d30268b7e40f00ef05af208d0a346052bd0 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapperTest.java
@@ -20,7 +20,7 @@ import org.mockito.Spy;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.AntragstellerTestFactory;
import de.ozgcloud.eingang.common.formdata.FormData;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
class AfmAntragstellerHeaderMapperTest {
@@ -146,7 +146,7 @@ class AfmAntragstellerHeaderMapperTest {
@Test
void shouldApproveResponsibility() {
doReturn(true).when(mapper).isPostfachIdNotBlank(any());
- doReturn(createHeaders(ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID, "123")).when(mapper).getHeaders(any());
+ doReturn(createHeaders(ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID, "123")).when(mapper).getHeaders(any());
var isResponsible = mapper.isResponsible(formData);
@@ -176,7 +176,7 @@ class AfmAntragstellerHeaderMapperTest {
@Test
void shouldDenyWhenPostfachIdIsBlank() {
- doReturn(createHeaders(ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID, null)).when(mapper).getHeaders(any());
+ doReturn(createHeaders(ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID, null)).when(mapper).getHeaders(any());
doReturn(false).when(mapper).isPostfachIdNotBlank(any());
var isResponsible = mapper.isResponsible(formData);
@@ -217,7 +217,7 @@ class AfmAntragstellerHeaderMapperTest {
@Test
void shouldReturnHeaders() {
- var headers = createHeaders(ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID, "123");
+ var headers = createHeaders(ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID, "123");
var formData = FormData.builder().formData(createHeaders(AfmHeaderMapper.HEADER_FIELD, headers)).build();
var result = mapper.getHeaders(formData);
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
index 6ea3508c17bddebadf6169c1ba8880ce640940f5..7af0dcd5c208e6c3989c0e8be54948e382c45ac6 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderMapperTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
-import java.util.Map;
import java.util.Optional;
import org.junit.jupiter.api.DisplayName;
@@ -40,7 +39,7 @@ import org.mockito.Spy;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataUtils;
import de.ozgcloud.eingang.common.formdata.ServiceKonto;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
class AfmHeaderMapperTest {
@@ -48,7 +47,7 @@ class AfmHeaderMapperTest {
@InjectMocks
private AfmHeaderMapper mapper;
@Mock
- private ServiceKontoBuildHelper serviceKontoBuildHelper;
+ private ServiceKontoFactory serviceKontoFactory;
@DisplayName("Parse form data")
@Nested
@@ -124,14 +123,14 @@ class AfmHeaderMapperTest {
void shouldCallBuildServiceKontoIfPresent() {
parseFormData();
- verify(serviceKontoBuildHelper).buildOsiServiceKonto(any(), eq(FORM_DATA));
+ verify(serviceKontoFactory).buildOsiServiceKonto(any(), eq(FORM_DATA));
}
@Test
void shouldNotCallBuildServiceKontoIfNotExists() {
mapper.parseFormData(FormDataUtils.from(FORM_DATA).remove(AfmHeaderMapper.POSTFACH_NAME_ID).build());
- verify(serviceKontoBuildHelper, never()).buildOsiServiceKonto(any(), any());
+ verify(serviceKontoFactory, never()).buildOsiServiceKonto(any(), any());
}
}
@@ -155,7 +154,7 @@ class AfmHeaderMapperTest {
@Test
void shouldReturnServiceKonto() {
- when(serviceKontoBuildHelper.createBayernIdServiceKonto(any())).thenReturn(Optional.of(serviceKonto));
+ when(serviceKontoFactory.createBayernIdServiceKonto(any())).thenReturn(Optional.of(serviceKonto));
var parsedFormData = mapper.createBayernIdServiceKonto(formData);
@@ -181,7 +180,7 @@ class AfmHeaderMapperTest {
void shouldRemoveRestResponseName() {
var parsedFormData = parseFormData();
- assertThat(parsedFormData.getFormData().get(ServiceKontoBuildHelper.REST_RESPONSE_NAME)).isNull();
+ assertThat(parsedFormData.getFormData().get(ServiceKontoFactory.REST_RESPONSE_NAME)).isNull();
}
private FormData parseFormData() {
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
index f85611501a5ebd481a17e4b87752b436a48132d1..ff8b85d511d22fd84c3a3302d29c2fe58b31eb78 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmHeaderTestFactory.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
public class AfmHeaderTestFactory {
@@ -57,7 +57,7 @@ public class AfmHeaderTestFactory {
var map = new HashMap<String, Object>();
map.put(AfmHeaderMapper.HEADER_FIELD, createHeaderMap());
map.put(AfmHeaderMapper.POSTFACH_NAME_ID, POSTFACH_NAME_ID);
- map.put(ServiceKontoBuildHelper.REST_RESPONSE_NAME, List.of(createRestResponseNameMap()));
+ map.put(ServiceKontoFactory.REST_RESPONSE_NAME, List.of(createRestResponseNameMap()));
return map;
}
@@ -81,7 +81,7 @@ public class AfmHeaderTestFactory {
public static Map<String, Object> createCustomHeaderMap() {
var map = new HashMap<String, Object>();
- map.put(ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID, CUSTOM_POSTFACH_ID);
+ map.put(ServiceKontoFactory.KEY_BAYERN_ID_POSTFACH_ID, CUSTOM_POSTFACH_ID);
map.put(AfmAntragstellerHeaderMapper.KEY_VORNAME, CUSTOM_VORNAME);
map.put(AfmAntragstellerHeaderMapper.KEY_NACHNAME, CUSTOM_NACHNAME);
map.put(AfmAntragstellerHeaderMapper.KEY_GEBURTSNAME, CUSTOM_GEBURTSNAME);
@@ -95,10 +95,10 @@ public class AfmHeaderTestFactory {
}
public static Map<String, Object> createRestResponseNameMap() {
- return Map.of(ServiceKontoBuildHelper.REST_RESPONSE_NAME_MEMBER_SCOPE, List.of(createRestResponseNameMemberScopeMap()));
+ return Map.of(ServiceKontoFactory.REST_RESPONSE_NAME_MEMBER_SCOPE, List.of(createRestResponseNameMemberScopeMap()));
}
private static Map<String, Object> createRestResponseNameMemberScopeMap() {
- return Map.of(ServiceKontoBuildHelper.REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE, REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE_VALUE);
+ return Map.of(ServiceKontoFactory.REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE, REST_RESPONSE_NAME_MEMBER_SCOPE_MAILBOX_TYPE_VALUE);
}
}
\ No newline at end of file
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
index cccd254d34afde615debd689c4c5f73fd1c7dd5d..d14770260edf220ca850f9fda3e312f37a2dd1d5 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/dfoerdermittel/DFoerdermittelEngineBasedSemantikAdapterTest.java
@@ -24,7 +24,7 @@ import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
import de.ozgcloud.eingang.common.formdata.ServiceKontoTestFactory;
import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
class DFoerdermittelEngineBasedSemantikAdapterTest {
@@ -33,7 +33,7 @@ class DFoerdermittelEngineBasedSemantikAdapterTest {
private DFoerdermittelEngineBasedSemantikAdapter adapter;
@Mock
- private ServiceKontoBuildHelper serviceKontoHelper;
+ private ServiceKontoFactory serviceKontoHelper;
@Nested
class TestIsResponsible {
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
index 89c782671e7e568ffebc70299df1fc8431499a71..56df1f639ff2bac7f59b24ba6d36bf387227ee59 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsHeaderMapperTest.java
@@ -38,7 +38,7 @@ import org.mockito.Spy;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataUtils;
import de.ozgcloud.eingang.common.formdata.FormHeader;
-import de.ozgcloud.eingang.semantik.enginebased.ServiceKontoBuildHelper;
+import de.ozgcloud.eingang.semantik.common.ServiceKontoFactory;
class FormSolutionsHeaderMapperTest {
@@ -46,7 +46,7 @@ class FormSolutionsHeaderMapperTest {
@InjectMocks
private final FormSolutionsHeaderMapper mapper = new FormSolutionsHeaderMapper();
@Mock
- private ServiceKontoBuildHelper serviceKontoBuildHelper;
+ private ServiceKontoFactory serviceKontoFactory;
@DisplayName("Parse formData")
@Nested
@@ -119,7 +119,7 @@ class FormSolutionsHeaderMapperTest {
void shouldCallServiceKontoBuildHelper() {
buildFormHeader();
- verify(serviceKontoBuildHelper).buildOsiServiceKonto(any());
+ verify(serviceKontoFactory).buildOsiServiceKonto(any());
}
@Test
@@ -128,7 +128,7 @@ class FormSolutionsHeaderMapperTest {
mapper.buildFormHeader(formDataWithoutPostkorbHandle);
- verify(serviceKontoBuildHelper, never()).buildOsiServiceKonto(any());
+ verify(serviceKontoFactory, never()).buildOsiServiceKonto(any());
}
}