Merge pull request stleary#876 from stleary/remove-jsonparserconfig-ctor

stleary · web-flow · commit 48c092acfb48 · 2024-03-09T09:22:39.000-06:00
remove-jsonparserconfig-ctor - just use withOverwriteDuplicateKey()
diff --git a/src/main/java/org/json/JSONParserConfiguration.java b/src/main/java/org/json/JSONParserConfiguration.java
@@ -13,24 +13,14 @@ public class JSONParserConfiguration extends ParserConfiguration {
      * Configuration with the default values.
      */
     public JSONParserConfiguration() {
-        this(false);
-    }
-
-    /**
-     * Configure the parser with argument overwriteDuplicateKey.
-     *
-     * @param overwriteDuplicateKey Indicate whether to overwrite duplicate key or not.<br>
-     *                              If not, the JSONParser will throw a {@link JSONException}
-     *                              when meeting duplicate keys.
-     */
-    public JSONParserConfiguration(boolean overwriteDuplicateKey) {
         super();
-        this.overwriteDuplicateKey = overwriteDuplicateKey;
+        this.overwriteDuplicateKey = false;
     }
 
     @Override
     protected JSONParserConfiguration clone() {
-        JSONParserConfiguration clone = new JSONParserConfiguration(overwriteDuplicateKey);
+        JSONParserConfiguration clone = new JSONParserConfiguration();
+        clone.overwriteDuplicateKey = overwriteDuplicateKey;
         clone.maxNestingDepth = maxNestingDepth;
         return clone;
     }
diff --git a/src/test/java/org/json/junit/JSONParserConfigurationTest.java b/src/test/java/org/json/junit/JSONParserConfigurationTest.java
@@ -18,7 +18,8 @@ public void testThrowException() {
 
     @Test
     public void testOverwrite() {
-        JSONObject jsonObject = new JSONObject(TEST_SOURCE, new JSONParserConfiguration(true));
+        JSONObject jsonObject = new JSONObject(TEST_SOURCE,
+                new JSONParserConfiguration().withOverwriteDuplicateKey(true));
 
         assertEquals("duplicate key should be overwritten", "value2", jsonObject.getString("key"));
     }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ public void testThrowException() {`
`18`	`18`
`19`	`19`	`@Test`
`20`	`20`	`public void testOverwrite() {`
`21`		`- JSONObject jsonObject = new JSONObject(TEST_SOURCE, new JSONParserConfiguration(true));`
	`21`	`+ JSONObject jsonObject = new JSONObject(TEST_SOURCE,`
	`22`	`+ new JSONParserConfiguration().withOverwriteDuplicateKey(true));`
`22`	`23`
`23`	`24`	`assertEquals("duplicate key should be overwritten", "value2", jsonObject.getString("key"));`
`24`	`25`	`}`