make format optional and create testing case about $dateToString aggregation with timezone outputs invalid ISO8601 string

Author: NathanQingyangXu

driver-core/src/main/com/mongodb/client/model/mql/MqlDate.java

@@ -138,6 +138,20 @@ public interface MqlDate extends MqlValue {
      */
     MqlString asString(MqlString timezone, MqlString format);
 
+    /**
+     * The string representation of {@code this} date as determined by the
+     * provided {@code timezone} with default format as below:
+     *
+     * <ul>
+     *     <li>If {@code timezone} is UTC timezone, {@code "%Y-%m-%dT%H:%M:%S.%LZ"} will be the default
+     *     <li>Otherwise the default format will be {@code "%Y-%m-%dT%H:%M:%S.%L"}
+     * </ul>
+     *
+     * @param timezone the UTC Offset or Olson Timezone Identifier.
+     * @return the resulting value.
+     */
+    MqlString asString(MqlString timezone);
+
     /**
      * The result of passing {@code this} value to the provided function.
      * Equivalent to {@code f.apply(this)}, and allows lambdas and static,

driver-core/src/main/com/mongodb/client/model/mql/MqlExpression.java

@@ -17,6 +17,7 @@
 package com.mongodb.client.model.mql;
 
 import com.mongodb.assertions.Assertions;
+import com.mongodb.lang.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonInt32;
@@ -947,10 +948,24 @@ public MqlInteger millisecond(final MqlString timezone) {
     public MqlString asString(final MqlString timezone, final MqlString format) {
         Assertions.notNull("timezone", timezone);
         Assertions.notNull("format", format);
-        return newMqlExpression((cr) -> astDoc("$dateToString", new BsonDocument()
-                .append("date", this.toBsonValue(cr))
-                .append("format", toBsonValue(cr, format))
-                .append("timezone", toBsonValue(cr, timezone))));
+        return doAsString(timezone, format);
+    }
+
+    @Override
+    public MqlString asString(final MqlString timezone) {
+        Assertions.notNull("timezone", timezone);
+        return doAsString(timezone, null);
+    }
+
+    private MqlString doAsString(final MqlString timezone, @Nullable final MqlString format) {
+        return newMqlExpression((cr) -> {
+            BsonDocument document = new BsonDocument("date", this.toBsonValue(cr));
+            if (format != null) {
+                document.append("format", toBsonValue(cr, format));
+            }
+            document.append("timezone", toBsonValue(cr, timezone));
+            return astDoc("$dateToString", document);
+        });
     }
 
     @Override

driver-core/src/test/functional/com/mongodb/client/model/mql/TypeMqlValuesFunctionalTest.java

@@ -33,6 +33,7 @@
 import static com.mongodb.client.model.mql.MqlValues.ofIntegerArray;
 import static com.mongodb.client.model.mql.MqlValues.ofMap;
 import static com.mongodb.client.model.mql.MqlValues.ofNull;
+import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -225,6 +226,35 @@ public void dateAsStringTest() {
                 of(instant).asString(of("America/New_York"), of("%Y-%m-%dT%H:%M:%S.%L%z")));
     }
 
+    /**
+     * Tests that with default format and non-UTC timezone, {@code $dateToString} won't output invalid ISO 8601 string ending with 'Z'.
+     * Ticket: JAVA-5044
+     */
+    @Test
+    void dateAsStringWithDefaultFormat() {
+        // the bug was reported on v6.0.3, but was fixed in v7.1 without backporting
+        // due to the concern that it is a breaking change.
+        assumeTrue(serverVersionAtLeast(7, 1));
+
+        final Instant instant = Instant.parse("2025-07-17T18:00:36.052Z");
+        MqlDate date = of(instant);
+        ZonedDateTime utcDateTime = ZonedDateTime.ofInstant(instant, ZoneId.of(ZoneOffset.UTC.getId()));
+
+        // UTC timezone's default format should be "%Y-%m-%dT%H:%M:%S.%LZ"
+        assertExpression(
+                utcDateTime.format(ISO_INSTANT),
+                date.asString(of("UTC")),
+                "{'$dateToString': {'date': {'$date': '2025-07-17T18:00:36.052Z'}, "
+                        + "'timezone': 'UTC'}}");
+
+        // non-UTC timezone's default format should be "%Y-%m-%dT%H:%M:%S.%L"
+        assertExpression(
+                utcDateTime.withZoneSameInstant(ZoneId.of("America/New_York")).format(ISO_LOCAL_DATE_TIME),
+                date.asString(of("America/New_York")),
+                "{'$dateToString': {'date': {'$date': '2025-07-17T18:00:36.052Z'}, "
+                        + "'timezone': 'America/New_York'}}");
+    }
+
     // parse string
 
     @Test