Add support for CQL Longs (#1459)

* Add support for CQL Longs

* Add more tests

* Fix formatting

* More tests

* Fix Sonar issues

Src/java/engine-fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/converter/BaseFhirTypeConverter.java

@@ -87,6 +87,8 @@ public IBase toFhirType(Object value) {
                 return toFhirBoolean((Boolean) value);
             case "Integer":
                 return toFhirInteger((Integer) value);
+            case "Long":
+                return toFhirInteger64((Long) value);
             case "BigDecimal":
                 return toFhirDecimal((BigDecimal) value);
             case "Date":
@@ -245,25 +247,19 @@ public ICompositeType toFhirInterval(Interval value) {
     }
 
     @Override
-    public Boolean isCqlType(Object value) {
+    public boolean isCqlType(Object value) {
         Objects.requireNonNull(value, "value can not be null");
 
         if (value instanceof Iterable<?>) {
             throw new IllegalArgumentException("isCqlType can not be used for Iterables");
         }
 
-        if (value instanceof CqlType) {
-            return true;
-        }
-
-        if (value instanceof BigDecimal
+        return value instanceof BigDecimal
                 || value instanceof String
                 || value instanceof Integer
-                || value instanceof Boolean) {
-            return true;
-        }
-
-        return false;
+                || value instanceof Boolean
+                || value instanceof Long
+                || value instanceof CqlType;
     }
 
     @Override
@@ -277,7 +273,7 @@ public Iterable<Object> toCqlTypes(Iterable<?> values) {
             } else if (isCqlType(value)) {
                 converted.add(value);
             } else if (isFhirType(value)) {
-                converted.add(toCqlType((IBase) value));
+                converted.add(toCqlType(value));
             } else {
                 throw new IllegalArgumentException(String.format(
                         "Unknown type encountered during conversion %s",
@@ -316,6 +312,8 @@ public Object toCqlType(Object value) {
                 return toCqlBoolean((IPrimitiveType<Boolean>) value);
             case "IntegerType":
                 return toCqlInteger((IPrimitiveType<Integer>) value);
+            case "Integer64Type":
+                return toCqlLong((IPrimitiveType<Long>) value);
             case "DecimalType":
                 return toCqlDecimal((IPrimitiveType<BigDecimal>) value);
             case "DateType":
@@ -373,6 +371,15 @@ public Integer toCqlInteger(IPrimitiveType<Integer> value) {
         return value.getValue();
     }
 
+    @Override
+    public Long toCqlLong(IPrimitiveType<Long> value) {
+        if (value == null) {
+            return null;
+        }
+
+        return value.getValue();
+    }
+
     @Override
     public BigDecimal toCqlDecimal(IPrimitiveType<BigDecimal> value) {
         if (value == null) {

Src/java/engine-fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/converter/Dstu2FhirTypeConverter.java

@@ -44,6 +44,11 @@ public IPrimitiveType<Integer> toFhirInteger(Integer value) {
         return new IntegerType(value);
     }
 
+    @Override
+    public IPrimitiveType<Long> toFhirInteger64(Long value) {
+        throw new IllegalArgumentException("FHIR DSTU2 does not support Long/Integer64 values");
+    }
+
     @Override
     public IPrimitiveType<BigDecimal> toFhirDecimal(BigDecimal value) {
         if (value == null) {

Src/java/engine-fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/converter/Dstu3FhirTypeConverter.java

@@ -43,6 +43,11 @@ public IPrimitiveType<Integer> toFhirInteger(Integer value) {
         return new IntegerType(value);
     }
 
+    @Override
+    public IPrimitiveType<Long> toFhirInteger64(Long value) {
+        throw new IllegalArgumentException("FHIR DSTU3 does not support Long/Integer64 values");
+    }
+
     @Override
     public IPrimitiveType<BigDecimal> toFhirDecimal(BigDecimal value) {
         if (value == null) {

Src/java/engine-fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/converter/FhirTypeConverter.java

@@ -88,6 +88,13 @@ public interface FhirTypeConverter {
      */
     public IPrimitiveType<Integer> toFhirInteger(Integer value);
 
+    /**
+     * Converts a Long to a FHIR Integer64
+     * @param value the value to convert
+     * @return a FHIR Integer64
+     */
+    public IPrimitiveType<Long> toFhirInteger64(Long value);
+
     /**
      * Converts a BigDecimal to a FHIR Decimal
      *
@@ -233,7 +240,7 @@ public interface FhirTypeConverter {
      * @return true if value is a CQL type, false otherwise
      * @throws NullPointerException if value is null
      */
-    public Boolean isCqlType(Object value);
+    public boolean isCqlType(Object value);
 
     /**
      * Converts an Object to a CQL type.
@@ -278,6 +285,13 @@ public interface FhirTypeConverter {
      */
     public Integer toCqlInteger(IPrimitiveType<Integer> value);
 
+    /**
+     * Converts a FHIR Integer64 to a CQL Long
+     * @param value the value to convert
+     * @return a Long
+     */
+    public Long toCqlLong(IPrimitiveType<Long> value);
+
     /**
      * Converts a FHIR Decimal to a CQL Decimal
      *

Src/java/engine-fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/converter/R4FhirTypeConverter.java

@@ -44,6 +44,11 @@ public IPrimitiveType<Integer> toFhirInteger(Integer value) {
         return new IntegerType(value);
     }
 
+    @Override
+    public IPrimitiveType<Long> toFhirInteger64(Long value) {
+        throw new IllegalArgumentException("FHIR R4 does not support Long/Integer64 values");
+    }
+
     @Override
     public IPrimitiveType<BigDecimal> toFhirDecimal(BigDecimal value) {
         if (value == null) {

Src/java/engine-fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/converter/R5FhirTypeConverter.java

@@ -44,6 +44,15 @@ public IPrimitiveType<Integer> toFhirInteger(Integer value) {
         return new IntegerType(value);
     }
 
+    @Override
+    public IPrimitiveType<Long> toFhirInteger64(Long value) {
+        if (value == null) {
+            return null;
+        }
+
+        return new Integer64Type(value);
+    }
+
     @Override
     public IPrimitiveType<BigDecimal> toFhirDecimal(BigDecimal value) {
         if (value == null) {
@@ -367,7 +376,7 @@ public Concept toCqlConcept(ICompositeType value) {
         return new Concept()
                 .withDisplay(codeableConcept.getText())
                 .withCodes(codeableConcept.getCoding().stream()
-                        .map(x -> toCqlCode(x))
+                        .map(this::toCqlCode)
                         .collect(Collectors.toList()));
     }