solve merging conflict with latest main

Author: NathanQingyangXu

src/main/java/com/mongodb/hibernate/internal/translate/AbstractMqlTranslator.java

@@ -855,7 +855,7 @@ public void visitCustomTableUpdate(TableUpdateCustomSql tableUpdateCustomSql) {
 
     static String renderMongoAstNode(AstNode rootAstNode) {
         try (var stringWriter = new StringWriter();
-                var jsonWriter = new JsonWriter(stringWriter, JSON_WRITER_SETTINGS)) {
+                var jsonWriter = new JsonWriter(stringWriter, EXTENDED_JSON_WRITER_SETTINGS)) {
             rootAstNode.render(jsonWriter);
             jsonWriter.flush();
             return stringWriter.toString();

src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstSortFieldTests.java

@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertElementRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertElementRendering;
 import static com.mongodb.hibernate.internal.translate.mongoast.command.aggregate.AstSortOrder.ASC;
 
 import org.junit.jupiter.params.ParameterizedTest;
@@ -29,9 +29,9 @@ class AstSortFieldTests {
     void testRendering(AstSortOrder sortOrder) {
         var sortField = new AstSortField("field", sortOrder);
         var expectedJson = """
-                           {"field": %d}\
-                           """
+                {"field": {"$numberInt": "%d"}}\
+                """
                 .formatted(sortOrder == ASC ? 1 : -1);
-        assertElementRender(expectedJson, sortField);
+        assertElementRendering(expectedJson, sortField);
     }
 }

src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstSortStageTests.java

@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -29,9 +29,10 @@ void testRendering() {
         var astSortField2 = new AstSortField("field2", AstSortOrder.DESC);
         var astSortStage = new AstSortStage(List.of(astSortField1, astSortField2));
 
-        var expectedJson = """
-                {"$sort": {"field1": 1, "field2": -1}}\
+        var expectedJson =
+                """
+                {"$sort": {"field1": {"$numberInt": "1"}, "field2": {"$numberInt": "-1"}}}\
                 """;
-        assertRender(expectedJson, astSortStage);
+        assertRendering(expectedJson, astSortStage);
     }
 }