v1.6.0: Java modules support

Author: cordisvictor

README.md

@@ -60,31 +60,44 @@ for a higher control compared to the EasyML Facade.
 
 ### Release Notes
 
-!Release 1.5.2
+Release 1.6.0 (requires Java 9, recommended up to Java 17)
+- XMLWriter and XMLReader use getters and setters.
+- feature: support for Java 9 modules.
+- NON-BACKWARD COMPATIBLE refactor of ReflectionUtil.
+
+
+Release 1.5.3
+- refactor: remove deprecated Class.newInstance() usages.
+- refactor: limited reflection usage from Properties, EnumSet, EnumMap,
+SingletonList, SingletonSet, SingletonMap strategies.
+- feature: added java.util.concurrent.atomic strategies.
+- feature: added java.util.Collections emptyList, emptyMap, emptySet strategies.
+
+
+Release 1.5.2 (requires Java 8, recommended up to Java 9)
 - feature: added generic mechanism for cache clearing.
 
 
-!Release 1.5.1
+Release 1.5.1
 - feature: added functional API.
 - feature: added CalendarStrategy and OptionalStrategy.
 - feature: added java.time strategies.
 - performance: added caching to SerializableStrategy.
 - refactor: remove Profile feature.
 
 
-!Release 1.5.0
-- requires Java 8 or later.
+Release 1.5.0 (requires Java 8)
+- feature: support for Java 9 security.
 - NON-BACKWARD COMPATIBLE refactor of ReflectionUtil.
-- feature: support for Java 9 security model.
 
 
-!Release 1.4.7
+Release 1.4.7
 - last Java 7 compatible release.
 - bugfix: performance regression in Serialization strategy.
 - remove AccessibleObject.isAccessible calls.
 
 
-!Release 1.4.6
+Release 1.4.6
 - remove deprecated v1.3.4 object-o and array-o strategies.
 - replaced MarshalContext aliasFor methods with aliasOrNameFor methods.
 - bugfix: EnumStrategy marshalling fix.
@@ -93,20 +106,20 @@ for a higher control compared to the EasyML Facade.
 - feature: added serialization serialPersistentFields support.
 
 
-!Release 1.4.5
+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
+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
+Release 1.4.3
 - feature: new n.s.e.m.j.i.ExternalizableStrategy offers support for the
 Java Externalizable protocol.
 - feature: new n.s.e.XMLReader.hasMore method.
@@ -116,35 +129,40 @@ EasyML.Profile.Generic for more portable XML.
 object input and output streams.
 
 
-!Release 1.4.2
+Release 1.4.2
 - bugfix: n.s.e.m.j.i.SerializableStrategy GetFieldImpl readFields fix.
 
 
-!Release 1.4.1
+Release 1.4.1
 - bugfix: XMLWriter text driver empty line when pretty printing.
 
 
-!Release 1.4.0
+Release 1.4.0
 - NON-BACKWARD COMPATIBLE refactor: EasyML now immutable(removed setters).
 - feature: EasyMLBuilder for easyml customization.
 
 
-!Release 1.3.10
+Release 1.3.11
+- bugfix: n.s.e.m.j.i.SerializableStrategy GetFieldImpl readFields fix.
+- bugfix: XMLWriter text driver startElement impl improvement.
+
+
+Release 1.3.10
 - bugfix: XMLWriter text driver empty line when pretty printing.
 - javadoc: improvements.
 
 
-!Release 1.3.9
+Release 1.3.9
 - feature: EasyML, XMLReader, XMLWriter custom XML root tag setting.
 - refactor: source level 1.7 warnings fixed.
 
 
-!Release 1.3.8
+Release 1.3.8
 - performance: EasyML cache reflected class constructors.
 - feature: EasyML, XMLReader, XMLWriter clearCache() methods.
 
 
-!Release 1.3.7
+Release 1.3.7
 - performance: EasyML and XMLReader cache reflected classes and fields.
 This is done via n.s.e.m.UnmarshalContext's classFor() and fieldFor().
 Distinct EasyML instances have separate caches.
@@ -154,13 +172,13 @@ XMLReaders share caches only when isSharedConfiguration().
 - bugfix: remove duplicate encoded.clear() from XMLWriter.reset().
 
 
-!Release 1.3.6
+Release 1.3.6
 - feature: added n.s.e.EasyML.releaseCurrentReader()
-and n.s.e.EasyML.releaseCurrentWriter() methods.
+    and n.s.e.EasyML.releaseCurrentWriter() methods.
 - performance: removed the redundant easyml version attribute.
 
 
-!Release 1.3.5
+Release 1.3.5
 - performance: reduced the impact of class aliasing and field aliasing
 features, even when NOT used, on serialize() and deserialize() times.
 - performance: n.s.e.u.ReflectionUtil unsafe instantiation method now
@@ -172,7 +190,7 @@ security reasons.
 it was deprecated since version 1.2.2.
 - refactor: renamed "object-o", "array-o" to "objectx", "arrayx"
 - bugfix: object field values could get inverted at read if ALL of the
-following conditions hold:
+    following conditions hold:
     1. skipDefaults is enabled.
     2. instance has same name fields on different inheritance levels.
     3. instance defines default values on each level.
@@ -184,32 +202,32 @@ XML outputted by versions 1.3.5 down to 1.2.1 and will produce only
 1.3.5 formatted XML.
 
 
-!Release 1.3.4
+Release 1.3.4
 - performance: n.s.e.XMLWriterTextDriver improvements allow EasyML to
-perform up to 20% faster. The performance improvement is more
-pronounced when pretty printing is enabled.
+    perform up to 20% faster. The performance improvement is more
+    pronounced when pretty printing is enabled.
 
 
-!Release 1.3.3
+Release 1.3.3
 - doc: better javadoc for n.s.e.EasyML, n.s.e.XMLReader, n.s.e.XMLWriter.
 - bugfix: include position descriptor in each InvalidFormatException case.
 - bugfix: n.s.e.XMLReaderTextDriver.consumeFully() fix.
 
 
-!Release 1.3.2
+Release 1.3.2
 - performance: n.s.e.EasyML serialize() and deserialize() methods use
 ThreadLocal internally for XMLWriter and XMLReader instance reuse,
 in order to improve performance, while remaining thread-safe.
 
 
-!Release 1.3.1
+Release 1.3.1
 - feature: added n.s.e.EasyML newReader() and newWriter methods in order
 to expose more API features at facade level.
 - bugfix: prevent shared-config readers and writers from allowing config
 modifications.
 
 
-!Release 1.3.0
+Release 1.3.0
 - NON-BACKWARD COMPATIBLE refactor:
 merged n.s.e.ExtendedEasyML into n.s.e.EasyML.
 - feature: n.s.e.EasyML facade is now thread-safe while the thread-unsafe
@@ -222,25 +240,3 @@ multithread features.
 Note: except for the last mentioned bugfix, all other changes were made
       to offer an easier and faster API for multithreaded environments.
 
-
-!Release 1.2.6
-- feature: fail first security policy enforcement for n.s.e.XMLReader
-readObject and readArray.
-- bugfix: security policy now validates params at add and addHierarchy.
-- bugfix: consume remaining XML on security policy exception, to allow
-subsequent reads, if possible.
-- bugfix: better XMLWriter and XMLReader close method impls.
-
-
-!Release 1.2.5
-- feature: n.s.e.EasyML and n.s.e.XMLReader: new securityPolicy settings
-used to configure, if needed, black- or whitelists for objects found at
-deserialization time.
-
-
-!Release 1.2.4
-- NON-BACKWARD COMPATIBLE refactor: n.s.e.m.CompositeStrategy: removed the
-"defTarget" parameter as it was only used when skipDefaults was true
-and it was buggy in some cases such as a bean setting a property in a
-default sub-bean (composition, not inheritance) within it's default constructor.
-

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

@@ -32,6 +32,10 @@
 import net.sourceforge.easyml.marshalling.java.time.*;
 import net.sourceforge.easyml.marshalling.java.util.*;
 import net.sourceforge.easyml.marshalling.java.util.concurrent.ConcurrentHashMapStrategy;
+import net.sourceforge.easyml.marshalling.java.util.concurrent.atomic.AtomicBooleanStrategy;
+import net.sourceforge.easyml.marshalling.java.util.concurrent.atomic.AtomicIntegerStrategy;
+import net.sourceforge.easyml.marshalling.java.util.concurrent.atomic.AtomicLongStrategy;
+import net.sourceforge.easyml.marshalling.java.util.concurrent.atomic.AtomicReferenceStrategy;
 import net.sourceforge.easyml.marshalling.java.util.regex.PatternStrategy;
 import org.w3c.dom.Document;
 import org.xmlpull.v1.XmlPullParser;
@@ -80,7 +84,7 @@
  * objects.<br/>
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
- * @version 1.5.1
+ * @version 1.5.3
  * @see XMLReader
  * @see XMLWriter
  * @since 1.0
@@ -246,6 +250,9 @@ public static void defaultConfiguration(XMLWriter writer) {
         composite.add(CalendarStrategy.INSTANCE);
         composite.add(EnumMapStrategy.INSTANCE);
         composite.add(EnumSetStrategy.INSTANCE);
+        composite.add(EmptyListStrategy.INSTANCE);
+        composite.add(EmptyMapStrategy.INSTANCE);
+        composite.add(EmptySetStrategy.INSTANCE);
         composite.add(HashMapStrategy.INSTANCE);
         composite.add(HashSetStrategy.INSTANCE);
         composite.add(HashtableStrategy.INSTANCE);
@@ -262,10 +269,16 @@ public static void defaultConfiguration(XMLWriter writer) {
         composite.add(StackStrategy.INSTANCE);
         composite.add(TreeMapStrategy.INSTANCE);
         composite.add(TreeSetStrategy.INSTANCE);
+        simple.add(TimeZoneStrategy.INSTANCE);
         simple.add(UUIDStrategy.INSTANCE);
         composite.add(VectorStrategy.INSTANCE);
         // util.concurrent:
         composite.add(ConcurrentHashMapStrategy.INSTANCE);
+        // util.concurrent.atomic:
+        simple.add(AtomicBooleanStrategy.INSTANCE);
+        simple.add(AtomicIntegerStrategy.INSTANCE);
+        simple.add(AtomicLongStrategy.INSTANCE);
+        composite.add(AtomicReferenceStrategy.INSTANCE);
         // util.regex:
         composite.add(PatternStrategy.INSTANCE);
     }
@@ -330,6 +343,9 @@ public static void defaultConfiguration(XMLReader reader) {
         composite.put(CalendarStrategy.NAME, CalendarStrategy.INSTANCE);
         composite.put(EnumMapStrategy.NAME, EnumMapStrategy.INSTANCE);
         composite.put(EnumSetStrategy.NAME, EnumSetStrategy.INSTANCE);
+        composite.put(EmptyListStrategy.NAME, EmptyListStrategy.INSTANCE);
+        composite.put(EmptyMapStrategy.NAME, EmptyMapStrategy.INSTANCE);
+        composite.put(EmptySetStrategy.NAME, EmptySetStrategy.INSTANCE);
         composite.put(HashMapStrategy.NAME, HashMapStrategy.INSTANCE);
         composite.put(HashSetStrategy.NAME, HashSetStrategy.INSTANCE);
         composite.put(HashtableStrategy.NAME, HashtableStrategy.INSTANCE);
@@ -346,10 +362,16 @@ public static void defaultConfiguration(XMLReader reader) {
         composite.put(StackStrategy.NAME, StackStrategy.INSTANCE);
         composite.put(TreeMapStrategy.NAME, TreeMapStrategy.INSTANCE);
         composite.put(TreeSetStrategy.NAME, TreeSetStrategy.INSTANCE);
+        simple.put(TimeZoneStrategy.NAME, TimeZoneStrategy.INSTANCE);
         simple.put(UUIDStrategy.NAME, UUIDStrategy.INSTANCE);
         composite.put(VectorStrategy.NAME, VectorStrategy.INSTANCE);
         // util.concurrent:
         composite.put(ConcurrentHashMapStrategy.NAME, ConcurrentHashMapStrategy.INSTANCE);
+        // util.concurrent.atomic:
+        simple.put(AtomicBooleanStrategy.NAME, AtomicBooleanStrategy.INSTANCE);
+        simple.put(AtomicIntegerStrategy.NAME, AtomicIntegerStrategy.INSTANCE);
+        simple.put(AtomicLongStrategy.NAME, AtomicLongStrategy.INSTANCE);
+        composite.put(AtomicReferenceStrategy.NAME, AtomicReferenceStrategy.INSTANCE);
         // util.regex:
         composite.put(PatternStrategy.NAME, PatternStrategy.INSTANCE);
     }

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

@@ -20,10 +20,9 @@
 
 import net.sourceforge.easyml.marshalling.*;
 import net.sourceforge.easyml.marshalling.dtd.*;
-import net.sourceforge.easyml.marshalling.java.io.SerializableStrategy;
 import net.sourceforge.easyml.marshalling.java.lang.*;
 import net.sourceforge.easyml.util.ReflectionUtil;
-import net.sourceforge.easyml.util.ValueType;
+import net.sourceforge.easyml.util.ReflectionUtil.ValueType;
 import net.sourceforge.easyml.util.XMLUtil;
 import org.w3c.dom.Document;
 import org.xmlpull.v1.XmlPullParser;
@@ -32,7 +31,10 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.lang.reflect.*;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -63,7 +65,7 @@
  * shared configuration can be created, via constructors.
  *
  * @author Victor Cordis ( cordis.victor at gmail.com)
- * @version 1.5.1
+ * @version 1.6.0
  * @see XMLWriter
  * @since 1.0
  */
@@ -646,12 +648,12 @@ public void alias(Class c, String alias) {
         alias0(c, alias);
     }
 
-    private void alias0(Object toAlias, String alias) {
+    private void alias0(Object aliased, String alias) {
         if (alias == null || alias.isEmpty() || !XMLUtil.isLegalXMLText(alias)) {
             throw new IllegalArgumentException("alias: null, empty, or contains illegal XML chars: " + alias);
         }
         this.checkNotSharedConfiguration();
-        this.cachedAliasingReflection.put(alias, toAlias);
+        this.cachedAliasingReflection.put(alias, aliased);
     }
 
     /**
@@ -908,20 +910,25 @@ private Object read0(Class componentType) {
                 return this.readArray0(componentType); // also consumes element end.
             }
             throw new InvalidFormatException(this.driver.positionDescriptor(), "invalid element start: " + localPartName);
-        } catch (ClassNotFoundException iB) {
-            throw new InvalidFormatException(this.driver.positionDescriptor(), "unknown object class: " + iB.getMessage(), iB);
-        } catch (InstantiationException iDC) {
-            throw new InvalidFormatException(this.driver.positionDescriptor(), "invalid object constructor: " + iDC.getMessage(), iDC);
-        } catch (IllegalAccessException iDC) {
-            throw new InvalidFormatException(this.driver.positionDescriptor(), "invalid object constructor modifier: " + iDC.getMessage(), iDC);
+        } catch (ClassNotFoundException ex) {
+            throw new InvalidFormatException(this.driver.positionDescriptor(), "unknown element class: " + ex.getMessage(), ex);
+        } catch (NoSuchMethodException ex) {
+            throw new InvalidFormatException(this.driver.positionDescriptor(), "invalid element class: " + ex.getMessage(), ex);
+        } catch (IllegalAccessException ex) {
+            throw new InvalidFormatException(this.driver.positionDescriptor(), "invalid element class: " + ex.getMessage(), ex);
+        } catch (InstantiationException ex) {
+            throw new InvalidFormatException(this.driver.positionDescriptor(), "failed element class instantiation: " + ex.getMessage(), ex);
+        } catch (InvocationTargetException ex) {
+            throw new InvalidFormatException(this.driver.positionDescriptor(), "failed element class invocation: " + ex.getMessage(), ex);
         }
     }
 
     // read0: readObj:
-    private Object readObject() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+    private Object readObject()
+            throws ClassNotFoundException, InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
         // read object attributes and create instance and mark it as visited:
         Class cls = this.context.classFor(this.driver.elementRequiredAttribute(DTD.ATTRIBUTE_CLASS));
-        final Object ret = cls.newInstance();
+        final Object ret = ReflectionUtil.instantiate(cls);
         // security check:
         this.ensureSecurityPolicy(ret);
         this.decoded.put(this.driver.elementRequiredAttribute(DTD.ATTRIBUTE_ID), ret);
@@ -942,15 +949,18 @@ private Object readObject() throws ClassNotFoundException, InstantiationExceptio
                     cls = cls.getSuperclass();
                 }
                 // check if field is indeed an instance property:
-                if (f == null || !ReflectionUtil.isFieldProperty(f)) {
+                if (f == null) {
                     throw new InvalidFormatException(this.driver.positionDescriptor(), "undefined property: " + cls.getName() + '.' + localPartName);
                 }
-                ReflectionUtil.setAccessible(f);
+                final ReflectionUtil.FieldInfo fi = ReflectionUtil.fieldInfoForWrite(f);
+                if (!fi.isProperty) {
+                    throw new InvalidFormatException(this.driver.positionDescriptor(), "not a property: " + cls.getName() + '.' + localPartName);
+                }
                 // move down in the property value and read it:
                 if (!this.driver.next() || !this.driver.atElementStart()) {
                     throw new InvalidFormatException(this.driver.positionDescriptor(), "expected element start");
                 }
-                f.set(ret, this.read0(f.getType().getComponentType()));
+                ReflectionUtil.writeProperty(ret, this.read0(f.getType().getComponentType()), f, fi.accessor);
             } else if (this.driver.atElementEnd() && this.driver.elementName().equals(DTD.ELEMENT_OBJECT)) {
                 this.driver.next(); // consume object element end.
                 return ret;