, InstanceCreator> getCollectionMapping() {
- return this.collectionMapping;
- }
-
- /**
- * Adds or updates a type conversion function for a given class.
- *
- * This allows users to customize how objects are converted into specific types
- * during processing (e.g., JSON deserialization).
- *
- * @param clazz the target class for which the conversion function is to be set
- * @param function a function that takes an {@code Object} and returns an instance of {@code clazz}
- */
- public void setClassMapping(Class clazz, TypeConverter function) {
- classMapping.put(clazz, function);
- }
-
- /**
- * Adds or updates a supplier function for instantiating a collection type.
- *
- *
This allows customization of which concrete implementation is used for
- * interface types like {@code List}, {@code Set}, or {@code Map}.
- *
- * @param clazz the collection interface class (e.g., {@code List.class})
- * @param function a supplier that creates a new instance of a concrete implementation
- */
- public void setCollectionMapping(Class clazz, InstanceCreator function) {
- collectionMapping.put(clazz, function);
- }
-}
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
index f6e1d43..52bd2fe 100644
--- a/src/main/java/org/json/JSONObject.java
+++ b/src/main/java/org/json/JSONObject.java
@@ -19,6 +19,7 @@ import java.util.Map.Entry;
import java.util.regex.Pattern;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.lang.reflect.GenericArrayType;
/**
* A JSONObject is an unordered collection of name/value pairs. Its external
@@ -121,12 +122,6 @@ public class JSONObject {
*/
static final Pattern NUMBER_PATTERN = Pattern.compile("-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?");
-
- /**
- * A Builder class for handling the conversion of JSON to Object.
- */
- private JSONBuilder builder;
-
/**
* The map where the JSONObject's properties are kept.
*/
@@ -162,6 +157,145 @@ public class JSONObject {
this.map = new HashMap();
}
+ /**
+ * A mapping from Java classes to functions that convert a generic {@code Object}
+ * into an instance of the target class.
+ *
+ * Examples of default mappings:
+ *
+ * - {@code int.class} or {@code Integer.class} -> Converts a {@code Number} to {@code int}
+ * - {@code boolean.class} or {@code Boolean.class} -> Identity function
+ * - {@code String.class} -> Identity function
+ *
+ */
+ private static final Map, TypeConverter> classMapping = new HashMap, TypeConverter>();
+
+ /**
+ * A mapping from collection interface types to suppliers that produce
+ * instances of concrete collection implementations.
+ *
+ */
+ private static final Map, InstanceCreator> collectionMapping = new HashMap, InstanceCreator>();
+
+ // Static initializer block to populate default mappings
+ static {
+ classMapping.put(int.class, new TypeConverter() {
+ public Integer convert(Object input) {
+ return ((Number) input).intValue();
+ }
+ });
+ classMapping.put(Integer.class, new TypeConverter() {
+ public Integer convert(Object input) {
+ return ((Number) input).intValue();
+ }
+ });
+ classMapping.put(double.class, new TypeConverter() {
+ public Double convert(Object input) {
+ return ((Number) input).doubleValue();
+ }
+ });
+ classMapping.put(Double.class, new TypeConverter() {
+ public Double convert(Object input) {
+ return ((Number) input).doubleValue();
+ }
+ });
+ classMapping.put(float.class, new TypeConverter() {
+ public Float convert(Object input) {
+ return ((Number) input).floatValue();
+ }
+ });
+ classMapping.put(Float.class, new TypeConverter() {
+ public Float convert(Object input) {
+ return ((Number) input).floatValue();
+ }
+ });
+ classMapping.put(long.class, new TypeConverter() {
+ public Long convert(Object input) {
+ return ((Number) input).longValue();
+ }
+ });
+ classMapping.put(Long.class, new TypeConverter() {
+ public Long convert(Object input) {
+ return ((Number) input).longValue();
+ }
+ });
+ classMapping.put(boolean.class, new TypeConverter() {
+ public Boolean convert(Object input) {
+ return (Boolean) input;
+ }
+ });
+ classMapping.put(Boolean.class, new TypeConverter() {
+ public Boolean convert(Object input) {
+ return (Boolean) input;
+ }
+ });
+ classMapping.put(String.class, new TypeConverter() {
+ public String convert(Object input) {
+ return (String) input;
+ }
+ });
+
+ collectionMapping.put(List.class, new InstanceCreator() {
+ public List create() {
+ return new ArrayList();
+ }
+ });
+ collectionMapping.put(Set.class, new InstanceCreator() {
+ public Set create() {
+ return new HashSet();
+ }
+ });
+ collectionMapping.put(Map.class, new InstanceCreator