Use JAXB insteaof of Simple-XML for parsing XML files.

[rhynodge.git] / src / main / java / net / pterodactylus / reactor / loader / ChainWatcher.java

diff --git a/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java b/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
index c373b88..a6a5004 100644 (file)
--- a/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
+++ b/src/main/java/net/pterodactylus/reactor/loader/ChainWatcher.java
@@ -24,14 +24,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
 import net.pterodactylus.reactor.Reaction;
 import net.pterodactylus.reactor.engine.Engine;
 import net.pterodactylus.reactor.loader.Chain.Parameter;
 import net.pterodactylus.reactor.loader.Chain.Part;
 
 import org.apache.log4j.Logger;
-import org.simpleframework.xml.Serializer;
-import org.simpleframework.xml.core.Persister;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;
@@ -107,9 +109,9 @@ public class ChainWatcher extends AbstractExecutionThreadService {
                        /* now parse all XML files. */
                        Map<String, Chain> chains = new HashMap<String, Chain>();
                        for (File xmlFile : xmlFiles) {
-                               Serializer serializer = new Persister();
-                               logger.debug(String.format("Reading %s...", xmlFile.getPath()));
-                               Chain chain = serializer.read(Chain.class, xmlFile);
+
+                               /* parse XML file. */
+                               Chain chain = parseXmlFile(xmlFile);
 
                                /* dump chain */
                                logger.debug(String.format(" Enabled: %s", chain.enabled()));
@@ -179,4 +181,27 @@ public class ChainWatcher extends AbstractExecutionThreadService {
                }
        }
 
+       //
+       // STATIC METHODS
+       //
+
+       /**
+        * Parses the given XML file into a {@link Chain}.
+        *
+        * @param xmlFile
+        *            The XML file to parse
+        * @return The parsed chain
+        */
+       private static Chain parseXmlFile(File xmlFile) {
+               try {
+                       JAXBContext context = JAXBContext.newInstance(Chain.class);
+                       Unmarshaller unmarshaller = context.createUnmarshaller();
+                       logger.debug(String.format("Reading %s...", xmlFile.getPath()));
+                       return (Chain) unmarshaller.unmarshal(xmlFile);
+               } catch (JAXBException e) {
+                       e.printStackTrace();
+                       return null;
+               }
+       }
+
 }