Fixed sonar warnings.

Author: javadev

src/main/java/com/github/underscore/U.java

@@ -2760,7 +2760,11 @@ public static Map<String, Object> replaceSelfClosingWithNull(Map<String, Object>
 
     @SuppressWarnings("unchecked")
     public static Map<String, Object> replaceSelfClosingWithEmpty(Map<String, Object> map) {
-        return (Map<String, Object>) replaceSelfClosingWithValue(map, "");
+        Object result = replaceSelfClosingWithValue(map, "");
+        if (result instanceof Map) {
+            return (Map<String, Object>) result;
+        }
+        return Collections.emptyMap();
     }
 
     @SuppressWarnings("unchecked")

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

@@ -1929,8 +1929,9 @@ public static String changeXmlEncoding(
         Object result = fromXml(xml, FromType.FOR_FORMAT);
         if (result instanceof Map) {
             ((Map) result).put(ENCODING, encoding);
+            return toXml((Map) result, identStep, ROOT);
         }
-        return toXml((Map) result, identStep, ROOT);
+        return xml;
     }
 
     public static String changeXmlEncoding(String xml, String encoding) {

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

@@ -778,6 +778,9 @@ void xmlToJson() {
         Map<String, Object> map = U.newLinkedHashMap();
         map.put("-self-closing", "false");
         U.replaceSelfClosingWithNull(map);
+        Map<String, Object> mapEmpty = U.newLinkedHashMap();
+        mapEmpty.put("-self-closing", "true");
+        U.replaceSelfClosingWithEmpty(mapEmpty);
         Map<String, Object> map2 = U.newLinkedHashMap();
         List<Object> list = U.newArrayList();
         list.add(U.newArrayList());
@@ -1239,8 +1242,7 @@ void changeXmlEncoding() {
                         "<?xml version=\"1.0\" encoding=\"UTF-8\"?><a>Test</a>",
                         Xml.XmlStringBuilder.Step.COMPACT,
                         "windows-1251"));
-        assertEquals(
-                "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root>null</root>",
+        assertNull(
                 U.changeXmlEncoding(null, Xml.XmlStringBuilder.Step.COMPACT, "windows-1251"));
     }