v1.4.4: unmarshalInit Object and XML reader and writer hashmaps

Author: cordisvictor

README.md

@@ -9,6 +9,13 @@ EasyML
   (http://sourceforge.net/projects/kxml/files/kxml2/2.3.0/kxml2-min-2.3.0.jar/download)
 
 
+!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.
+- refactor: n.s.e.XMLReader and n.s.e.XMLWriter use HashMap instead of
+ConcurrentHashMap if not in shared mode (i.e. if in standalone mode).
+
+
 !Release 1.4.3
 - feature: new n.s.e.m.j.i.ExternalizableStrategy offers support for the
 Java Externalizable protocol.

easyml/src/net/sourceforge/easyml/EasyML.java

@@ -66,6 +66,7 @@
 import net.sourceforge.easyml.marshalling.java.util.UUIDStrategy;
 import net.sourceforge.easyml.marshalling.java.util.VectorStrategy;
 import net.sourceforge.easyml.marshalling.java.util.regex.PatternStrategy;
+import net.sourceforge.easyml.util.Caching;
 import org.w3c.dom.Document;
 import org.xmlpull.v1.XmlPullParser;
 
@@ -106,7 +107,7 @@
  * objects.<br/>
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
- * @version 1.4.0
+ * @version 1.4.4
  * @since 1.0
  *
  * @see XMLReader
@@ -460,8 +461,10 @@ public interface XmlPullParserProvider {
 
     private EasyML(Profile profile) {
         final ConcurrentHashMap<Class, Object> commonCtorCache = new ConcurrentHashMap<>();
-        this.writerPrototype = new XMLWriter(commonCtorCache);
-        this.readerPrototype = new XMLReader(commonCtorCache);
+        final ConcurrentHashMap<String, Object> readerFieldCache = new ConcurrentHashMap<>();
+
+        this.writerPrototype = new XMLWriter(commonCtorCache, Caching.STRATEGY_PUT_IF_ABSENT);
+        this.readerPrototype = new XMLReader(commonCtorCache, readerFieldCache, Caching.STRATEGY_PUT_IF_ABSENT);
         profile.configure(this.writerPrototype);
         profile.configure(this.readerPrototype);
         this.perThreadWriter = new ThreadLocal<XMLWriter>() {
@@ -633,7 +636,9 @@ public CompositeStrategy lookupCompositeStrategyBy(String name) {
      * @return a new shared-configuration writer
      */
     public XMLWriter newWriter(Writer out) {
-        return new XMLWriter(out, this.writerPrototype);
+        final XMLWriter ret = new XMLWriter(writerPrototype);
+        ret.reset(out);
+        return ret;
     }
 
     /**
@@ -649,7 +654,9 @@ public XMLWriter newWriter(Writer out) {
      * @return a new shared-configuration writer
      */
     public XMLWriter newWriter(OutputStream out) {
-        return new XMLWriter(out, this.writerPrototype);
+        final XMLWriter ret = new XMLWriter(writerPrototype);
+        ret.reset(out);
+        return ret;
     }
 
     /**
@@ -668,7 +675,9 @@ public XMLWriter newWriter(OutputStream out) {
      * @return a new shared-configuration writer
      */
     public XMLWriter newWriter(Document out) {
-        return new XMLWriter(out, this.writerPrototype);
+        final XMLWriter ret = new XMLWriter(writerPrototype);
+        ret.reset(out);
+        return ret;
     }
 
     /**
@@ -683,9 +692,9 @@ public XMLWriter newWriter(Document out) {
      * @return a new shared-configuration reader
      */
     public XMLReader newReader(Reader in) {
-        return this.xmlPullParserProvider != null
-                ? new XMLReader(in, this.xmlPullParserProvider.newXmlPullParser(), this.readerPrototype)
-                : new XMLReader(in, this.readerPrototype);
+        final XMLReader ret = new XMLReader(readerPrototype);
+        ret.reset(in, maybeProvidedXmlPullParser());
+        return ret;
     }
 
     /**
@@ -718,7 +727,9 @@ public XMLReader newReader(InputStream in) {
      * @return a new shared-configuration reader
      */
     public XMLReader newReader(Document in) {
-        return new XMLReader(in, this.readerPrototype);
+        final XMLReader ret = new XMLReader(readerPrototype);
+        ret.reset(in);
+        return ret;
     }
 
     /**
@@ -790,13 +801,16 @@ public void serialize(Object o, Document out) {
      */
     public Object deserialize(Reader in) {
         final XMLReader reader = this.perThreadReader.get();
-        reader.reset(in, this.xmlPullParserProvider != null
-                ? this.xmlPullParserProvider.newXmlPullParser()
-                : null
-        );
+        reader.reset(in, maybeProvidedXmlPullParser());
         return reader.read();
     }
 
+    private XmlPullParser maybeProvidedXmlPullParser() {
+        return this.xmlPullParserProvider != null
+                ? this.xmlPullParserProvider.newXmlPullParser()
+                : null;
+    }
+
     /**
      * De-serializes from the given input stream.
      * <br>

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

@@ -38,7 +38,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import net.sourceforge.easyml.marshalling.CompositeReader;
 import net.sourceforge.easyml.marshalling.CompositeStrategy;
 import net.sourceforge.easyml.marshalling.SimpleStrategy;
@@ -80,7 +79,7 @@
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
  * @since 1.0
- * @version 1.4.3
+ * @version 1.4.4
  */
 public class XMLReader implements Closeable {
 
@@ -430,26 +429,26 @@ public S put(String key, S value) {
     private Map<String, Object> decoded;
     private boolean sharedConfiguration;
     private UnmarshalContextImpl context;
-    /* default*/ ConcurrentHashMap<String, Object> cachedAliasingReflection;
-    /* default*/ ConcurrentHashMap<Class, Object> cachedDefCtors;
+    /* default*/ Map<String, Object> cachedAliasingReflection;
+    /* default*/ Map<Class, Object> cachedDefCtors;
+    private Caching.CachePutStrategy cachesPut;
     private Map<String, SimpleStrategy> simpleStrategies;
     private Map<String, CompositeStrategy> compositeStrategies;
     /* default*/ SimpleDateFormat dateFormat;
     /* default*/ SecurityPolicy securityPolicy;
 
     /**
-     * Creates a new instance. To be used by {@linkplain EasyML} only.
+     * Creates a new configuration prototype instance, to be used by
+     * {@linkplain EasyML} only.
      */
-    /* default*/ XMLReader(ConcurrentHashMap<Class, Object> commonCtorCache) {
+    /* default*/ XMLReader(Map<Class, Object> ctorCache, Map<String, Object> aliasFieldCache, Caching.CachePutStrategy cachesPut) {
         this.driver = null;
-        this.cachedDefCtors = commonCtorCache;
-        this.init();
+        this.init(ctorCache, aliasFieldCache, cachesPut);
     }
 
     /**
-     * Creates a new instance. To be used by {@linkplain EasyML} only.
-     *
-     * @param configured reader prototype
+     * Creates a new shared-configuration instance, to be used by
+     * {@linkplain EasyML} only.
      */
     /* default*/ XMLReader(XMLReader configured) {
         this.driver = null;
@@ -468,19 +467,6 @@ public XMLReader(Reader reader) {
         this.init();
     }
 
-    /**
-     * Creates a new shared-configuration instance with the given
-     * <code>reader</code> to use and the <code>kXML2</code> parser as default.
-     * The parser is set to the given reader.
-     *
-     * @param reader to read input with
-     * @param configured xml reader prototype
-     */
-    public XMLReader(Reader reader, XMLReader configured) {
-        this.driver = new XMLReaderTextDriver(this, reader);
-        this.initIdentically(configured);
-    }
-
     /**
      * Creates a new instance with the given <code>in</code> stream to read from
      * and the <code>kXML2</code> parser as default. The parser is set to the
@@ -493,19 +479,6 @@ public XMLReader(InputStream in) {
         this.init();
     }
 
-    /**
-     * Creates a new shared-configuration instance with the given
-     * <code>in</code> stream to read from and the <code>kXML2</code> parser as
-     * default. The parser is set to the given stream.
-     *
-     * @param in stream from which to read
-     * @param configured xml reader prototype
-     */
-    public XMLReader(InputStream in, XMLReader configured) {
-        this.driver = new XMLReaderTextDriver(this, new InputStreamReader(in));
-        this.initIdentically(configured);
-    }
-
     /**
      * Creates a new instance with the given <code>reader</code> to use and the
      * <code>parser</code> to process XML with. The parser is set (or reset) to
@@ -519,20 +492,6 @@ public XMLReader(Reader reader, XmlPullParser parser) {
         this.init();
     }
 
-    /**
-     * Creates a new shared-configuration instance with the given
-     * <code>reader</code> to use and the <code>parser</code> to process XML
-     * with. The parser is set (or reset) to the given reader.
-     *
-     * @param reader to read input with
-     * @param parser to process the in XML with
-     * @param configured xml reader prototype
-     */
-    public XMLReader(Reader reader, XmlPullParser parser, XMLReader configured) {
-        this.driver = new XMLReaderTextDriver(this, reader, parser);
-        this.initIdentically(configured);
-    }
-
     /**
      * Creates a new instance with the given <code>in</code> stream to read from
      * and the <code>parser</code> to process XML with. The parser is set to the
@@ -546,20 +505,6 @@ public XMLReader(InputStream in, XmlPullParser parser) {
         this.init();
     }
 
-    /**
-     * Creates a new shared-configuration instance with the given
-     * <code>in</code> stream to read from and the <code>parser</code> to
-     * process XML with. The parser is set to the given stream.
-     *
-     * @param in stream from which to read
-     * @param parser to process the in XML with
-     * @param configured xml reader prototype
-     */
-    public XMLReader(InputStream in, XmlPullParser parser, XMLReader configured) {
-        this.driver = new XMLReaderTextDriver(this, new InputStreamReader(in), parser);
-        this.initIdentically(configured);
-    }
-
     /**
      * Creates a new instance with the given <code>in</code> DOM document to
      * read from.
@@ -571,29 +516,19 @@ public XMLReader(Document in) {
         this.init();
     }
 
-    /**
-     * Creates a new shared-configuration instance with the given
-     * <code>in</code> DOM document to read from.
-     *
-     * @param in stream from which to read
-     * @param configured xml reader prototype
-     */
-    public XMLReader(Document in, XMLReader configured) {
-        this.driver = new XMLReaderDOMDriver(this, in);
-        this.initIdentically(configured);
+    private void init() {
+        this.init(new HashMap<Class, Object>(), new HashMap<String, Object>(), Caching.STRATEGY_PUT);
     }
 
-    private void init() {
+    private void init(Map<Class, Object> ctorCache, Map<String, Object> aliasFieldCache, Caching.CachePutStrategy cachesPut) {
         this.beforeRoot = true;
         this.rootTag = DTD.ELEMENT_EASYML;
         this.decoded = new HashMap<>();
         this.sharedConfiguration = false;
         this.context = new UnmarshalContextImpl();
-        // The caches must be concurrent in case this instance will be used as a prototype:
-        this.cachedAliasingReflection = new ConcurrentHashMap<>();
-        if (this.cachedDefCtors == null) {
-            this.cachedDefCtors = new ConcurrentHashMap<>();
-        }
+        this.cachedDefCtors = ctorCache;
+        this.cachedAliasingReflection = aliasFieldCache;
+        this.cachesPut = cachesPut;
         this.simpleStrategies = new StrategyHashMap<>();
         this.compositeStrategies = new StrategyHashMap<>();
         this.dateFormat = new SimpleDateFormat(DTD.FORMAT_DATE);
@@ -621,6 +556,7 @@ private void initIdentically(XMLReader other) {
         this.context = new UnmarshalContextImpl();
         this.cachedAliasingReflection = other.cachedAliasingReflection;
         this.cachedDefCtors = other.cachedDefCtors;
+        this.cachesPut = other.cachesPut;
         this.simpleStrategies = other.simpleStrategies;
         this.compositeStrategies = other.compositeStrategies;
         this.dateFormat = new SimpleDateFormat(other.dateFormat.toPattern());
@@ -1250,10 +1186,10 @@ public <T> Constructor<T> defaultConstructorFor(Class<T> c)
             }
             try {
                 final Constructor<T> ctor = ReflectionUtil.defaultConstructor(c);
-                cachedDefCtors.putIfAbsent(c, ctor);
+                cachesPut.put(cachedDefCtors, c, ctor);
                 return ctor;
             } catch (NoSuchMethodException noDefCtorX) {
-                cachedDefCtors.putIfAbsent(c, noDefCtorX);
+                cachesPut.put(cachedDefCtors, c, noDefCtorX);
                 throw noDefCtorX;
             }
         }
@@ -1291,7 +1227,7 @@ public Class classFor(String aliasOrName) throws ClassNotFoundException {
             }
             // else cache class:
             final Class ret = ReflectionUtil.classForName(aliasOrName);
-            cachedAliasingReflection.putIfAbsent(aliasOrName, ret);
+            cachesPut.put(cachedAliasingReflection, aliasOrName, ret);
             return ret;
         }
 
@@ -1304,7 +1240,7 @@ public Field fieldFor(Class declaring, String aliasOrName) throws NoSuchFieldExc
             }
             // else cache field:
             final Field ret = declaring.getDeclaredField(aliasOrName);
-            cachedAliasingReflection.putIfAbsent(fieldFQN, ret);
+            cachesPut.put(cachedAliasingReflection, fieldFQN, ret);
             return ret;
         }