diff --git a/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java index 3603b84361aee6103e5956c3e69091349fc783ef..6cce21a27b16bcf67062209a83427366ba35b583 100644 --- a/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java +++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/ServiceKonto.java @@ -38,7 +38,7 @@ public class ServiceKonto { private final String value; - public static boolean hasValue(String trustLevelValue) { + public static boolean exists(String trustLevelValue) { if (StringUtils.isBlank(trustLevelValue)) { return false; } diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/TrustLevelTest.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/TrustLevelTest.java index e5aeaeee64d28e71c8bc23b539b9350dcee6f759..93c12966a7e2b57ae3053bb583e585d6683025d9 100644 --- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/TrustLevelTest.java +++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/TrustLevelTest.java @@ -15,7 +15,7 @@ class TrustLevelTest { @ParameterizedTest(name = "trust level is {0}") @ValueSource(strings = {"STORK-QAA-Level-1", "STORK-QAA-Level-2", "STORK-QAA-Level-3", "STORK-QAA-Level-4"}) void shouldReturnTrue(String trustLevel) { - var isValid = TrustLevel.hasValue(trustLevel); + var isValid = TrustLevel.exists(trustLevel); assertThat(isValid).isTrue(); } @@ -25,7 +25,7 @@ class TrustLevelTest { @NullAndEmptySource @ValueSource(strings = {"STORK-QAA-Level-0", "unexpected"}) void shouldReturnFalse(String trustLevel) { - var isValid = TrustLevel.hasValue(trustLevel); + var isValid = TrustLevel.exists(trustLevel); assertThat(isValid).isFalse(); } diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java index 1d7c4d78195cbd29954d77efa8d3e0306714cb95..0b7320fbe23a0a9820ccebfa9c82fd78347798f4 100644 --- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java +++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactory.java @@ -103,7 +103,7 @@ public class ServiceKontoFactory { } boolean isValidTrustLevel(Map<String, Object> formDataHeader) { - return TrustLevel.hasValue(getTrustLevel(formDataHeader)); + return TrustLevel.exists(getTrustLevel(formDataHeader)); } ServiceKonto buildBayernIdServiceKonto(Map<String, Object> formDataHeaders) { @@ -114,10 +114,6 @@ public class ServiceKontoFactory { .build(); } - String getTrustLevel(Map<String, Object> formDataHeaders) { - return MapUtils.getString(formDataHeaders, KEY_BAYERN_ID_TRUST_LEVEL); - } - PostfachAddress buildPostfachAddress(String postkorbHandle) { return PostfachAddress.builder() .type(POSTFACH_ADDRESS_DEFAULT) @@ -130,4 +126,8 @@ public class ServiceKontoFactory { return StringBasedIdentifier.builder().postfachId(postfachId).build(); } + String getTrustLevel(Map<String, Object> formDataHeaders) { + return MapUtils.getString(formDataHeaders, KEY_BAYERN_ID_TRUST_LEVEL); + } + } \ 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 b4b5ab0ce07bdc25f63cfab3d61dd1c414be2c87..b3e75f0cd900dd24d9095c7953939ae450d5db5c 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 @@ -37,7 +37,7 @@ public class DFoerdermittelEngineBasedSemantikAdapter implements EngineBasedSema private static final String KEY_ORGANISATIONS_EINHEIT_ID = "MetaText1"; @Autowired - private ServiceKontoFactory serviceKontoHelper; + private ServiceKontoFactory serviceKontoFactory; @Override public FormData parseFormData(FormData formData) { @@ -109,7 +109,7 @@ public class DFoerdermittelEngineBasedSemantikAdapter implements EngineBasedSema } private ServiceKonto createServiceKonto(String postfachId) { - return serviceKontoHelper.buildOsiServiceKonto(postfachId); + return serviceKontoFactory.buildOsiServiceKonto(postfachId); } FormData parseFachnachricht(FormData formData, IncomingFile fachnachrichtFile) { diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java index 3dad1ae2a7065463778a4686b788e6c9e8368659..66d9d3e302806e9b4aab54e4bba79627488e92fe 100644 --- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java +++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ServiceKontoFactoryTest.java @@ -208,18 +208,18 @@ class ServiceKontoFactoryTest { class TestIsValidTrustLevel { @Test - void shouldCallHasValue() { + void shouldCallExists() { try (var trustLevelMock = mockStatic(TrustLevel.class)) { isValidTrustLevel(); - trustLevelMock.verify(() -> TrustLevel.hasValue(ServiceKontoTestFactory.TRUST_LEVEL)); + trustLevelMock.verify(() -> TrustLevel.exists(ServiceKontoTestFactory.TRUST_LEVEL)); } } @Test void shouldReturnValue() { try (var trustLevelMock = mockStatic(TrustLevel.class)) { - trustLevelMock.when(() -> TrustLevel.hasValue(any())).thenReturn(true); + trustLevelMock.when(() -> TrustLevel.exists(any())).thenReturn(true); var result = isValidTrustLevel(); @@ -280,7 +280,7 @@ class ServiceKontoFactoryTest { assertThat(serviceKonto.getTrustLevel()).isEqualTo(TRUST_LEVEL); } - ServiceKonto buildBayernIdServiceKonto() { + private ServiceKonto buildBayernIdServiceKonto() { return factory.buildBayernIdServiceKonto(formDataHeaders); } } 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 d14770260edf220ca850f9fda3e312f37a2dd1d5..05473793842bc54d734988d7cf1ad872d5789b7a 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 @@ -33,7 +33,7 @@ class DFoerdermittelEngineBasedSemantikAdapterTest { private DFoerdermittelEngineBasedSemantikAdapter adapter; @Mock - private ServiceKontoFactory serviceKontoHelper; + private ServiceKontoFactory serviceKontoFactory; @Nested class TestIsResponsible { @@ -174,7 +174,7 @@ class DFoerdermittelEngineBasedSemantikAdapterTest { @BeforeEach void init() { - when(serviceKontoHelper.buildOsiServiceKonto(any())).thenReturn(ServiceKontoTestFactory.create()); + when(serviceKontoFactory.buildOsiServiceKonto(any())).thenReturn(ServiceKontoTestFactory.create()); } @Test @@ -191,7 +191,7 @@ class DFoerdermittelEngineBasedSemantikAdapterTest { void shouldRemovePrefix() { adapter.addServiceKonto(DFoerdermittelFormDataTestFactory.create(), DFoerdermittelFormDataTestFactory.createFachnachrichtMap()); - verify(serviceKontoHelper).buildOsiServiceKonto(DFoerdermittelFormDataTestFactory.POSTFACH_ID); + verify(serviceKontoFactory).buildOsiServiceKonto(DFoerdermittelFormDataTestFactory.POSTFACH_ID); } }