[#662] XML dialects: Use the Kotlin dialect based on java.time API.

goldmansachs · Oct 23, 2024 · ee1dcb0 · ee1dcb0
1 parent 8001147
commit ee1dcb0
Show file tree

Hide file tree

Showing 97 changed files with 563 additions and 1,122 deletions.
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinition.java
diff --git a/...ore/src/main/java/com/gs/dmn/dialect/MixedJavaTimeKotlinStandardDMNDialectDefinition.java b/...ore/src/main/java/com/gs/dmn/dialect/MixedJavaTimeKotlinStandardDMNDialectDefinition.java
diff --git a/...re/src/main/java/com/gs/dmn/feel/synthesis/type/MixedJavaTimeKotlinNativeTypeFactory.java b/...re/src/main/java/com/gs/dmn/feel/synthesis/type/MixedJavaTimeKotlinNativeTypeFactory.java
diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/StandardNativeTypeToKotlinFactory.java b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/StandardNativeTypeToKotlinFactory.java
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/native_/JavaFactory.java b/dmn-core/src/main/java/com/gs/dmn/transformation/native_/JavaFactory.java
@@ -550,8 +550,9 @@ public String extractMemberFromProtoValue(String protoValue, Type type, boolean
         type = Type.extractTypeFromConstraint(type);
         if (FEELTypes.FEEL_PRIMITIVE_TYPES.contains(type)) {
             if (type == NumberType.NUMBER) {
-                String qNativeType = this.transformer.getNativeTypeFactory().getNativeNumberConcreteType();
-                return String.format("%s.valueOf(%s)", qNativeType, protoValue);
+                String qNativeConcreteType = this.transformer.getNativeTypeFactory().getNativeNumberConcreteType();
+                String value = String.format("%s.valueOf(%s)", qNativeConcreteType, protoValue);
+                return cast(this.transformer.getNativeTypeFactory().getNativeNumberType(), value);
             } else if (type == BooleanType.BOOLEAN) {
                 return protoValue;
             } else if (type == StringType.STRING) {
@@ -571,8 +572,10 @@ public String extractMemberFromProtoValue(String protoValue, Type type, boolean
             String mapFunction;
             if (FEELTypes.FEEL_PRIMITIVE_TYPES.contains(elementType)) {
                 if (elementType == NumberType.NUMBER) {
-                    String qNativeType = this.transformer.getNativeTypeFactory().getNativeNumberConcreteType();
-                    mapFunction = String.format("e -> %s.valueOf(e)", qNativeType);
+                    String qNativeType = this.transformer.getNativeTypeFactory().getNativeNumberType();
+                    String qNativeConcreteType = this.transformer.getNativeTypeFactory().getNativeNumberConcreteType();
+                    String value = String.format("%s.valueOf(e)", qNativeConcreteType);
+                    mapFunction = String.format("e -> %s", cast(qNativeType, value));
                 } else if (elementType == BooleanType.BOOLEAN) {
                     mapFunction =  "e -> e";
                 } else if (elementType == StringType.STRING) {

diff --git a/dmn-core/src/test/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinitionTest.java b/dmn-core/src/test/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinitionTest.java