Improve \r escape in xml.

Author: javadev

src/main/java/com/github/underscore/lodash/Xml.java

@@ -796,7 +796,7 @@ private static void escape(String s, StringBuilder sb) {
                         sb.append("\n");
                         break;
                     case '\r':
-                        sb.append("\\r");
+                        sb.append("
");
                         break;
                     case '\t':
                         sb.append("\t");

src/test/java/com/github/underscore/lodash/LodashTest.java

@@ -1198,4 +1198,43 @@ public void sqlru2() {
         // https://www.sql.ru/forum/1321326/kolichestvo-naydennyh-slov-v-stroke
         assertEquals(2, U.countBy(U.words("Маша ищет Мишу а Миша ищет Машу")).get("ищет").intValue());
     }
+
+    @Test
+    public void stackoverflow7() {
+        String json = U.objectBuilder()
+          .add("key1", "value1")
+          .add("key2", "value2")
+          .add("key3", U.objectBuilder()
+            .add("innerKey1", "value3"))
+          .toJson();
+        assertEquals("{\n  \"key1\": \"value1\",\n"
+          + "  \"key2\": \"value2\",\n"
+          + "  \"key3\": {\n"
+          + "    \"innerKey1\": \"value3\"\n"
+          + "  }\n"
+          + "}", json);
+    }
+
+    @Test
+    public void stackoverflow8() {
+        class Customer {
+            String name;
+            int age;
+            int id;
+        }
+        Customer customer = new Customer();
+        customer.name = "John";
+        customer.age = 30;
+        customer.id = 12345;
+        String xml = U.objectBuilder().add("customer", U.objectBuilder()
+            .add("name", customer.name)
+            .add("age", customer.age)
+            .add("id", customer.id)).toXml();
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+            + "<customer>\n"
+            + "  <name>John</name>\n"
+            + "  <age number=\"true\">30</age>\n"
+            + "  <id number=\"true\">12345</id>\n"
+            + "</customer>", xml);
+    }
 }

src/test/java/com/github/underscore/lodash/StringTest.java

@@ -1058,7 +1058,7 @@ public void escapeXml() {
         assertEquals("\\b", Xml.XmlValue.escape("\b"));
         assertEquals("\\f", Xml.XmlValue.escape("\f"));
         assertEquals("\n", Xml.XmlValue.escape("\n"));
-        assertEquals("\\r", Xml.XmlValue.escape("\r"));
+        assertEquals("
", Xml.XmlValue.escape("\r"));
         assertEquals("\t", Xml.XmlValue.escape("\t"));
         assertEquals("/", Xml.XmlValue.escape("/"));
         assertEquals("�", Xml.XmlValue.escape("\u0000"));