upgrade json schema validator to 1.5.8

JSON schema validator depends on commons-lang3 library and fails to compile
after upgrade

Author: slobodanadamovic

build-tools-internal/version.properties

@@ -60,4 +60,4 @@ jimfs = 1.3.0
 jimfs_guava = 32.1.1-jre
 
 # test framework
-networknt_json_schema_validator = 1.0.48
+networknt_json_schema_validator = 1.5.8

gradle/verification-metadata.xml

@@ -1088,16 +1088,16 @@
             <sha256 value="d48403dbb7561f087c0eba93486991e9ffe6fc234e180464e1ed432da590d974" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.networknt" name="json-schema-validator" version="1.0.48">
-         <artifact name="json-schema-validator-1.0.48.jar">
-            <sha256 value="d367f110a981a6d0053a480e55237bba4d816edd67a46cc771b24e4fc0364f40" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.networknt" name="json-schema-validator" version="1.0.72">
          <artifact name="json-schema-validator-1.0.72.jar">
             <sha256 value="260647c459cc7de269b2a8f576e5693e434df888fd4801e92365fe18b9992cbc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.networknt" name="json-schema-validator" version="1.5.8">
+         <artifact name="json-schema-validator-1.5.8.jar">
+            <sha256 value="41ffb494849f28721a28021b97c94ea60513c02812309459462f1f7da8b697d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.nimbusds" name="content-type" version="2.3">
          <artifact name="content-type-2.3.jar">
             <sha256 value="60349793e006fba96b532cb0c21e10e969fe0db8d87f91c3b9eaf82ba2998895" origin="Generated by Gradle"/>

test/x-content/src/main/java/org/elasticsearch/test/xcontent/AbstractSchemaValidationTestCase.java

@@ -31,7 +31,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
+import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
 
@@ -55,9 +55,12 @@ public final void testSchema() throws IOException {
         JsonSchema jsonSchema = factory.getSchema(mapper.readTree(Files.newInputStream(p)), config);
 
         // ensure the schema meets certain criteria like not empty, strictness
-        assertTrue("found empty schema", jsonSchema.getValidators().size() > 0);
-        assertTrue("schema lacks at least 1 required field", jsonSchema.hasRequiredValidator());
-        assertSchemaStrictness(jsonSchema.getValidators().values(), jsonSchema.getSchemaPath());
+        assertFalse("found empty schema", jsonSchema.getValidators().isEmpty());
+        assertTrue(
+            "schema lacks at least 1 required field",
+            jsonSchema.getValidators().stream().anyMatch(v -> v.getKeyword().equals("required"))
+        );
+        assertSchemaStrictness(jsonSchema.getValidators(), jsonSchema.getSchemaLocation().toString());
 
         for (int runs = 0; runs < NUMBER_OF_TEST_RUNS; runs++) {
             BytesReference xContent = XContentHelper.toXContent(createTestInstance(), XContentType.JSON, getToXContentParams(), false);
@@ -107,14 +110,7 @@ protected SpecVersion.VersionFlag getSchemaVersion() {
      * Uses the ootb factory but replaces the loader for sub schema's stored on the file system.
      */
     private JsonSchemaFactory initializeSchemaFactory() {
-        JsonSchemaFactory factory = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(getSchemaVersion())).uriFetcher(uri -> {
-            String fileName = uri.toString().substring(uri.getScheme().length() + 1);
-            Path path = getDataPath(getSchemaLocation() + fileName);
-            logger.debug("loading sub-schema [{}] from: [{}]", uri, path);
-            return Files.newInputStream(path);
-        }, "file").build();
-
-        return factory;
+        return JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(getSchemaVersion())).build();
     }
 
     /**
@@ -130,23 +126,23 @@ private JsonSchemaFactory initializeSchemaFactory() {
      * Note: we might not catch all places, but at least it works for nested objects and
      * array items.
      */
-    private static void assertSchemaStrictness(Collection<JsonValidator> validatorSet, String path) {
+    private static void assertSchemaStrictness(List<JsonValidator> validatorSet, String path) {
         boolean additionalPropertiesValidatorFound = false;
         boolean subSchemaFound = false;
 
         for (JsonValidator validator : validatorSet) {
             if (validator instanceof PropertiesValidator propertiesValidator) {
                 subSchemaFound = true;
                 for (Entry<String, JsonSchema> subSchema : propertiesValidator.getSchemas().entrySet()) {
-                    assertSchemaStrictness(subSchema.getValue().getValidators().values(), propertiesValidator.getSchemaPath());
+                    assertSchemaStrictness(subSchema.getValue().getValidators(), propertiesValidator.getSchemaLocation().toString());
                 }
             } else if (validator instanceof ItemsValidator itemValidator) {
                 if (itemValidator.getSchema() != null) {
-                    assertSchemaStrictness(itemValidator.getSchema().getValidators().values(), itemValidator.getSchemaPath());
+                    assertSchemaStrictness(itemValidator.getSchema().getValidators(), itemValidator.getSchemaLocation().toString());
                 }
                 if (itemValidator.getTupleSchema() != null) {
                     for (JsonSchema subSchema : itemValidator.getTupleSchema()) {
-                        assertSchemaStrictness(subSchema.getValidators().values(), itemValidator.getSchemaPath());
+                        assertSchemaStrictness(subSchema.getValidators(), itemValidator.getSchemaLocation().toString());
                     }
                 }
             } else if (validator instanceof AdditionalPropertiesValidator) {

x-pack/plugin/ent-search/src/main/java/module-info.java

@@ -9,7 +9,7 @@
     requires com.fasterxml.jackson.annotation;
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.databind;
-    requires json.schema.validator;
+    requires com.networknt.schema;
     requires org.apache.lucene.core;
     requires org.slf4j;