deps: Update commons-beanutils to 1.11.0

aalmiray · aalmiray · commit 833c14fcfdb5 · 2025-06-18T10:33:39.000+02:00
Fixes #64
diff --git a/gradle.properties b/gradle.properties
@@ -21,7 +21,7 @@ sourceCompatibility        = 1.8
 targetCompatibility        = 1.8
 
 commonsLangVersion         = 3.17.0
-commonsBeanutilsVersion    = 1.9.3
+commonsBeanutilsVersion    = 1.11.0
 commonsCollections4Version = 4.5.0
 ezmorphVersion             = 3.1.0
 jacocoVersion              = 0.8.12
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/AbstractJSONObjectStaticBuildersTestCase.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/AbstractJSONObjectStaticBuildersTestCase.java
@@ -52,7 +52,7 @@ public void testFromObject_excludes_ignoreDefaults() {
         jsonConfig.setIgnoreDefaultExcludes(true);
         JSONObject json = JSONObject.fromObject(getSource(), jsonConfig);
         assertJSONObject(json, getProperties());
-        assertTrue(json.has("class"));
+        assertTrue(!json.has("class"));
         assertTrue(!json.has("pexcluded"));
     }
 
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObject.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObject.java
@@ -201,7 +201,7 @@ public void testElement_Bean_exclusions_ignoreDefault() {
         jsonConfig.setIgnoreDefaultExcludes(true);
         jsonObject.element("bean", new ObjectBean(), jsonConfig);
         JSONObject actual = jsonObject.getJSONObject("bean");
-        Assertions.assertTrue(actual.has("class"));
+        Assertions.assertTrue(!actual.has("class"));
         Assertions.assertTrue(!actual.has("pexcluded"));
     }
 
@@ -260,7 +260,7 @@ public void testElement_Collection2_exclusions_ignoreDefault() {
         jsonObject.element("list", list, jsonConfig);
         JSONObject actual = jsonObject.getJSONArray("list")
             .getJSONObject(0);
-        Assertions.assertTrue(actual.has("class"));
+        Assertions.assertTrue(!actual.has("class"));
         Assertions.assertTrue(!actual.has("pexcluded"));
     }
 
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_DynaBean.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_DynaBean.java
@@ -41,7 +41,7 @@ protected Object getSource() {
         for (int i = 0; i < props.length; i++) {
             map.put(props[i], PropertyConstants.getPropertyClass(props[i]));
         }
-        map.put("class", Class.class);
+        //map.put("class", Class.class);
         map.put("pexcluded", String.class);
         MorphDynaClass dynaClass = new MorphDynaClass(map);
         MorphDynaBean dynaBean = null;
@@ -50,7 +50,7 @@ protected Object getSource() {
             for (int i = 0; i < props.length; i++) {
                 dynaBean.set(props[i], PropertyConstants.getPropertyValue(props[i]));
             }
-            dynaBean.set("class", Object.class);
+            //dynaBean.set("class", Object.class);
             dynaBean.set("pexcluded", "");
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_JSONObject.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_JSONObject.java
@@ -37,7 +37,7 @@ protected Object getSource() {
             for (int i = 0; i < props.length; i++) {
                 jsonObject.element(props[i], PropertyConstants.getPropertyValue(props[i]));
             }
-            jsonObject.element("class", Object.class);
+            //jsonObject.element("class", Object.class);
             jsonObject.element("pexcluded", "");
         } catch (Exception e) {
             throw new RuntimeException(e);
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_JSONString.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_JSONString.java
@@ -37,7 +37,8 @@ protected Object getSource() {
     public static class JsonBean implements JSONString {
 
         public String toJSONString() {
-            return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
+            return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}";
+            //return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
         }
     }
 }
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_JSONTokener.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_JSONTokener.java
@@ -34,6 +34,7 @@ public static void main(String[] args) {
 
     protected Object getSource() {
         return new JSONTokener(
-            "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}");
+            "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}");
+            //"{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}");
     }
 }
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_Map.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_Map.java
@@ -38,7 +38,7 @@ protected Object getSource() {
         for (int i = 0; i < props.length; i++) {
             map.put(props[i], PropertyConstants.getPropertyValue(props[i]));
         }
-        map.put("class", "");
+        //map.put("class", "");
         map.put("pexcluded", "");
         return map;
     }
diff --git a/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_String.java b/subprojects/json-lib-core/src/test/java/org/kordamp/json/TestJSONObjectStaticBuilders_String.java
@@ -30,6 +30,7 @@ public static void main(String[] args) {
     }
 
     protected Object getSource() {
-        return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
+        return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}";
+        //return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public void testFromObject_excludes_ignoreDefaults() {`
`52`	`52`	`jsonConfig.setIgnoreDefaultExcludes(true);`
`53`	`53`	`JSONObject json = JSONObject.fromObject(getSource(), jsonConfig);`
`54`	`54`	`assertJSONObject(json, getProperties());`
`55`		`- assertTrue(json.has("class"));`
	`55`	`+ assertTrue(!json.has("class"));`
`56`	`56`	`assertTrue(!json.has("pexcluded"));`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ protected Object getSource() {`
`37`	`37`	`for (int i = 0; i < props.length; i++) {`
`38`	`38`	`jsonObject.element(props[i], PropertyConstants.getPropertyValue(props[i]));`
`39`	`39`	`}`
`40`		`- jsonObject.element("class", Object.class);`
	`40`	`+ //jsonObject.element("class", Object.class);`
`41`	`41`	`jsonObject.element("pexcluded", "");`
`42`	`42`	`} catch (Exception e) {`
`43`	`43`	`throw new RuntimeException(e);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ protected Object getSource() {`
`37`	`37`	`public static class JsonBean implements JSONString {`
`38`	`38`
`39`	`39`	`public String toJSONString() {`
`40`		- return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
	`40`	+ return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}";
	`41`	+ //return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public static void main(String[] args) {`
`34`	`34`
`35`	`35`	`protected Object getSource() {`
`36`	`36`	`return new JSONTokener(`
`37`		- "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}");
	`37`	+ "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}");
	`38`	+ //"{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}");
`38`	`39`	`}`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected Object getSource() {`
`38`	`38`	`for (int i = 0; i < props.length; i++) {`
`39`	`39`	`map.put(props[i], PropertyConstants.getPropertyValue(props[i]));`
`40`	`40`	`}`
`41`		`- map.put("class", "");`
	`41`	`+ //map.put("class", "");`
`42`	`42`	`map.put("pexcluded", "");`
`43`	`43`	`return map;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public static void main(String[] args) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`protected Object getSource() {`
`33`		- return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
	`33`	+ return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"pexcluded\":\"\"}";
	`34`	+ //return "{\"parray\":[1,2],\"plong\":9223372036854775807,\"pchar\":\"J\",\"pboolean\":true,\"pfloat\":3.4028234663852886E38,\"pbean\":{\"parray\":null,\"plong\":null,\"pchar\":null,\"pboolean\":null,\"pfloat\":null,\"pbean\":null,\"pshort\":null,\"pdouble\":null,\"pclass\":null,\"pstring\":null,\"pint\":null,\"plist\":null,\"pfunction\":null,\"pmap\":null,\"pbyte\":null},\"pshort\":32767,\"pdouble\":1.7976931348623157E308,\"pclass\":\"java.lang.Object\",\"pstring\":\"json\",\"pint\":2147483647,\"plist\":[\"a\",\"b\"],\"pfunction\":function(){ this; },\"pmap\":null,\"pbyte\":127,\"class\":\"java.lang.Object\",\"pexcluded\":\"\"}";
`34`	`35`	`}`
`35`	`36`	`}`