v1.4.5: performance for n.s.e.EasyML.deserialize()

Author: cordisvictor

README.md

@@ -60,6 +60,12 @@ for a higher control compared to the EasyML Facade.
 
 ### Release Notes
 
+!Release 1.4.5
+- performance: improved n.s.e.EasyML.deserialize() speed by reusing the
+XmlPullParser when available.
+- refactor: minor code improvements.
+
+
 !Release 1.4.4
 - refactor: made n.s.e.m.CompositeStrategy.unmarshalInit return type more
 loose to better support readResolve in n.s.e.m.j.i.ExternalizableStrategy.

easyml/src/net/sourceforge/easyml/XMLReader.java

@@ -76,7 +76,7 @@
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
  * @since 1.0
- * @version 1.4.4
+ * @version 1.4.5
  */
 public class XMLReader implements Closeable {
 
@@ -1089,12 +1089,20 @@ private boolean isRootEnd() {
      * @param parser to use, null if default
      */
     public void reset(Reader reader, XmlPullParser parser) {
-        this.driver = parser != null ? new XMLReaderTextDriver(this, reader, parser)
-                : new XMLReaderTextDriver(this, reader);
+        if (isReusableXMLReaderTextDriver()) {
+            ((XMLReaderTextDriver) this.driver).reset(reader, parser);
+        } else {
+            this.driver = parser != null ? new XMLReaderTextDriver(this, reader, parser)
+                    : new XMLReaderTextDriver(this, reader);
+        }
         this.decoded.clear();
         this.beforeRoot = true;
     }
 
+    private boolean isReusableXMLReaderTextDriver() {
+        return this.driver != null && this.driver.getClass() == XMLReaderTextDriver.class;
+    }
+
     /**
      * Resets this instance, setting it to the new <code>in</code> stream.
      *

easyml/src/net/sourceforge/easyml/XMLReaderTextDriver.java

@@ -33,7 +33,7 @@
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
  * @since 1.1.0
- * @version 1.3.3
+ * @version 1.4.5
  */
 /* default */ final class XMLReaderTextDriver extends XMLReader.Driver {
 
@@ -59,8 +59,12 @@ public XMLReaderTextDriver(XMLReader target, Reader in) {
      */
     public XMLReaderTextDriver(XMLReader target, Reader in, XmlPullParser parser) {
         super(target);
+        this.parser = parser;
+        this.init(in);
+    }
+
+    private void init(Reader in) {
         try {
-            this.parser = parser;
             this.parser.setInput(in);
             this.readerToClose = in;
         } catch (XmlPullParserException xppX) {
@@ -204,6 +208,23 @@ protected void consumeFully() {
         }
     }
 
+    /**
+     * Resets this current instance to read using the given reader and,
+     * optionally, to parse using the given custom pull-parser. This method is
+     * needed for performance reasons since the pull-parsers can be expensive to
+     * recreate and should be reused.
+     *
+     * @param in the required input reader
+     * @param parser optional custom parser to replace the default pull-parse
+     * implementation
+     */
+    public void reset(Reader in, XmlPullParser parser) {
+        if (parser != null) {
+            this.parser = parser;
+        }
+        this.init(in);
+    }
+
     /**
      * Closes the underlying reader.
      */

easyml/src/net/sourceforge/easyml/XMLWriter.java

@@ -1021,7 +1021,6 @@ public final void flush() {
         if (!this.isInitialState()) {
             this.driver.endElement(); // DTD.ELEMENT_EASYML.
             this.driver.flush();
-            this.driver.state = XMLWriter.Driver.STATE_INITIAL;
             this.encoded.clear();
         }
     }

easyml/src/net/sourceforge/easyml/util/ReflectionUtil.java

@@ -29,7 +29,7 @@
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
  * @since 1.0
- * @version 1.3.8
+ * @version 1.4.5
  */
 public final class ReflectionUtil {
 
@@ -223,7 +223,7 @@ public static <T> T instantiateInner(Class<T> c, Object outer)
      * @return new instance of c
      */
     public static <T> T instantiateUnsafely(Class<T> c) {
-        return Unsafe.instantiator.instantiate(c);
+        return UnsafeInstantiator.instantiator.instantiate(c);
     }
 
     /**
@@ -242,20 +242,13 @@ public static Class classForName(String typeName) throws ClassNotFoundException
     }
 
     /**
-     * UnsafeInstantiator interface defines the API for instantiating classes
-     * with no default (zero-arg) constructors.
-     */
-    private interface UnsafeInstantiator {
-
-        <T> T instantiate(Class<T> c);
-    }
-
-    /**
-     * Unsafe class lazy inits the JVM dependent unsafe instantiator.
+     * UnsafeInstantiator lazy inits the JVM-dependent unsafe instantiator and
+     * provides the API for instantiating classes with no default (zero-arg)
+     * constructors.
      */
-    private static final class Unsafe {
+    private static abstract class UnsafeInstantiator {
 
-        private static final UnsafeInstantiator instantiator = Unsafe.create();
+        private static final UnsafeInstantiator instantiator = create();
 
         private static UnsafeInstantiator create() {
             // if available, use sun.misc.Unsafe:
@@ -323,8 +316,10 @@ public <T> T instantiate(Class<T> c) {
             };
         }
 
-        private Unsafe() {
+        private UnsafeInstantiator() {
         }
+
+        public abstract <T> T instantiate(Class<T> c);
     }
 
     /**

easyml/test/net/sourceforge/easyml/FacadeMain.java

@@ -27,9 +27,9 @@ public class FacadeMain {
 //    public static void main(String[] args) {
 //        final Person in = new Person(1, "da");
 //
-//        final EasyML easyml = new EasyML();
-//        easyml.setStyle(EasyML.Style.PRETTY);
-////        easyml.alias(Person.class, "Persoana");
+//        final EasyML easyml = new EasyMLBuilder()
+//                .withStyle(EasyML.Style.PRETTY)
+//                .build();
 //        long time = System.currentTimeMillis();
 //        for (int i = 0; i < 100000; i++) {
 //            easyml.deserialize(easyml.serialize(in));