2.0.0 draft

miktim · miktim · commit 1754bf936795 · 2022-04-18T16:36:18.000+03:00
diff --git a/README b/README
@@ -29,7 +29,7 @@ Overview:
     - after JSON text parsing or normalization, they are stored as:
       BigDecimal, Object[] {BigDecimal,...}, Object[] {String,...}
 
-    Constructor:
+    Constructors:
       JSON(String jsonText) throws IOException, ParseException;
       JSON(Reader reader) throws IOException, ParseException;
       JSON(Object... members) throws IndexOutOfBoundsException; // name,value pairs
@@ -70,6 +70,7 @@ Overview:
     - casting null to a Java primitive returns corresponding initial value;
     - casting null to an array returns an empty array;
     - casting null to String returns "null";
+    - casting null to other Java objects returns null;
     - casting to null returns null.
 
     static <T> T cast(Object jsonVal, T sample);
@@ -78,10 +79,10 @@ Overview:
 
   Abstract class JSONObject;
 
-    Converts Java object fields to/from JSON object.
+    Unloads/loads Java object accessible fields to/from JSON object.
+    - Java final, interface, abstract, transient, strict fields are ignored;
     - see JSON set/get/cast rules for Java object fields in the notes for JSON object
-      and JSONAdapter;
-    - Enum, synthetic and final fields are ignored.
+      and JSONAdapter.
 
     Constant:
       static final Object IGNORED; // returns from replacer/reviver to skip the field
@@ -97,7 +98,7 @@ Overview:
          // first call with object class name and json argument as value
       static boolean isClassName(String name);
       <T> T castMember(String memberName, JSON jsonObj, T sample);
-         // returns the sample if member does not exists
+         // returns the sample if JSON member does not exists
       protected void setIgnored(String[] fldNames); // set ignored field names
       protected String[] getIgnored()
 
diff --git a/dist/json-2.0.0.jar b/dist/json-2.0.0.jar
diff --git a/src/org/miktim/json/JSON.java b/src/org/miktim/json/JSON.java
@@ -10,9 +10,9 @@
  * - when the names within an object are not unique, parser stores the last value only;
  * - JSON object setter accepts any Java object, all Java primitives and primitive arrays;
  * - avoid recursion!;
- * - in addition, the generator converts Java Lists, Sets to JSON arrays
+ * - in addition, the generator converts Java Collections to JSON arrays
  *   and Java Maps to JSON objects. The null key is converted to a "null" member name.
- *   Other Java objects are converted to JSON strings.
+ *   Other Java objects are converted to string representation.
  *
  * Created: 2020-03-07
  */
diff --git a/src/org/miktim/json/JSONAdapter.java b/src/org/miktim/json/JSONAdapter.java
@@ -1,6 +1,15 @@
 /*
  * JSONAdapter class. MIT (c) 2022 miktim@mail.ru
- * Cast by sample/class JSON variable to Java primitive or primitive array
+ *
+ * Casting by sample or Class of a JSON variable or array to a Java primitive or array.
+ * - sample must be initialized;
+ * - casting null to a Java primitive returns corresponding initial value;
+ * - casting null to an array returns an empty array;
+ * - casting null to String returns "null";
+ * - casting null to other Java objects returns null;
+ * - casting to null returns null.
+ *
+ * Created: march 2022
  */
 package org.miktim.json;
 
diff --git a/src/org/miktim/json/JSONObject.java b/src/org/miktim/json/JSONObject.java
@@ -1,11 +1,19 @@
 /*
- * JSONObject class. MIT (c) 2022 miktim@mail.ru
+ * JSONObject abstract class. MIT (c) 2022 miktim@mail.ru
+ *
+ * Unloads/loads Java object accessible fields to/from JSON object.
+ * - Java final, interface, abstract, transient, strict fields are ignored;
+ * - see JSON set/get/cast rules for Java object fields in the notes for JSON object
+ *   and JSONAdapter.
+ *
+ * Created: april 2022
  */
 package org.miktim.json;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 
 public abstract class JSONObject {
 
@@ -46,31 +54,32 @@ public static boolean isClassName(String fldName) {
         return true;
     }
 
-    private String[] _ignoredFields = new String[]{};//
+    private String[] ignoredFields = new String[]{};//
 
-    protected boolean isIgnored(String fldName) {
-        return Arrays.binarySearch(_ignoredFields, fldName) >= 0;
+    protected final boolean isIgnored(String fldName) {
+        return Arrays.binarySearch(ignoredFields, fldName) >= 0;
     }
 
     protected void setIgnored(String[] fldNames) {
-        _ignoredFields = fldNames.clone();
-        Arrays.sort(_ignoredFields);
+        ignoredFields = fldNames.clone();
+        Arrays.sort(ignoredFields);
     }
 
     protected String[] getIgnored() {
-        return _ignoredFields;
+        return ignoredFields;
     }
 
     private Object toJSON(JSONObject jsonObj) // returns Object
             throws IllegalArgumentException, IllegalAccessException {
         String name = jsonObj.getClass().getName();
         Object json = jsonObj.replacer(name, new JSON());
         if (json instanceof JSON) {
-            Field[] fields = jsonObj.getClass().getDeclaredFields();
-//            Field[] fields = getFields(jsonObj);
+//            Field[] fields = jsonObj.getClass().getDeclaredFields();
+            Field[] fields = getAccessibleFields(jsonObj);
             for (Field field : fields) {
-                if (!jsonObj.isIgnored(field)) {
-                    name = field.getName();
+                name = field.getName();
+//                if (!jsonObj.isIgnored(field)) {
+                if (!jsonObj.isIgnored(name)) {
                     field.setAccessible(true);
                     Object value = jsonObj.replacer(name, field.get(jsonObj));
                     if (value == null || !value.equals(IGNORED)) {
@@ -90,11 +99,12 @@ private JSONObject fromJSON(JSONObject jsonObj, Object json)
         String name = jsonObj.getClass().getName();
         json = jsonObj.reviver(name, json);
         if (json instanceof JSON) {
-            Field[] fields = jsonObj.getClass().getDeclaredFields();
-//            Field[] fields = getFields(jsonObj);
+//            Field[] fields = jsonObj.getClass().getDeclaredFields();
+            Field[] fields = getAccessibleFields(jsonObj);
             for (Field field : fields) {
                 name = field.getName();
-                if (!jsonObj.isIgnored(field) && ((JSON) json).exists(name)) {
+//                if (!jsonObj.isIgnored(field) && ((JSON) json).exists(name)) {
+                if (!jsonObj.isIgnored(name) && ((JSON) json).exists(name)) {
                     field.setAccessible(true);
                     Object newValue = jsonObj.reviver(name, ((JSON) json).get(name));
                     Object value = field.get(jsonObj);
@@ -112,10 +122,35 @@ private JSONObject fromJSON(JSONObject jsonObj, Object json)
         return jsonObj;
     }
 
+    /*
     private boolean isIgnored(Field field) {
         return field.isSynthetic() || field.isEnumConstant() //|| field.isAccessible() deprecated
                 || isIgnored(field.getName())
                 || (field.getModifiers() & Modifier.FINAL) != 0;
+    }*/
+
+    private Field[] getAccessibleFields(Object obj) {
+        LinkedHashMap<String, Field> accessibleFields = new LinkedHashMap<>();
+        Class cls = obj.getClass();
+        Package pkg = cls.getPackage();
+        int ignore = Modifier.FINAL | Modifier.TRANSIENT | Modifier.STRICT
+                | Modifier.INTERFACE | Modifier.ABSTRACT;
+        while (cls != null) {
+            Field[] fields = cls.getDeclaredFields();
+// for different package ignore NATIVE
+            int ignored = ignore | (pkg != cls.getPackage() ? Modifier.NATIVE : 0);
+            for (Field field : fields) {
+                String name = field.getName();
+                if (!accessibleFields.containsKey(name)
+                        && (field.getModifiers() & ignored) == 0) {
+                    accessibleFields.put(name, field);
+                }
+            }
+// for all super classes disable PRIVATE
+            ignore |= Modifier.PRIVATE;
+            cls = cls.getSuperclass();
+        }
+        return accessibleFields.values().toArray(new Field[]{});
     }
 
 }
diff --git a/test/json/JSONObjectTest.java b/test/json/JSONObjectTest.java
@@ -12,13 +12,15 @@
 public class JSONObjectTest extends JSONObject {
 
     public static String mS = "mS value";
-    public A mA = new A(); // A extends J
-    protected B mB = new B(); // B extends A
-    J mJ = new J(); // J extends JSONObject
     static final String mSf = "Final fields ignored";
+    private double md = 3.14159;
     private int mi = 123;
     private String mSp = "mSp value";
 
+    public A mA = new A(); // A extends J
+    protected B mB = new B(); // B extends A
+    J mJ = new J(); // J extends JSONObject
+
     public static void log(Object s) {
         System.out.println(s);
     }
@@ -54,9 +56,9 @@ class B extends A {
         protected Object replacer(String name, Object value) {
             logName(this, name); // logName(), log() inherited from J
             if (isClassName(name)) {
-// unload inherited
-                ((JSON) value).set("aS", aS).set("jc", getJc());
-                log("Unloaded inherited A.aS, J.jc: " + aS + ", " + getJc());
+// unload by getter
+                ((JSON) value).set("jc", getJc());
+                log("Unloaded by getter J.jc: " + getJc());
             }
             return value;
         }
@@ -65,10 +67,9 @@ protected Object replacer(String name, Object value) {
         protected Object reviver(String name, Object value) {
             logName(this, name);
             if (isClassName(name)) {
-// load inherited
-                aS = castMember("aS", (JSON) value, aS);
+// load by setter
                 setJc(castMember("jc", (JSON) value, getJc()));
-                log("Loaded inherited A.aS, J.jc: " + aS + ", " + getJc());
+                log("Loaded by setter J.jc: " + getJc());
             }
             return value;
         }
