more work on adapting to XML

1 files changed, 9 insertions, 19 deletions

diff --git a/src/main/java/design/persistence/XMLHandler.java b/src/main/java/design/persistence/XMLHandler.java
index eaae811..174407a 100644
--- a/src/main/java/design/persistence/XMLHandler.java
+++ b/src/main/java/design/persistence/XMLHandler.java
@@ -23,28 +23,18 @@ public class XMLHandler implements DataHandler
         // read the top tree node (the array)
         JsonNode golfersNode = jsonMapper.readTree(jsonData);
         // map it to an object node
-        ObjectNode root = xmlMapper.createObjectNode();
-        root.set("golfer", golfersNode);
-        xmlMapper.writerWithDefaultPrettyPrinter().writeValue(file, root);
+        xmlMapper.writerWithDefaultPrettyPrinter().writeValue(file, golfersNode);
     }
 
     public void importPersonalData(File file) throws IOException {
-
-    JsonNode root = xmlMapper.readTree(file);
-    JsonNode golfersNode = root.get("golfer");
-    if (golfersNode == null) {
-        throw new IOException("Expected 'golfer' element in XML root, but none found");
-    }
-    if (!golfersNode.isArray()) {
-        golfersNode = xmlMapper.createArrayNode().add(golfersNode);
-    }
-
-    Golfer[] golfers = xmlMapper.treeToValue(golfersNode, Golfer[].class);
-
-    File tempJson = File.createTempFile("imported", ".json");
-    jsonMapper.writerWithDefaultPrettyPrinter().writeValue(tempJson, golfers);
-    JSONPersonalDatabase.instance().importData(tempJson);
-    tempJson.delete();
+        JsonNode root = xmlMapper.readTree(file); 
+
+        System.out.println(root.toPrettyString());
+        Golfer[] golfers = xmlMapper.treeToValue(root, Golfer[].class); 
+        File tempJson = File.createTempFile("imported", ".json"); 
+        jsonMapper.writerWithDefaultPrettyPrinter().writeValue(tempJson, golfers); 
+        JSONPersonalDatabase.instance().importData(tempJson); 
+        tempJson.delete();
     }