AVRO-3704: adapt validator

apache · Sep 11, 2023 · 8cb6152 · 8cb6152
1 parent 05e8a56
commit 8cb6152
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lang/java/avro/src/main/java/org/apache/avro/Schema.java b/lang/java/avro/src/main/java/org/apache/avro/Schema.java
@@ -1584,7 +1584,7 @@ private static interface ParseFunction {
     }
 
     private Schema runParser(JsonParser parser, ParseFunction f) throws IOException {
-      boolean saved = validateNames.get();
+      NameValidator saved = validateNames.get();
       boolean savedValidateDefaults = VALIDATE_DEFAULTS.get();
       try {
         validateNames.set(validate);
@@ -1680,7 +1680,8 @@ public static Schema parse(String jsonSchema) {
    */
   @Deprecated
   public static Schema parse(String jsonSchema, boolean validate) {
-    return new Parser().setValidate(validate).parse(jsonSchema);
+    final NameValidator validator = validate ? NameValidator.UTF_VALIDATOR : NameValidator.NO_VALIDATION;
+    return new Parser(validator).parse(jsonSchema);
   }
 
   static final Map<String, Type> PRIMITIVES = new HashMap<>();