Migrate to networknt json schema validator

yahoo · May 9, 2024 · 571a636 · 571a636
1 parent 61a9361
commit 571a636
Show file tree

Hide file tree

Showing 42 changed files with 611 additions and 1,734 deletions.
diff --git a/...e/src/main/resources/META-INF/native-image/com.yahoo.elide/elide-core/reflect-config.json b/...e/src/main/resources/META-INF/native-image/com.yahoo.elide/elide-core/reflect-config.json
@@ -3,130 +3,6 @@
     "name": "com.github.benmanes.caffeine.cache.SSSMSW",
     "allDeclaredConstructors": true
   },
-  {
-    "name": "com.github.fge.jackson.jsonpointer.JsonPointerMessages",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.core.messages.JsonSchemaCoreMessageBundle",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.core.messages.JsonSchemaSyntaxMessageBundle",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.AdditionalItemsValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.AdditionalPropertiesValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.DependenciesValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.EnumValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.MaxItemsValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.MaxLengthValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.MaximumValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.MinItemsValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.MinLengthValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.MinimumValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.PatternValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.common.UniqueItemsValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv3.DisallowKeywordValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv3.DivisibleByValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv3.DraftV3TypeValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv3.ExtendsValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv3.PropertiesValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.AllOfValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.AnyOfValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.DraftV4TypeValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.MaxPropertiesValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.MinPropertiesValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.MultipleOfValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.NotValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.OneOfValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.keyword.validator.draftv4.RequiredKeywordValidator",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.messages.JsonSchemaConfigurationBundle",
-    "allDeclaredConstructors": true
-  },
-  {
-    "name": "com.github.fge.jsonschema.messages.JsonSchemaValidationBundle",
-    "allDeclaredConstructors": true
-  },
   {
     "name": "com.yahoo.elide.core.security.checks.prefab.Collections$AppendOnly",
     "allDeclaredMethods": true,

diff --git a/...src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydrator.java b/...src/main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/EntityHydrator.java
@@ -205,7 +205,7 @@ else if (enumValues.contains(value.toString())) {
 
     @Override
     public Iterator<Object> iterator() {
-        return new Iterator<> () {
+        return new Iterator<>() {
 
             Object next = null;
             MutableInt counter = new MutableInt(0);

diff --git a/elide-model-config/pom.xml b/elide-model-config/pom.xml
@@ -94,7 +94,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.java-json-tools</groupId>
+            <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
         </dependency>
         <dependency>

diff --git a/...l-config/src/main/java/com/yahoo/elide/modelconfig/DraftV4LibraryWithElideFormatAttr.java b/...l-config/src/main/java/com/yahoo/elide/modelconfig/DraftV4LibraryWithElideFormatAttr.java
diff --git a/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigHelpers.java b/elide-model-config/src/main/java/com/yahoo/elide/modelconfig/DynamicConfigHelpers.java
@@ -13,7 +13,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+
 import org.apache.commons.lang3.StringUtils;
 import org.hjson.JsonValue;
 import org.hjson.ParseException;
@@ -58,9 +59,9 @@ public static Map<String, Object> stringToVariablesPojo(String fileName, String
             if (schemaValidator.verifySchema(Config.MODELVARIABLE, jsonConfig, fileName)) {
                 variables = getModelPojo(jsonConfig, Map.class);
             }
-        } catch (ProcessingException e) {
+        } catch (IOException e) {
             log.error("Error Validating Variable config : " + e.getMessage());
-            throw new IOException(e);
+            throw e;
         }
         return variables;
     }
@@ -81,9 +82,9 @@ public static ElideTableConfig stringToElideTablePojo(String fileName, String co
             if (schemaValidator.verifySchema(Config.TABLE, jsonConfig, fileName)) {
                 table = getModelPojo(jsonConfig, ElideTableConfig.class);
             }
-        } catch (ProcessingException e) {
+        } catch (IOException e) {
             log.error("Error Validating Table config : " + e.getMessage());
-            throw new IOException(e);
+            throw e;
         }
         return table;
     }
@@ -104,9 +105,9 @@ public static ElideDBConfig stringToElideDBConfigPojo(String fileName, String co
             if (schemaValidator.verifySchema(Config.SQLDBConfig, jsonConfig, fileName)) {
                 dbconfig = getModelPojo(jsonConfig, ElideDBConfig.class);
             }
-        } catch (ProcessingException e) {
+        } catch (IOException e) {
             log.error("Error Validating DB config : " + e.getMessage());
-            throw new IOException(e);
+            throw e;
         }
         return dbconfig;
     }
@@ -127,9 +128,9 @@ public static ElideNamespaceConfig stringToElideNamespaceConfigPojo(String fileN
             if (schemaValidator.verifySchema(Config.NAMESPACEConfig, jsonConfig, fileName)) {
                 namespaceconfig = getModelPojo(jsonConfig, ElideNamespaceConfig.class);
             }
-        } catch (ProcessingException e) {
+        } catch (IOException e) {
             log.error("Error Validating DB config : " + e.getMessage());
-            throw new IOException(e);
+            throw e;
         }
         return namespaceconfig;
     }
@@ -149,9 +150,9 @@ public static ElideSecurityConfig stringToElideSecurityPojo(String fileName, Str
             if (schemaValidator.verifySchema(Config.SECURITY, jsonConfig, fileName)) {
                 return getModelPojo(jsonConfig, ElideSecurityConfig.class);
             }
-        } catch (ProcessingException e) {
+        } catch (IOException e) {
             log.error("Error Validating Security config : " + e.getMessage());
-            throw new IOException(e);
+            throw e;
         }
         return null;
     }
@@ -176,9 +177,19 @@ private static String hjsonToJson(String hjson) {
         }
     }
 
+    private static class DynamicConfigObjectMapper {
+        private static final ObjectMapper INSTANCE;
+
+        static {
+            INSTANCE = JsonMapper.builder().enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS).build();
+        }
+
+        private static ObjectMapper getInstance() {
+            return INSTANCE;
+        }
+    }
+
     private static <T> T getModelPojo(String jsonConfig, final Class<T> configPojo) throws JsonProcessingException {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
-        return objectMapper.readValue(jsonConfig, configPojo);
+        return DynamicConfigObjectMapper.getInstance().readValue(jsonConfig, configPojo);
     }
 }