diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapper.java index 0c10729d0c590ade07b160da796b50909c1f54cb..4266a59f2abc000ecfee82567ebb7a04f823df40 100644 --- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapper.java +++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapper.java @@ -34,10 +34,10 @@ public class MantelantragFormBasedMapper implements FormBasedMapper { @Override public boolean isResponsible(FormData formData) { - return formData - .getHeader() - .getFormId() - .equals(MANTELANTRAG_FORM_ID); + return Optional.ofNullable(formData.getHeader()) + .flatMap(header -> Optional.ofNullable(header.getFormId())) + .map(MANTELANTRAG_FORM_ID::equals) + .orElse(false); } @Override diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapperTest.java index 5bc55d0d97d695f85273fcba3f0353615b0d4b3d..ae15e0d29613a93faa2bd5349ab53a38f820b035 100644 --- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapperTest.java +++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragFormBasedMapperTest.java @@ -63,6 +63,32 @@ class MantelantragFormBasedMapperTest { assertThat(isResponsibleResult).isFalse(); } + @DisplayName("should be false if header null") + @Test + void shouldBeFalseIfHeaderNull() { + var formData = FormDataTestFactory.createBuilder() + .header(null) + .build(); + + var isResponsibleResult = mapper.isResponsible(formData); + + assertThat(isResponsibleResult).isFalse(); + } + + @DisplayName("should be false if form id null") + @Test + void shouldBeFalseIfFormIdNull() { + var formData = FormDataTestFactory.createBuilder() + .header(FormHeaderTestFactory.createBuilder() + .formId(null) + .build()) + .build(); + + var isResponsibleResult = mapper.isResponsible(formData); + + assertThat(isResponsibleResult).isFalse(); + } + private FormData createWithFormId(String formId) { return FormDataTestFactory.createBuilder() .header(FormHeaderTestFactory.createBuilder()