issue #334 - move microsecond truncation logic to ModelSupport

per feedback from john

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>

Author: lmsurpre

fhir-model/src/main/java/com/ibm/fhir/model/type/DateTime.java

@@ -21,6 +21,7 @@
 
 import javax.annotation.Generated;
 
+import com.ibm.fhir.model.util.ModelSupport;
 import com.ibm.fhir.model.util.ValidationSupport;
 import com.ibm.fhir.model.visitor.Visitor;
 
@@ -39,13 +40,7 @@ public class DateTime extends Element {
 
     private DateTime(Builder builder) {
         super(builder);
-        if (builder.value instanceof java.time.Instant) {
-            value = ((java.time.Instant) builder.value).truncatedTo(ChronoUnit.MICROS);
-        } else if (builder.value instanceof ZonedDateTime) {
-            value = ((ZonedDateTime) builder.value).truncatedTo(ChronoUnit.MICROS);
-        } else {
-            value = builder.value;
-        }
+        value = ModelSupport.truncateTime(builder.value, ChronoUnit.MICROS);
         ValidationSupport.checkValueType(value, ZonedDateTime.class, LocalDate.class, YearMonth.class, Year.class);
         ValidationSupport.requireValueOrChildren(this);
     }

fhir-model/src/main/java/com/ibm/fhir/model/type/Instant.java

@@ -17,6 +17,7 @@
 
 import javax.annotation.Generated;
 
+import com.ibm.fhir.model.util.ModelSupport;
 import com.ibm.fhir.model.util.ValidationSupport;
 import com.ibm.fhir.model.visitor.Visitor;
 
@@ -33,7 +34,7 @@ public class Instant extends Element {
 
     private Instant(Builder builder) {
         super(builder);
-        value = builder.value == null ? null : builder.value.truncatedTo(ChronoUnit.MICROS);
+        value = ModelSupport.truncateTime(builder.value, ChronoUnit.MICROS);
         ValidationSupport.requireValueOrChildren(this);
     }
 

fhir-model/src/main/java/com/ibm/fhir/model/util/ModelSupport.java

@@ -14,6 +14,13 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAccessor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -568,4 +575,26 @@ public static boolean isSummaryElement(Class<?> modelClass, String elementName)
         }
         return false;
     }
+    
+    public static ZonedDateTime truncateTime(ZonedDateTime dateTime, ChronoUnit unit) {
+        return dateTime == null ? null : dateTime.truncatedTo(unit);
+    }
+    
+    public static TemporalAccessor truncateTime(TemporalAccessor ta, ChronoUnit unit) {
+        if (ta instanceof java.time.Instant) {
+            ta = ((java.time.Instant) ta).truncatedTo(unit);
+        } else if (ta instanceof ZonedDateTime) {
+            ta = ((ZonedDateTime) ta).truncatedTo(unit);
+        } else if (ta instanceof LocalDateTime) {
+            ta = ((LocalDateTime) ta).truncatedTo(unit);
+        } else if (ta instanceof LocalTime) {
+            ta = ((LocalTime) ta).truncatedTo(unit);
+        } else if (ta instanceof OffsetTime) {
+            ta = ((OffsetTime) ta).truncatedTo(unit);
+        } else if (ta instanceof OffsetDateTime) {
+            ta = ((OffsetDateTime) ta).truncatedTo(unit);
+        }
+        
+        return ta;
+    }
 }

fhir-tools/src/main/java/com/ibm/fhir/tools/CodeGenerator.java

@@ -998,16 +998,9 @@ private void generateClass(JsonObject structureDefinition, List<String> paths, C
                                 cb.assign(fieldName, "ValidationSupport.choiceElement(builder." + fieldName + ", " + quote(elementName) + ", " + types + ")");
                             } else {
                                 // Instant and DateTime values require special handling
-                                if (isInstant(structureDefinition) && "value".equals(fieldName)) {
-                                    cb.assign(fieldName, "builder.value == null ? null : builder.value.truncatedTo(ChronoUnit.MICROS)");
-                                } else if (isDateTime(structureDefinition) && "value".equals(fieldName)) {
-                                    cb._if("builder.value instanceof java.time.Instant")
-                                      .assign(fieldName, "((java.time.Instant) builder.value).truncatedTo(ChronoUnit.MICROS)")
-                                    ._elseif("builder.value instanceof ZonedDateTime")
-                                      .assign(fieldName, "((ZonedDateTime) builder.value).truncatedTo(ChronoUnit.MICROS)")
-                                    ._else()
-                                      .assign(fieldName, "builder." + fieldName)
-                                    .end();
+                                if ((isInstant(structureDefinition) || isDateTime(structureDefinition))
+                                        && "value".equals(fieldName)) {
+                                    cb.assign(fieldName, "ModelSupport.truncateTime(builder.value, ChronoUnit.MICROS)");
                                 } else {
                                     cb.assign(fieldName, "builder." + fieldName);
                                 }
@@ -1603,6 +1596,7 @@ private void generateImports(JsonObject structureDefinition, String className, C
         if (isDateTime(structureDefinition) || isInstant(structureDefinition)) {
             imports.add("java.time.ZonedDateTime");
             imports.add("java.time.temporal.ChronoUnit");
+            imports.add("com.ibm.fhir.model.util.ModelSupport");
         }
 
         if (isTime(structureDefinition)) {