Use strict JSON parser configuration

With current JSON library we can switch to use JSON parser
configuration with strict mode.

See:
https://github.com/stleary/JSON-java/releases/tag/20241224
stleary/JSON-java#921

Change-Id: Ib689f144a9f28f37e113c550646fe8640257cc79
Signed-off-by: Ivan Hrasko <[email protected]>

Author: ihrasko

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/openapi/AbstractOpenApiTest.java

@@ -39,6 +39,7 @@
 import org.apache.shiro.realm.AuthenticatingRealm;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.json.JSONObject;
+import org.json.JSONParserConfiguration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -96,6 +97,9 @@
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
 class AbstractOpenApiTest extends AbstractDataBrokerTest {
+    private static final JSONParserConfiguration JSON_PARSER_CONFIGURATION = new JSONParserConfiguration()
+        .withStrictMode();
+
     private static final ErrorTagMapping ERROR_TAG_MAPPING = ErrorTagMapping.RFC8040;
     private static final String TOPOLOGY_URI =
         "/rests/data/network-topology:network-topology/topology=topology-netconf";
@@ -317,7 +321,7 @@ protected void mountDeviceJson(final int devicePort) throws Exception {
     private boolean deviceConnectedJson() throws Exception {
         final var response = invokeRequest(HttpMethod.GET, DEVICE_STATUS_URI);
         assertEquals(HttpResponseStatus.OK, response.status());
-        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8));
+        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), JSON_PARSER_CONFIGURATION);
         //{
         //  "netconf-node-topology:netconf-node": {
         //    "connection-status": "connected"

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/server/AbstractE2ETest.java

@@ -47,6 +47,7 @@
 import org.apache.shiro.realm.AuthenticatingRealm;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.json.JSONObject;
+import org.json.JSONParserConfiguration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -106,6 +107,8 @@
 import org.xmlunit.diff.ElementSelectors;
 
 abstract class AbstractE2ETest extends AbstractDataBrokerTest {
+    static final JSONParserConfiguration JSON_PARSER_CONFIGURATION = new JSONParserConfiguration().withStrictMode();
+
     private static final Logger LOG = LoggerFactory.getLogger(AbstractE2ETest.class);
     private static final ErrorTagMapping ERROR_TAG_MAPPING = ErrorTagMapping.RFC8040;
     private static final Splitter COMMA_SPLITTER = Splitter.on(',').trimResults().omitEmptyStrings();
@@ -331,7 +334,7 @@ protected static void assertErrorResponseJson(final FullHttpResponse response, f
         //         }]
         //    }
         // }
-        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8));
+        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), JSON_PARSER_CONFIGURATION);
         final var error = json.getJSONObject("errors").getJSONArray("error").getJSONObject(0);
         assertNotNull(error);
         assertEquals(expectedErrorType.elementBody(), error.getString("error-type"));
@@ -414,7 +417,7 @@ private static URI extractStreamUrlJson(final String content) {
         //              "description": "..."
         //      }]
         // }
-        final var json = new JSONObject(content);
+        final var json = new JSONObject(content, JSON_PARSER_CONFIGURATION);
         final var stream = json.getJSONArray("ietf-restconf-monitoring:stream").getJSONObject(0);
         for (var access : stream.getJSONArray("access")) {
             final var accessObj = (JSONObject) access;

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/server/AuthTest.java

@@ -84,7 +84,7 @@ private String createStream() throws Exception {
     }
 
     private static String extractStreamNameJson(final String content) {
-        final var json = new JSONObject(content);
+        final var json = new JSONObject(content, JSON_PARSER_CONFIGURATION);
         return json.getJSONObject("sal-remote:output").getString("stream-name");
     }
 

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/server/MountPointE2ETest.java

@@ -211,7 +211,7 @@ void notificationStreamJsonTest() throws Exception {
         //          "stream-name": "urn:uuid:01a56682-f2ab-419f-8a77-9cf995a52220"
         //      }
         //  }
-        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8));
+        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), JSON_PARSER_CONFIGURATION);
         final var streamName = json.getJSONObject("odl-device-notification:output").getString("stream-name");
         assertNotNull(streamName, "Stream name is undefined");
 
@@ -372,7 +372,7 @@ private void mountDeviceJson() throws Exception {
     private boolean deviceConnectedJson() throws Exception {
         final var response = invokeRequest(HttpMethod.GET, DEVICE_STATUS_URI);
         assertEquals(HttpResponseStatus.OK, response.status());
-        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8));
+        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), JSON_PARSER_CONFIGURATION);
         //{
         //  "netconf-node-topology:netconf-node": {
         //    "connection-status": "connected"

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/server/StreamsE2ETest.java

@@ -77,7 +77,7 @@ void dataChangeEventStreamJsonTest() throws Exception {
         //          "stream-name":"urn:uuid:6413c077-5dfe-464c-b17f-20c5bbb456f4"
         //       }
         // }
-        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8));
+        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), JSON_PARSER_CONFIGURATION);
         final var streamName = json.getJSONObject("sal-remote:output").getString("stream-name");
         assertNotNull(streamName, "Stream name is undefined");
 

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/AbstractNotificationSubscriptionTest.java

@@ -38,6 +38,7 @@
 import org.apache.shiro.realm.AuthenticatingRealm;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.json.JSONObject;
+import org.json.JSONParserConfiguration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -89,6 +90,8 @@
 import org.slf4j.LoggerFactory;
 
 abstract class AbstractNotificationSubscriptionTest extends AbstractDataBrokerTest {
+    static final JSONParserConfiguration JSON_PARSER_CONFIGURATION = new JSONParserConfiguration().withStrictMode();
+
     private static final Logger LOG = LoggerFactory.getLogger(AbstractNotificationSubscriptionTest.class);
     private static final YangParserFactory PARSER_FACTORY = ServiceLoader.load(YangParserFactory.class)
         .findFirst().orElseThrow(() -> new ExceptionInInitializerError("No YangParserFactory found"));
@@ -404,7 +407,8 @@ FullHttpResponse establishFilteredSubscription(final String filter, final HTTPCl
      * Utility method to extract subscription ID from response.
      */
     static long extractSubscriptionId(final FullHttpResponse response) {
-        final var jsonContent = new JSONObject(response.content().toString(StandardCharsets.UTF_8));
+        final var jsonContent = new JSONObject(response.content().toString(StandardCharsets.UTF_8),
+            JSON_PARSER_CONFIGURATION);
         return jsonContent.getJSONObject("ietf-subscribed-notifications:output").getLong("id");
     }
 }

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/CountersSubscriptionTest.java

@@ -175,7 +175,7 @@ void excludedCounterNotificationTest() throws Exception {
     }
 
     private static void assertCounter(final FullHttpResponse response, final String sent, final String excluded) {
-        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8))
+        final var json = new JSONObject(response.content().toString(StandardCharsets.UTF_8), JSON_PARSER_CONFIGURATION)
             .getJSONObject("ietf-subscribed-notifications:receivers")
             //there is only one receiver
             .getJSONArray("receiver").getJSONObject(0);

apps/restconf-it/src/test/java/org/opendaylight/restconf/it/subscription/NotificationSubscriptionListeningTest.java

@@ -67,7 +67,8 @@ public void beforeEach() throws Exception {
         assertEquals(HttpResponseStatus.OK, response.status());
 
         // Extract subscription ID from response
-        final var jsonContent = new JSONObject(response.content().toString(StandardCharsets.UTF_8));
+        final var jsonContent = new JSONObject(response.content().toString(StandardCharsets.UTF_8),
+            JSON_PARSER_CONFIGURATION);
         final var subscriptionId = jsonContent.getJSONObject("ietf-subscribed-notifications:output").getLong("id");
 
         // Start listening on notifications