Update json-schema-validator dependency to 2.1.2

Adapt code accordingly.

Author: fge

pom.xml

@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.github.fge</groupId>
             <artifactId>json-schema-validator</artifactId>
-            <version>2.0.1</version>
+            <version>2.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avro</groupId>

src/main/java/com/github/fge/avro/Avro2JsonSchemaProcessor.java

@@ -3,24 +3,28 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.avro.translators.AvroTranslators;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.processing.Processor;
+import com.github.fge.jsonschema.processing.RawProcessor;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.CanonicalSchemaTree;
 import com.github.fge.jsonschema.tree.JsonTree;
 import com.github.fge.jsonschema.tree.SchemaTree;
-import com.github.fge.jsonschema.util.ValueHolder;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 
 public final class Avro2JsonSchemaProcessor
-    implements Processor<ValueHolder<JsonTree>, ValueHolder<SchemaTree>>
+    extends RawProcessor<JsonTree, SchemaTree>
 {
+    public Avro2JsonSchemaProcessor()
+    {
+        super("avroSchema", "schema");
+    }
+
     @Override
-    public ValueHolder<SchemaTree> process(final ProcessingReport report,
-        final ValueHolder<JsonTree> input)
+    public SchemaTree rawProcess(final ProcessingReport report,
+        final JsonTree input)
         throws ProcessingException
     {
-        final JsonNode node = input.getValue().getBaseNode();
+        final JsonNode node = input.getBaseNode();
 
         final Schema avroSchema;
         try {
@@ -43,8 +47,6 @@ public ValueHolder<SchemaTree> process(final ProcessingReport report,
         AvroTranslators.getTranslator(avroType)
             .translate(avroSchema, tree, report);
 
-        final SchemaTree schemaTree
-            = new CanonicalSchemaTree(tree.getBaseNode());
-        return ValueHolder.hold("schema", schemaTree);
+        return new CanonicalSchemaTree(tree.getBaseNode());
     }
 }

src/main/java/com/github/fge/avro/MutableTree.java

@@ -3,10 +3,10 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
+import com.github.fge.jackson.JacksonUtils;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.util.AsJson;
-import com.github.fge.jsonschema.util.JacksonUtils;
-import com.github.fge.jsonschema.util.NodeType;
 import net.jcip.annotations.NotThreadSafe;
 
 @NotThreadSafe

src/main/java/com/github/fge/avro/translators/ArrayTranslator.java

@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 
 final class ArrayTranslator

src/main/java/com/github/fge/avro/translators/AvroTranslator.java

@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.JacksonUtils;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.report.ProcessingMessage;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.JacksonUtils;
 import org.apache.avro.Schema;
 
 public abstract class AvroTranslator

src/main/java/com/github/fge/avro/translators/AvroTranslators.java

@@ -1,6 +1,6 @@
 package com.github.fge.avro.translators;
 
-import com.github.fge.jsonschema.util.NodeType;
+import com.github.fge.jackson.NodeType;
 import com.google.common.collect.ImmutableMap;
 import org.apache.avro.Schema;
 

src/main/java/com/github/fge/avro/translators/ByteTranslator.java

@@ -1,9 +1,9 @@
 package com.github.fge.avro.translators;
 
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.NodeType;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 
 final class ByteTranslator

src/main/java/com/github/fge/avro/translators/FixedTranslator.java

@@ -1,8 +1,8 @@
 package com.github.fge.avro.translators;
 
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.NodeType;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 
 final class FixedTranslator

src/main/java/com/github/fge/avro/translators/IntTranslator.java

@@ -1,9 +1,9 @@
 package com.github.fge.avro.translators;
 
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.NodeType;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 
 final class IntTranslator

src/main/java/com/github/fge/avro/translators/LongTranslator.java

@@ -1,9 +1,9 @@
 package com.github.fge.avro.translators;
 
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.NodeType;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 
 final class LongTranslator

src/main/java/com/github/fge/avro/translators/MapTranslator.java

@@ -2,10 +2,10 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 
 final class MapTranslator

src/main/java/com/github/fge/avro/translators/NamedAvroTypeTranslator.java

@@ -1,9 +1,9 @@
 package com.github.fge.avro.translators;
 
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.exceptions.unchecked.ProcessingError;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingMessage;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import org.apache.avro.Schema;

src/main/java/com/github/fge/avro/translators/RecordTranslator.java

@@ -3,11 +3,11 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.JsonLoader;
+import com.github.fge.jackson.NodeType;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.JsonLoader;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;

src/main/java/com/github/fge/avro/translators/SimpleTypeTranslator.java

@@ -1,9 +1,9 @@
 package com.github.fge.avro.translators;
 
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.NodeType;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.report.ProcessingReport;
-import com.github.fge.jsonschema.util.NodeType;
 import org.apache.avro.Schema;
 
 final class SimpleTypeTranslator

src/main/java/com/github/fge/avro/translators/UnionTranslator.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.github.fge.avro.MutableTree;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import org.apache.avro.Schema;
 

src/main/java/com/github/fge/jsonschema2avro/predicates/AvroPredicates.java

@@ -1,10 +1,10 @@
 package com.github.fge.jsonschema2avro.predicates;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.NodeType;
 import com.github.fge.jsonschema.library.DraftV4Library;
 import com.github.fge.jsonschema.processors.validation.ArraySchemaDigester;
 import com.github.fge.jsonschema.processors.validation.ObjectSchemaDigester;
-import com.github.fge.jsonschema.util.NodeType;
 import com.github.fge.jsonschema2avro.AvroPayload;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Predicate;

src/main/java/com/github/fge/jsonschema2avro/writers/ArrayWriter.java

@@ -1,8 +1,8 @@
 package com.github.fge.jsonschema2avro.writers;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
 import com.github.fge.jsonschema.util.ValueHolder;

src/main/java/com/github/fge/jsonschema2avro/writers/MapWriter.java

@@ -1,7 +1,7 @@
 package com.github.fge.jsonschema2avro.writers;
 
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
 import com.github.fge.jsonschema.util.ValueHolder;

src/main/java/com/github/fge/jsonschema2avro/writers/RecordWriter.java

@@ -1,7 +1,7 @@
 package com.github.fge.jsonschema2avro.writers;
 
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
 import com.github.fge.jsonschema.util.ValueHolder;

src/main/java/com/github/fge/jsonschema2avro/writers/SimpleTypeWriter.java

@@ -1,9 +1,9 @@
 package com.github.fge.jsonschema2avro.writers;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.NodeType;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
-import com.github.fge.jsonschema.util.NodeType;
 import com.github.fge.jsonschema2avro.AvroWriterProcessor;
 import com.google.common.collect.ImmutableMap;
 import org.apache.avro.Schema;

src/main/java/com/github/fge/jsonschema2avro/writers/SimpleUnionWriter.java

@@ -1,8 +1,8 @@
 package com.github.fge.jsonschema2avro.writers;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
 import com.github.fge.jsonschema.util.ValueHolder;

src/test/java/com/github/fge/avro/Avro2JsonSchemaProcessorTest.java

@@ -1,13 +1,13 @@
 package com.github.fge.avro;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.JsonLoader;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.report.DevNullProcessingReport;
 import com.github.fge.jsonschema.report.ProcessingMessage;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.JsonTree;
 import com.github.fge.jsonschema.tree.SimpleJsonTree;
-import com.github.fge.jsonschema.util.JsonLoader;
 import com.github.fge.jsonschema.util.ValueHolder;
 import org.apache.avro.SchemaParseException;
 import org.testng.annotations.BeforeClass;

src/test/java/com/github/fge/avro/AvroTranslationsTest.java

@@ -1,6 +1,7 @@
 package com.github.fge.avro;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.JsonLoader;
 import com.github.fge.jsonschema.cfg.ValidationConfiguration;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.processors.syntax.SyntaxValidator;
@@ -9,7 +10,6 @@
 import com.github.fge.jsonschema.tree.JsonTree;
 import com.github.fge.jsonschema.tree.SchemaTree;
 import com.github.fge.jsonschema.tree.SimpleJsonTree;
-import com.github.fge.jsonschema.util.JsonLoader;
 import com.github.fge.jsonschema.util.ValueHolder;
 import com.google.common.collect.Lists;
 import org.testng.annotations.BeforeMethod;

src/test/java/com/github/fge/jsonschema2avro/AvroWriterProcessorTest.java

@@ -1,11 +1,11 @@
 package com.github.fge.jsonschema2avro;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jackson.JsonLoader;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.CanonicalSchemaTree;
 import com.github.fge.jsonschema.tree.SchemaTree;
-import com.github.fge.jsonschema.util.JsonLoader;
 import com.github.fge.jsonschema.util.ValueHolder;
 import com.google.common.collect.Lists;
 import org.apache.avro.Schema;