Merge pull request 'handle null values' (#15) from fix-npe into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/collaboration-manager/pulls/15


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/vorgang/CollaborationAntragstellerMapper.java

@@ -2,16 +2,21 @@ package de.ozgcloud.collaboration.vorgang;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
 
 import de.ozgcloud.apilib.vorgang.OzgCloudAntragsteller;
 import de.ozgcloud.collaboration.GrpcAntragsteller;
 
-@Mapper(uses = { CollaborationFormDataMapper.class }, unmappedTargetPolicy = ReportingPolicy.WARN)
+@Mapper(uses = { CollaborationFormDataMapper.class },
+		nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS,
+		unmappedTargetPolicy = ReportingPolicy.WARN)
 interface CollaborationAntragstellerMapper {
 
 	Antragsteller fromOzgCloudAntragsteller(OzgCloudAntragsteller antragsteller);
 
+	@Mapping(target = "otherDataOrBuilder", ignore = true)
+	@Mapping(target = "defaultInstanceForType", ignore = true)
 	@Mapping(target = "mergeFrom", ignore = true)
 	@Mapping(target = "clearField", ignore = true)
 	@Mapping(target = "clearOneof", ignore = true)

collaboration-manager-server/src/main/java/de/ozgcloud/collaboration/vorgang/CollaborationFormDataMapper.java

 package de.ozgcloud.collaboration.vorgang;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
+import org.mapstruct.NullValueCheckStrategy;
 import org.mapstruct.ReportingPolicy;
 
 import de.ozgcloud.apilib.vorgang.OzgCloudFormDataEntry;
@@ -16,22 +20,27 @@ import de.ozgcloud.collaboration.GrpcFormField;
 import de.ozgcloud.collaboration.GrpcSubForm;
 import de.ozgcloud.collaboration.GrpcSubFormData;
 
-@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN)
+@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface CollaborationFormDataMapper {
 
 	default List<FormDataEntry> fromOzgCloudEntries(List<OzgCloudFormDataEntry> entries) {
+		if (CollectionUtils.isEmpty(entries)) {
+			return Collections.emptyList();
+		}
 		return Stream.concat(fromOzgCloudFormFields(entries), fromOzgCloudSubForms(entries)).toList();
 	}
 
 	default Stream<FormDataEntry> fromOzgCloudFormFields(List<OzgCloudFormDataEntry> entries) {
-		return entries.stream()
+		return Optional.ofNullable(entries).stream()
+				.flatMap(List::stream)
 				.filter(OzgCloudFormDataEntry::isFormEntry)
 				.map(OzgCloudFormField.class::cast)
 				.map(this::fromOzgCloudFormField);
 	}
 
 	default Stream<FormDataEntry> fromOzgCloudSubForms(List<OzgCloudFormDataEntry> entries) {
-		return entries.stream()
+		return Optional.ofNullable(entries).stream()
+				.flatMap(List::stream)
 				.filter(OzgCloudFormDataEntry::isSubForm)
 				.map(OzgCloudSubForm.class::cast)
 				.map(this::fromOzgCloudSubForm);
@@ -63,16 +72,18 @@ public interface CollaborationFormDataMapper {
 				.build();
 	}
 
-	default Stream<GrpcSubFormData> fromFormField(List<FormDataEntry> entry) {
-		return entry.stream()
+	default Stream<GrpcSubFormData> fromFormField(List<FormDataEntry> entries) {
+		return Optional.ofNullable(entries).stream()
+				.flatMap(List::stream)
 				.filter(FormDataEntry::isFormEntry)
 				.map(FormField.class::cast)
 				.map(this::toGrpcFormField)
 				.map(formField -> GrpcSubFormData.newBuilder().setField(formField).build());
 	}
 
-	default Stream<GrpcSubFormData> fromSubForm(List<FormDataEntry> entry) {
-		return entry.stream()
+	default Stream<GrpcSubFormData> fromSubForm(List<FormDataEntry> entries) {
+		return Optional.ofNullable(entries).stream()
+				.flatMap(List::stream)
 				.filter(FormDataEntry::isSubForm)
 				.map(SubForm.class::cast)
 				.map(this::toGrpcSubForm)

collaboration-manager-server/src/test/java/de/ozgcloud/collaboration/vorgang/CollaborationFormDataMapperTest.java

@@ -40,18 +40,22 @@ class CollaborationFormDataMapperTest {
 		private final FormField formField = FormDataEntryTestFactory.createFormField();
 		private final SubForm subForm = FormDataEntryTestFactory.createSubForm();
 
-		@BeforeEach
-		void mock() {
+		@Test
+		void shouldMap() {
 			doReturn(formField).when(mapper).fromOzgCloudFormField(any());
 			doReturn(subForm).when(mapper).fromOzgCloudSubForm(any());
-		}
 
-		@Test
-		void shouldMap() {
 			var entries = mapper.fromOzgCloudEntries(ozgCloudEntries);
 
 			assertThat(entries).containsExactly(formField, subForm);
 		}
+
+		@Test
+		void shouldHandleNullValue() {
+			var entries = mapper.fromOzgCloudEntries(null);
+
+			assertThat(entries).isEmpty();
+		}
 	}
 
 	@DisplayName("From ozgCloudSubForm")
@@ -96,7 +100,7 @@ class CollaborationFormDataMapperTest {
 
 		private final FormField formField = FormDataEntryTestFactory.createFormField();
 		private final SubForm subForm = FormDataEntryTestFactory.createSubForm();
-		private List<FormDataEntry> entries = List.of(formField, subForm);
+		private final List<FormDataEntry> entries = List.of(formField, subForm);
 
 		private final GrpcFormField grpcFormField = GrpcFormDataTestFactory.createFormField();
 		private final GrpcSubForm grpcSubForm = GrpcFormDataTestFactory.createSubForm();