Merge pull request #911 from stleary/revert-strict-mode-for-now

Revert strict mode

Author: stleary

src/main/java/org/json/JSONArray.java

@@ -220,12 +220,12 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
         for (;;) {
             c = x.nextClean();
             switch (c) {
-                case 0:
-                    throw x.syntaxError("A JSONObject text must end with '}'");
-                case '}':
-                    return;
-                default:
-                    key = x.nextSimpleValue(c, jsonParserConfiguration).toString();
+            case 0:
+                throw x.syntaxError("A JSONObject text must end with '}'");
+            case '}':
+                return;
+            default:
+                key = x.nextSimpleValue(c).toString();
             }
 
             // The key is followed by ':'.
@@ -244,7 +244,7 @@ public JSONObject(JSONTokener x, JSONParserConfiguration jsonParserConfiguration
                     throw x.syntaxError("Duplicate key \"" + key + "\"");
                 }
 
-                Object value = x.nextValue(jsonParserConfiguration);
+                Object value = x.nextValue();
                 // Only add value if non-null
                 if (value != null) {
                     this.put(key, value);
@@ -1247,7 +1247,7 @@ public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) {
     static BigDecimal objectToBigDecimal(Object val, BigDecimal defaultValue) {
         return objectToBigDecimal(val, defaultValue, true);
     }
-
+    
     /**
      * @param val value to convert
      * @param defaultValue default value to return is the conversion doesn't work or is null.

src/main/java/org/json/JSONObject.java

@@ -4,25 +4,11 @@
  * Configuration object for the JSON parser. The configuration is immutable.
  */
 public class JSONParserConfiguration extends ParserConfiguration {
-
-    /** Original Configuration of the JSON Parser. */
-    public static final JSONParserConfiguration ORIGINAL = new JSONParserConfiguration();
-
-    /** Original configuration of the JSON Parser except that values are kept as strings. */
-    public static final JSONParserConfiguration KEEP_STRINGS = new JSONParserConfiguration().withKeepStrings(true);
-
     /**
      * Used to indicate whether to overwrite duplicate key or not.
      */
     private boolean overwriteDuplicateKey;
 
-    /**
-     * This flag, when set to true, instructs the parser to throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
-     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
-     */
-    private boolean strictMode;
-
     /**
      * Configuration with the default values.
      */
@@ -72,24 +58,6 @@ public JSONParserConfiguration withOverwriteDuplicateKey(final boolean overwrite
         return clone;
     }
 
-
-    /**
-     * Sets the strict mode configuration for the JSON parser.
-     * <p>
-     * When strict mode is enabled, the parser will throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This is useful for ensuring strict adherence to the
-     * JSON syntax, as any characters after the final closing bracket of a JSON array are considered invalid.
-     *
-     * @param mode a boolean value indicating whether strict mode should be enabled or not
-     * @return a new JSONParserConfiguration instance with the updated strict mode setting
-     */
-    public JSONParserConfiguration withStrictMode(final boolean mode) {
-        JSONParserConfiguration clone = this.clone();
-        clone.strictMode = mode;
-
-        return clone;
-    }
-
     /**
      * The parser's behavior when meeting duplicate keys, controls whether the parser should
      * overwrite duplicate keys or not.
@@ -99,18 +67,4 @@ public JSONParserConfiguration withStrictMode(final boolean mode) {
     public boolean isOverwriteDuplicateKey() {
         return this.overwriteDuplicateKey;
     }
-
-
-    /**
-     * Retrieves the current strict mode setting of the JSON parser.
-     * <p>
-     * Strict mode, when enabled, instructs the parser to throw a JSONException if it encounters an invalid character
-     * immediately following the final ']' character in the input. This ensures strict adherence to the JSON syntax, as
-     * any characters after the final closing bracket of a JSON array are considered invalid.
-     *
-     * @return the current strict mode setting. True if strict mode is enabled, false otherwise.
-     */
-    public boolean isStrictMode() {
-        return this.strictMode;
-    }
 }