KOP-2694 KOP-3045 add origin and delivery timestamps to XtaMessageMetadata

deliveryAttributes.origin and deliveryAttributes.delivery from MessageMetaData

src/main/java/de/ozgcloud/xta/client/mapper/ResponseMapper.java

@@ -51,6 +51,8 @@ public interface ResponseMapper {
 	@Mapping(target = "authorIdentifier", source = "originators.author.identifier")
 	@Mapping(target = "readerIdentifier", source = "destinations.reader.identifier")
 	@Mapping(target = "messageSize", source = "msgSize")
+	@Mapping(target = "deliveryAttributesOrigin", source = "deliveryAttributes.origin")
+	@Mapping(target = "deliveryAttributesDelivery", source = "deliveryAttributes.delivery")
 	XtaMessageMetaData mapXtaMessageMetaData(MessageMetaData messageMetaData);
 
 	@Named("mapBusinessScenarioCode")
@@ -83,7 +85,7 @@ public interface ResponseMapper {
 	XtaTransportReport mapXtaTransportReport(TransportReport transportReport);
 
 	default ZonedDateTime mapZonedDateTime(XMLGregorianCalendar xmlGregorianCalendar) {
-		return xmlGregorianCalendar.toGregorianCalendar().toZonedDateTime();
+		return xmlGregorianCalendar == null ? null : xmlGregorianCalendar.toGregorianCalendar().toZonedDateTime();
 	}
 
 	default XtaMessageStatus mapXtaMessageStatus(MessageStatusType statusType) {