OZG-4428 process non string data

enterprise-adapter/src/main/resources/application-local.yml

@@ -6,6 +6,12 @@ server:
   error:
     include-stacktrace: always
     
+management:
+  server:
+    port: 0
+  endpoints:
+    enabled-by-default: false
+
 kop:
   adapter:
     targetPlutoName: local

enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapperTest.java

@@ -15,6 +15,7 @@ import org.mockito.Spy;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import de.itvsh.kop.common.test.TestUtils;
 import de.ozgcloud.eingang.common.formdata.FormData;
@@ -30,7 +31,9 @@ class EntryDataMapperTest {
 	private FormDataMapper formDataMapper;
 
 	@Spy
-	private ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
+	private ObjectMapper objectMapper = new ObjectMapper()
+			.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true)
+			.registerModule(new JavaTimeModule());
 
 	@Nested
 	class TestMappingEntryData {

enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryFormDataTestFactory.java

@@ -2,6 +2,7 @@ package de.ozgcloud.eingang.enterprise.entry;
 
 import static de.ozgcloud.eingang.enterprise.entry.FormDataMapper.*;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -14,19 +15,45 @@ public class EntryFormDataTestFactory {
 	public static final String SUB_FORM_NAME = "antragsteller";
 	public static final String SUB_FORM_LABEL = "Antragstellende Person";
 
-	public static final String SUB_FORM_FIELD_NAME = "lastname";
-	public static final String SUB_FORM_FIELD_LABEL = "Nachname";
-	public static final String SUB_FORM_FIELD_VALUE = "Täst";
+	public static final String SUB_FORM_STRING_FIELD_NAME = "lastname";
+	public static final String SUB_FORM_STRING_FIELD_LABEL = "Nachname";
+	public static final String SUB_FORM_STRING_FIELD_VALUE = "Täst";
+
+	public static final String SUB_FORM_NUMBER_FIELD_NAME = "age";
+	public static final String SUB_FORM_NUMBER_FIELD_LABEL = "Alter";
+	public static final Number SUB_FORM_NUMBER_FIELD_VALUE = 5.5;
+
+	public static final String SUB_FORM_DATE_FIELD_NAME = "birthday";
+	public static final String SUB_FORM_DATE_FIELD_LABEL = "Geburtsdatum";
+	public static final LocalDate SUB_FORM_DATE_FIELD_VALUE = LocalDate.parse("2017-05-01");
+
+	public static final String SUB_FORM_BOOLEAN_FIELD_NAME = "geprüft";
+	public static final String SUB_FORM_BOOLEAN_FIELD_LABEL = "Geprüft";
+	public static final Boolean SUB_FORM_BOOLEAN_FIELD_VALUE = true;
 
 	public static List<EntryFormDataItem> create() {
 		return List.of(
 				EntryFormDataField.builder().name(FORM_FIELD_NAME).label(FORM_FIELD_LABEL).stringValue(FORM_FIELD_VALUE).build(),
 				EntryFormDataSubForm.builder().name(SUB_FORM_NAME).label(SUB_FORM_LABEL)
-						.formItem(
-								EntryFormDataField.builder()
-										.name(SUB_FORM_FIELD_NAME)
-										.label(SUB_FORM_FIELD_LABEL)
-										.stringValue(SUB_FORM_FIELD_VALUE)
+						.formItem(EntryFormDataField.builder()
+								.name(SUB_FORM_STRING_FIELD_NAME)
+								.label(SUB_FORM_STRING_FIELD_LABEL)
+								.stringValue(SUB_FORM_STRING_FIELD_VALUE)
+								.build())
+						.formItem(EntryFormDataField.builder()
+								.name(SUB_FORM_NUMBER_FIELD_NAME)
+								.label(SUB_FORM_NUMBER_FIELD_LABEL)
+								.numberValue(SUB_FORM_NUMBER_FIELD_VALUE)
+								.build())
+						.formItem(EntryFormDataField.builder()
+								.name(SUB_FORM_DATE_FIELD_NAME)
+								.label(SUB_FORM_DATE_FIELD_LABEL)
+								.dateValue(SUB_FORM_DATE_FIELD_VALUE)
+								.build())
+						.formItem(EntryFormDataField.builder()
+								.name(SUB_FORM_BOOLEAN_FIELD_NAME)
+								.label(SUB_FORM_BOOLEAN_FIELD_LABEL)
+								.booleanValue(SUB_FORM_BOOLEAN_FIELD_VALUE)
 								.build())
 						.build());
 	}
@@ -35,6 +62,9 @@ public class EntryFormDataTestFactory {
 		return Map.of(
 				FORM_FIELD_NAME, Map.of(LABEL_KEY, FORM_FIELD_LABEL, VALUE_KEY, FORM_FIELD_VALUE),
 				SUB_FORM_NAME, Map.of(LABEL_KEY, SUB_FORM_LABEL, VALUE_KEY, Map.of(
-						SUB_FORM_FIELD_NAME, Map.of(LABEL_KEY, SUB_FORM_FIELD_LABEL, VALUE_KEY, SUB_FORM_FIELD_VALUE))));
+						SUB_FORM_STRING_FIELD_NAME, Map.of(LABEL_KEY, SUB_FORM_STRING_FIELD_LABEL, VALUE_KEY, SUB_FORM_STRING_FIELD_VALUE),
+						SUB_FORM_NUMBER_FIELD_NAME, Map.of(LABEL_KEY, SUB_FORM_NUMBER_FIELD_LABEL, VALUE_KEY, SUB_FORM_NUMBER_FIELD_VALUE),
+						SUB_FORM_DATE_FIELD_NAME, Map.of(LABEL_KEY, SUB_FORM_DATE_FIELD_LABEL, VALUE_KEY, SUB_FORM_DATE_FIELD_VALUE),
+						SUB_FORM_BOOLEAN_FIELD_NAME, Map.of(LABEL_KEY, SUB_FORM_BOOLEAN_FIELD_LABEL, VALUE_KEY, SUB_FORM_BOOLEAN_FIELD_VALUE))));
 	}
 }

enterprise-adapter/src/test/resources/request/simple.json

@@ -26,6 +26,18 @@
 					"name": "lastname",
 					"label": "Nachname",
 					"stringValue": "Täst"
+				}, {
+					"name": "age",
+					"label": "Alter",
+					"numberValue": 5.5
+				}, { 
+					"name": "birthday",
+					"label": "Geburtsdatum",
+					"dateValue": "2017-05-01"
+				}, {
+					"name": "geprüft",
+					"label": "Geprüft",
+					"booleanValue": true
 				}
 			]
 		}

pom.xml

@@ -58,7 +58,7 @@
 	<properties>
 		<mapstruct.version>1.4.2.Final</mapstruct.version>
 
-		<pluto.version>1.10.0</pluto.version>
+		<pluto.version>1.16.0-SNAPSHOT</pluto.version>
 
 		<jsoup.version>1.14.3</jsoup.version>
 		<xmlschema.version>2.3.0</xmlschema.version>