1.0.5 code cleared

Author: miktim

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 miktim@mail.ru
+Copyright (c) 2020-2022 miktim@mail.ru
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README

@@ -1,4 +1,4 @@
-# Java JSON parser/generator, MIT (c) 2020-2021 miktim@mail.ru
+# Java JSON parser/generator, MIT (c) 2020-2022 miktim@mail.ru
 
 Release notes:
   - Java SE 7+, Android compatible;
@@ -19,7 +19,7 @@ Overview:
 
   Class JSON extends LinkedHashMap<String, Object>.
     Constructor:
-      JSON();
+      JSON(Object... members) throws IndexOutOfBoundsException; // name,value pairs
 
     Methods:
       static Object parse(String json) throws IOException, ParseException;
@@ -30,7 +30,7 @@ Overview:
       List<String> list(); // returns list of member names
       boolean exists(String memberName);
       Object get(String memberName); // inherited
-      JSON set(String memberName, Object value);
-      Object remove(String memberName); // inherited, returns the previous value
+      JSON set(String memberName, Object value); // create or replace member
+      Object remove(String memberName); // inherited, returns the current value or null
 
 Usage: see ./test/json/JSONTest.java

dist/json-1.0.5.jar

@@ -1,5 +1,5 @@
 /**
- * Java JSON parser/generator, MIT (c) 2020-2021 miktim@mail.ru
+ * Java JSON parser/generator, MIT (c) 2020-2022 miktim@mail.ru
  *
  * Release notes:
  * - Java 7+, Android compatible;
@@ -47,12 +47,14 @@ public static String stringify(Object object) throws IllegalArgumentException {
         return stringifyObject(object);
     }
 
-//    private LinkedHashMap<String, Object> members = new LinkedHashMap<>();
-
-    public JSON() {
-
+// Memebers: name,value pairs    
+    public JSON(Object... members) throws IndexOutOfBoundsException {
+        super();
+        for (int i = 0; i < members.length;) {
+            this.put(String.valueOf(members[i++]), members[i++]);
+        }
     }
-
+    
     public String stringify() {
         return stringify(this);
     }
@@ -61,40 +63,17 @@ public String stringify() {
     public String toString() {
         return stringify();
     }
-/*
-    @SuppressWarnings("unchecked")
-    @Override
-    public JSON clone() {//throws CloneNotSupportedException {
-//        JSON clone = (JSON) super.clone();
-        JSON clone = new JSON();
-        clone.members = (LinkedHashMap<String, Object>) this.members.clone();
-        return clone;
-    }
-*/
+
     public List<String> list() {
         return new ArrayList<>(this.keySet());
     }
 
     public boolean exists(String memberName) {
-        return getMembers().containsKey(memberName);
-    }
-
-    public Object get(String memberName) {
-        return getMembers().get(memberName);
+        return this.containsKey(memberName);
     }
 
     public JSON set(String memberName, Object value) {
-//          throws NullPointerException, IllegalArgumentException {
-//        getMembers().put(checkPropName(memberName), checkObjectType(value));
-        getMembers().put(memberName, value);
-        return this;
-    }
-
-    public Object remove(String memberName) {
-        return this.getMembers().remove(memberName);
-    }
-
-    private LinkedHashMap<String, Object> getMembers() {
+        this.put(memberName, value);
         return this;
     }
 
@@ -250,7 +229,7 @@ Object parse(Reader reader) throws IOException, ParseException {
         }
     }
 
-// Java Lists converts to JSON arrays [V[0],...,V[n]], Maps - to object {"K":V,...}
+// Java Lists, Sets converts to JSON arrays [V[0],...,V[n]], Maps - to object {"K":V,...}
     @SuppressWarnings("unchecked")
     static String stringifyObject(Object value) {
         if (value == null) {
@@ -259,10 +238,6 @@ static String stringifyObject(Object value) {
             return "\"" + escapeString((String) value) + "\"";
         } else if (value instanceof Number || value instanceof Boolean) {
             return value.toString(); // Number, Boolean
-//        } else if (value instanceof Character) {
-//            return stringifyObject(value.toString());
-//        } else if (value instanceof JSON) {
-//            return stringifyObject((JSON) value);
         } else if (value.getClass().isArray()) {
             StringBuilder sb = new StringBuilder("[");
             String separator = "";
@@ -289,8 +264,6 @@ static String stringifyObject(Object value) {
             return stringifyObject(((Set) value).toArray());
         }
         return stringifyObject(String.valueOf(value));
-//        throw new IllegalArgumentException("Unsupported object: "
-//                + value.getClass().getSimpleName());
     }
 
     private static final char[] ESCAPED_CHARS = {'"', '/', '\\', 'b', 'f', 'n', 'r', 't'};

src/org/miktim/JSON.java

@@ -1,5 +1,5 @@
 /*
- * JSONTest, MIT (c) 2020 miktim@mail.ru
+ * JSONTest, MIT (c) 2020-2022 miktim@mail.ru
  */
 import java.io.File;
 import java.io.FileReader;
@@ -25,6 +25,10 @@ public static void main(String[] args) throws Exception {
         }
 
         log("JSON package test");
+
+        log("\n\rTest constructor:");
+        log(new JSON("One", 1, "Two", 2, 3, "Three"));
+        
         log("\n\rTest escape/unescape string:");
         String unescaped = new String(new char[]{0x8, 0x9, 0xA, 0xC, 0xD, 0x22, 0x2F, 0x5C, 0, '-', 0x1F, 0xd834, 0xdd1e});
         String escaped = JSON.escapeString(unescaped);
@@ -80,13 +84,13 @@ public static void main(String[] args) throws Exception {
                 + json.exists(null) + "/" + json.exists("nonexistent"));
 
         log("\n\rTest JSON clone then remove \"BigDecimal\":");
-        JSON cloned = (JSON)json.clone();
+        JSON cloned = (JSON) json.clone();
         cloned.remove("BigDecimal");
         log(json.list());
         log(cloned.list());
 
         log("\n\rTest JSON with Java arrays:");
-        int[][] intArray = new int[][]{{0, 1, 2}, {3, 4, 5}};
+        int[][] intArray = new int[][]{{0, 1, 2}, {3, 4, 5, 6}};
         log(JSON.stringify(intArray));
         cloned.set("Array", intArray);
         log(JSON.stringify(cloned.get("Array")));