Properly convert to and from JSON and XML, (Fixed Arrays, kordamp#7)

Author: kra3

.gitignore

@@ -13,3 +13,4 @@ build
 *.iws
 .idea
 out
+/.nb-gradle/

src/main/java/org/kordamp/json/xml/XMLSerializer.java

@@ -522,6 +522,7 @@ public JSON read(String xml) {
         try {
             Document doc = new Builder().build(new StringReader(xml));
             Element root = doc.getRootElement();
+            log.info("[ " + root.getLocalName() + " " + isNullObject(root) + " " + isArray(root, true));
             if (isNullObject(root)) {
                 return JSONNull.getInstance();
             }
@@ -830,7 +831,7 @@ private boolean checkChildElements(Element element, boolean isTopLevel) {
                 }
             }
         }
-
+        
         String childName = elements.get(0)
             .getQualifiedName();
         for (int i = 1; i < elementCount; i++) {
@@ -929,7 +930,7 @@ private boolean isArray(Element element, boolean isTopLevel) {
             && (element.getAttribute(addJsonPrefix("class")) != null && element.getAttribute(addJsonPrefix("type")) != null)) {
             isArray = checkChildElements(element, isTopLevel);
         }
-
+        
         if (isArray) {
             // check namespace
             for (int j = 0; j < element.getNamespaceDeclarationCount(); j++) {
@@ -941,6 +942,11 @@ private boolean isArray(Element element, boolean isTopLevel) {
             }
         }
 
+        if(!isArray && isTopLevel && !isForceTopLevelObject() 
+            && element.getQualifiedName().equalsIgnoreCase(getArrayName())){
+            isArray = true;
+        }
+        
         return isArray;
     }
 
@@ -974,6 +980,12 @@ private boolean isNullObject(Element element) {
                 && (element.getAttribute(addJsonPrefix("class")) != null && element.getAttribute(addJsonPrefix("type")) != null)) {
                 return true;
             }
+//            String clazz = getClass(element);
+//            if(element.getAttribute(addJsonPrefix("class")) != null && 
+//                    (clazz.equalsIgnoreCase(JSONTypes.OBJECT) || 
+//                        clazz.equalsIgnoreCase(JSONTypes.ARRAY))){
+//                return false;
+//            }
         }
         if (skipWhitespace && element.getChildCount() == 1 && element.getChild(0) instanceof Text) {
             return true;