Review comments

stleary · Dec 23, 2023 · ffd48af · ffd48af
1 parent abea194
commit ffd48af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
@@ -5,25 +5,21 @@
  */
 public class JSONParserConfiguration extends ParserConfiguration {
 
-  /**
-   * We can override the default maximum nesting depth if needed.
-   */
-  public static final int DEFAULT_MAXIMUM_NESTING_DEPTH = ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH;
-
   /**
    * Configuration with the default values.
    */
   public JSONParserConfiguration() {
-    this.maxNestingDepth = DEFAULT_MAXIMUM_NESTING_DEPTH;
+    super();
   }
 
-  public JSONParserConfiguration(int maxNestingDepth) {
-    this.maxNestingDepth = maxNestingDepth;
+  @Override
+  protected JSONParserConfiguration clone() {
+    return new JSONParserConfiguration();
   }
 
   @Override
-  protected JSONParserConfiguration clone() {
-    return new JSONParserConfiguration(DEFAULT_MAXIMUM_NESTING_DEPTH);
+  public JSONParserConfiguration withMaxNestingDepth(final int maxNestingDepth) {
+    return super.withMaxNestingDepth(maxNestingDepth);
   }
 
 }
diff --git a/src/test/java/org/json/junit/JSONArrayTest.java b/src/test/java/org/json/junit/JSONArrayTest.java
@@ -32,6 +32,7 @@
 import org.json.JSONPointerException;
 import org.json.JSONString;
 import org.json.JSONTokener;
+import org.json.ParserConfiguration;
 import org.json.junit.data.MyJsonString;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -1442,14 +1443,14 @@ public void testRecursiveDepthArray() {
 
     @Test
     public void testRecursiveDepthAtPositionDefaultObject() {
-        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
+        HashMap<String, Object> map = JSONObjectTest.buildNestedMap(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         new JSONArray().put(0, map);
     }
 
     @Test
     public void testRecursiveDepthAtPosition1000Object() {
         HashMap<String, Object> map = JSONObjectTest.buildNestedMap(1000);
-        new JSONArray().put(0, map, new JSONParserConfiguration(1000));
+        new JSONArray().put(0, map, new JSONParserConfiguration().withMaxNestingDepth(1000));
     }
 
     @Test(expected = JSONException.class)
@@ -1467,14 +1468,14 @@ public void testRecursiveDepthArrayLimitedMaps() {
 
     @Test
     public void testRecursiveDepthArrayForDefaultLevels() {
-        ArrayList<Object> array = buildNestedArray(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
+        ArrayList<Object> array = buildNestedArray(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         new JSONArray(array, new JSONParserConfiguration());
     }
 
     @Test
     public void testRecursiveDepthArrayFor1000Levels() {
         ArrayList<Object> array = buildNestedArray(1000);
-        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration(1000);
+        JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
         new JSONArray(array, parserConfiguration);
     }
 

diff --git a/src/test/java/org/json/junit/JSONObjectTest.java b/src/test/java/org/json/junit/JSONObjectTest.java
@@ -35,6 +35,7 @@
 import org.json.JSONParserConfiguration;
 import org.json.JSONString;
 import org.json.JSONTokener;
+import org.json.ParserConfiguration;
 import org.json.XML;
 import org.json.junit.data.BrokenToString;
 import org.json.junit.data.ExceptionalBean;
@@ -3739,15 +3740,15 @@ public void testCircularReferenceMultipleLevel() {
 
     @Test
     public void issue743SerializationMapWith512Objects() {
-        HashMap<String, Object> map  = buildNestedMap(JSONParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
+        HashMap<String, Object> map  = buildNestedMap(ParserConfiguration.DEFAULT_MAXIMUM_NESTING_DEPTH);
         JSONObject object = new JSONObject(map);
         String jsonString = object.toString();
     }
 
     @Test
     public void issue743SerializationMapWith1000Objects() {
       HashMap<String, Object> map  = buildNestedMap(1000);
-      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration(1000);
+      JSONParserConfiguration parserConfiguration = new JSONParserConfiguration().withMaxNestingDepth(1000);
       JSONObject object = new JSONObject(map, parserConfiguration);
       String jsonString = object.toString();
     }