Replace all uses of SchemaHolder with ValueHolder<SchemaTree>

Author: fge

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

@@ -4,19 +4,19 @@
 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.processors.data.SchemaHolder;
 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>, SchemaHolder>
+    implements Processor<ValueHolder<JsonTree>, ValueHolder<SchemaTree>>
 {
     @Override
-    public SchemaHolder process(final ProcessingReport report,
+    public ValueHolder<SchemaTree> process(final ProcessingReport report,
         final ValueHolder<JsonTree> input)
         throws ProcessingException
     {
@@ -43,6 +43,8 @@ public SchemaHolder process(final ProcessingReport report,
         AvroTranslators.getTranslator(avroType)
             .translate(avroSchema, tree, report);
 
-        return new SchemaHolder(new CanonicalSchemaTree(tree.getBaseNode()));
+        final SchemaTree schemaTree
+            = new CanonicalSchemaTree(tree.getBaseNode());
+        return ValueHolder.hold("schema", schemaTree);
     }
 }

src/main/java/com/github/fge/jsonschema2avro/AvroWriterProcessor.java

@@ -3,8 +3,8 @@
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.processing.Processor;
 import com.github.fge.jsonschema.processing.ProcessorSelector;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 import com.github.fge.jsonschema.report.ProcessingReport;
+import com.github.fge.jsonschema.tree.SchemaTree;
 import com.github.fge.jsonschema.util.ValueHolder;
 import com.github.fge.jsonschema2avro.writers.ArrayWriter;
 import com.github.fge.jsonschema2avro.writers.EnumWriter;
@@ -18,7 +18,7 @@
 import static com.github.fge.jsonschema2avro.predicates.AvroPredicates.*;
 
 public final class AvroWriterProcessor
-    implements Processor<SchemaHolder, ValueHolder<Schema>>
+    implements Processor<ValueHolder<SchemaTree>, ValueHolder<Schema>>
 {
     private final Processor<AvroPayload, ValueHolder<Schema>> processor;
 
@@ -37,7 +37,7 @@ public AvroWriterProcessor()
 
     @Override
     public ValueHolder<Schema> process(final ProcessingReport report,
-        final SchemaHolder input)
+        final ValueHolder<SchemaTree> input)
         throws ProcessingException
     {
         final AvroPayload payload = new AvroPayload(input.getValue(), this);

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

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.jsonpointer.JsonPointer;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
+import com.github.fge.jsonschema.util.ValueHolder;
 import com.github.fge.jsonschema2avro.AvroWriterProcessor;
 import org.apache.avro.Schema;
 
@@ -33,7 +33,8 @@ protected Schema generate(final AvroWriterProcessor writer,
             : JsonPointer.of("additionalItems");
 
         final SchemaTree subTree = tree.append(ptr);
-        final SchemaHolder input = new SchemaHolder(subTree);
+        final ValueHolder<SchemaTree> input
+            = ValueHolder.hold("schema", subTree);
         final Schema itemsSchema = writer.process(report, input).getValue();
         return Schema.createArray(itemsSchema);
     }

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

@@ -2,9 +2,9 @@
 
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.jsonpointer.JsonPointer;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
+import com.github.fge.jsonschema.util.ValueHolder;
 import com.github.fge.jsonschema2avro.AvroWriterProcessor;
 import org.apache.avro.Schema;
 
@@ -30,7 +30,9 @@ protected Schema generate(final AvroWriterProcessor writer,
         final ProcessingReport report, final SchemaTree tree)
         throws ProcessingException
     {
-        final SchemaHolder input = new SchemaHolder(tree.append(POINTER));
+        final SchemaTree schemaTree = tree.append(POINTER);
+        final ValueHolder<SchemaTree> input
+            = ValueHolder.hold("schema", schemaTree);
         final Schema valueSchema = writer.process(report, input).getValue();
         return Schema.createMap(valueSchema);
     }

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

@@ -2,9 +2,9 @@
 
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.jsonpointer.JsonPointer;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
+import com.github.fge.jsonschema.util.ValueHolder;
 import com.github.fge.jsonschema2avro.AvroWriterProcessor;
 import com.google.common.collect.Lists;
 import org.apache.avro.Schema;
@@ -33,12 +33,12 @@ protected Schema generate(final AvroWriterProcessor writer,
         final List<Schema.Field> fields = Lists.newArrayList();
 
         JsonPointer ptr;
-        SchemaHolder holder;
+        ValueHolder<SchemaTree> holder;
         Schema fieldSchema;
 
         for (final String name: list) {
             ptr = JsonPointer.of("properties", name);
-            holder = new SchemaHolder(tree.append(ptr));
+            holder = ValueHolder.hold("schema", tree.append(ptr));
             fieldSchema = writer.process(report, holder).getValue();
             fields.add(new Schema.Field(name, fieldSchema, null, null));
         }

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

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
 import com.github.fge.jsonschema.jsonpointer.JsonPointer;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 import com.github.fge.jsonschema.report.ProcessingReport;
 import com.github.fge.jsonschema.tree.SchemaTree;
+import com.github.fge.jsonschema.util.ValueHolder;
 import com.github.fge.jsonschema2avro.AvroWriterProcessor;
 import com.google.common.collect.Lists;
 import org.apache.avro.Schema;
@@ -36,14 +36,14 @@ protected Schema generate(final AvroWriterProcessor writer,
         final int size = node.get(keyword).size();
 
         JsonPointer ptr;
-        SchemaHolder holder;
+        ValueHolder<SchemaTree> holder;
         Schema subSchema;
 
         final List<Schema> schemas = Lists.newArrayList();
 
         for (int index = 0; index < size; index++) {
             ptr = JsonPointer.of(keyword, index);
-            holder = new SchemaHolder(tree.append(ptr));
+            holder = ValueHolder.hold("schema", tree.append(ptr));
             subSchema = writer.process(report, holder).getValue();
             if (subSchema.getType() == Schema.Type.UNION)
                 throw new ProcessingException("union within union is illegal");

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

@@ -4,10 +4,10 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 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.ValueHolder;
 import com.github.fge.jsonschema2avro.AvroWriterProcessor;
 import com.google.common.collect.Lists;
 import org.apache.avro.Schema;
@@ -38,18 +38,18 @@ protected Schema generate(final AvroWriterProcessor writer,
         final JsonNode node = tree.getNode();
         final List<Schema> schemas = Lists.newArrayList();
 
-        for (final SchemaHolder holder: expand(node))
+        for (final ValueHolder<SchemaTree> holder: expand(node))
             schemas.add(writer.process(report, holder).getValue());
 
         return Schema.createUnion(schemas);
     }
 
-    private static List<SchemaHolder> expand(final JsonNode node)
+    private static List<ValueHolder<SchemaTree>> expand(final JsonNode node)
     {
         final ObjectNode common = node.deepCopy();
         final ArrayNode typeNode = (ArrayNode) common.remove("type");
 
-        final List<SchemaHolder> ret = Lists.newArrayList();
+        final List<ValueHolder<SchemaTree>> ret = Lists.newArrayList();
 
         ObjectNode schema;
         SchemaTree tree;
@@ -58,7 +58,7 @@ private static List<SchemaHolder> expand(final JsonNode node)
             schema = common.deepCopy();
             schema.put("type", element);
             tree = new CanonicalSchemaTree(schema);
-            ret.add(new SchemaHolder(tree));
+            ret.add(ValueHolder.hold("schema", tree));
         }
 
         return ret;

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

@@ -3,11 +3,11 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jsonschema.cfg.ValidationConfiguration;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 import com.github.fge.jsonschema.processors.syntax.SyntaxValidator;
 import com.github.fge.jsonschema.report.DevNullProcessingReport;
 import com.github.fge.jsonschema.report.ProcessingReport;
 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;
@@ -72,7 +72,7 @@ public final void conversionIsCorrectlyPerformed(final JsonNode avroSchema,
         final ValueHolder<JsonTree> input
             = ValueHolder.<JsonTree>hold(new SimpleJsonTree(avroSchema));
 
-        final SchemaHolder output = PROCESSOR.process(report, input);
+        final ValueHolder<SchemaTree> output = PROCESSOR.process(report, input);
         assertEquals(output.getValue().getBaseNode(), jsonSchema);
 
         assertTrue(VALIDATOR.schemaIsValid(jsonSchema));

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

@@ -2,11 +2,11 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jsonschema.exceptions.ProcessingException;
-import com.github.fge.jsonschema.processors.data.SchemaHolder;
 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;
 import org.testng.annotations.BeforeMethod;
@@ -61,7 +61,7 @@ public final void JsonSchemasAreCorrectlyTranslated(final JsonNode schema,
         throws ProcessingException
     {
         final SchemaTree tree = new CanonicalSchemaTree(schema);
-        final SchemaHolder input = new SchemaHolder(tree);
+        final ValueHolder<SchemaTree> input = ValueHolder.hold("schema", tree);
         final Schema expected = new Schema.Parser().parse(avro.toString());
 
         final Schema actual = processor.process(report, input).getValue();