[6.0.0-dev.x] BUG-572: DSL - handling null values in expressions (fin…

…os#2731)

* Update DSL version to 9.6.1

* Update release note

* Update func

RELEASE.md

@@ -19,13 +19,14 @@ The changes can be reviewed in PR: https://github.com/finos/common-domain-model/
 
 _What is being released?_
 
-This release updates the `rosetta-bundle` dependencies.
+This release updates the `rosetta-bundle` and `rosetta-dsl` dependencies.
 
 Version updates include:
 - `rosetta-bundle` 10.13.4: FpML Coding schema updated.
+- `rosetta-dsl` 9.6.1: DSL bug fix for handing null values. For further details see DSL release notes: https://github.com/REGnosys/rosetta-dsl/releases/tag/9.6.1.
 
 There are no changes to the model or test expectations.
 
 _Review directions_
 
-The changes can be reviewed in PR: https://github.com/finos/common-domain-model/pull/2707
+The changes can be reviewed in PR: [#2707](https://github.com/finos/common-domain-model/pull/2707) / [#2731](https://github.com/finos/common-domain-model/pull/2731)

pom.xml

@@ -82,9 +82,9 @@
 
         <repoServerHost>oss.sonatype.org</repoServerHost>
 
-        <rosetta.bundle.version>10.13.4</rosetta.bundle.version>
+        <rosetta.bundle.version>10.13.5</rosetta.bundle.version>
         <rosetta.code-gen.version>${rosetta.bundle.version}</rosetta.code-gen.version>
-        <rosetta.dsl.version>9.6.0</rosetta.dsl.version>
+        <rosetta.dsl.version>9.6.1</rosetta.dsl.version>
 
         <xtext.version>2.27.0</xtext.version>
         <opengamma.strata.version>1.7.0</opengamma.strata.version>

rosetta-source/src/main/resources/rosetta-config.yml

@@ -0,0 +1,6 @@
+model:
+  name: Common Domain Model
+dependencies:
+generators:
+  namespaces:
+    - cdm.*

rosetta-source/src/main/rosetta/base-datetime-func.rosetta

@@ -26,12 +26,11 @@ func ToDateTime: <"Creates a ZonedDateTime from the provided Date, and defaults
         zonedDateTime zonedDateTime (0..1)
 
     set zonedDateTime:
-        if date exists
-        then zonedDateTime {
-                date: date,
-                time: ToTime(0, 0, 0),
-                timezone: "Z" // UTC
-            }
+        zonedDateTime {
+            date: date,
+            time: ToTime(0, 0, 0),
+            timezone: "Z" // UTC
+        }
 
 func ToTime: <"Implemented by Java function.">
     inputs: