#120 Making built-in methods null-safe

processor/src/main/resources/org.mapstruct.ap.builtin.CalendarToXmlGregorianCalendar.ftl

@@ -19,6 +19,10 @@
 
 -->
 private XMLGregorianCalendar ${name}( Calendar cal ) {
+    if ( cal == null ) {
+        return null;
+    }
+
     try {
         GregorianCalendar gcal = new GregorianCalendar();
         gcal.setTimeInMillis( cal.getTimeInMillis() );
@@ -27,4 +31,4 @@ private XMLGregorianCalendar ${name}( Calendar cal ) {
     catch ( DatatypeConfigurationException ex ) {
         throw new RuntimeException( ex );
     }
-}
+}

processor/src/main/resources/org.mapstruct.ap.builtin.DateToXmlGregorianCalendar.ftl

@@ -19,6 +19,10 @@
 
 -->
 private XMLGregorianCalendar ${name}( Date date ) {
+    if ( date == null ) {
+        return null;
+    }
+
     try {
         GregorianCalendar c = new GregorianCalendar();
         c.setTime( date );
@@ -27,4 +31,4 @@ private XMLGregorianCalendar ${name}( Date date ) {
     catch ( DatatypeConfigurationException ex ) {
         throw new RuntimeException( ex );
     }
-}
+}

processor/src/main/resources/org.mapstruct.ap.builtin.JaxbElemToValue.ftl

@@ -19,5 +19,9 @@
 
 -->
 private <T> T ${name}( JAXBElement <T> element ) {
+    if ( element == null ) {
+        return null;
+    }
+
     return element.isNil() ? null : element.getValue();
 }

processor/src/main/resources/org.mapstruct.ap.builtin.StringToXmlGregorianCalendar.ftl

@@ -19,6 +19,10 @@
 
 -->
 private XMLGregorianCalendar ${name}( String date, String dateFormat ) {
+    if ( date == null ) {
+        return null;
+    }
+
     try {
         DateFormat df = dateFormat != null ? new SimpleDateFormat( dateFormat ) : SimpleDateFormat.getInstance();
         GregorianCalendar c = new GregorianCalendar();
@@ -31,4 +35,4 @@ private XMLGregorianCalendar ${name}( String date, String dateFormat ) {
     catch ( ParseException ex ) {
         throw new RuntimeException( ex );
     }
-}
+}

processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToCalendar.ftl

@@ -19,6 +19,10 @@
 
 -->
 private Calendar ${name}( XMLGregorianCalendar xcal ) {
+    if ( xcal == null ) {
+        return null;
+    }
+
     Calendar cal = Calendar.getInstance();
     cal.setTimeInMillis( xcal.toGregorianCalendar().getTimeInMillis() );
     return cal;

processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToDate.ftl

@@ -19,5 +19,9 @@
 
 -->
 private static Date ${name}( XMLGregorianCalendar xcal ) {
+    if ( xcal == null ) {
+        return null;
+    }
+
     return xcal.toGregorianCalendar().getTime();
-}
+}

processor/src/main/resources/org.mapstruct.ap.builtin.XmlGregorianCalendarToString.ftl

@@ -19,11 +19,16 @@
 
 -->
 private String ${name}( XMLGregorianCalendar xcal, String dateFormat ) {
+    if ( xcal == null ) {
+        return null;
+    }
+
     if (dateFormat == null ) {
         return xcal.toString();
-    } else {
+    }
+    else {
         Date d = xcal.toGregorianCalendar().getTime();
         SimpleDateFormat sdf = new SimpleDateFormat( dateFormat );
         return sdf.format( d );
     }
-}
+}