JSON Schema to avro: start testing

And fix an obvious bug.

Signed-off-by: Francis Galiegue <[email protected]>

Author: fge

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

@@ -46,7 +46,7 @@ public static void main(final String... args)
     {
         final JsonNode node
             = JsonLoader.fromString("{\"type\": \"array\"," +
-            "\"items\":{\"type\":\"null\"}}");
+            "\"additionalItems\":{\"type\":\"null\"}}");
         final SchemaTree tree = new CanonicalSchemaTree(node);
         final SchemaHolder input = new SchemaHolder(tree);
         final AvroWriterProcessor p = new AvroWriterProcessor();

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

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 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.Predicate;
@@ -19,12 +20,10 @@ public static Predicate<AvroPayload> simpleType()
             @Override
             public boolean apply(final AvroPayload input)
             {
-                final JsonNode typeNode  = schemaNode(input).path("type");
-
-                if (!typeNode.isTextual())
+                final JsonNode node = schemaNode(input);
+                final NodeType type = getType(node);
+                if (type == null)
                     return false;
-
-                final NodeType type = NodeType.fromName(typeNode.textValue());
                 return type != NodeType.ARRAY && type != NodeType.OBJECT;
             }
         };
@@ -38,13 +37,10 @@ public static Predicate<AvroPayload> array()
             public boolean apply(final AvroPayload input)
             {
                 final JsonNode node = schemaNode(input);
-                final JsonNode typeNode = node.path("type");
-
-                if (!typeNode.isTextual())
+                final NodeType type = getType(node);
+                if (type == null)
                     return false;
 
-                final NodeType type = NodeType.fromName(typeNode.textValue());
-
                 if (type != NodeType.ARRAY)
                     return false;
 
@@ -65,8 +61,42 @@ public boolean apply(final AvroPayload input)
         };
     }
 
+    public static Predicate<AvroPayload> map()
+    {
+        return new Predicate<AvroPayload>()
+        {
+            @Override
+            public boolean apply(final AvroPayload input)
+            {
+                final JsonNode node = schemaNode(input);
+                final NodeType type = getType(node);
+
+                if (type != NodeType.OBJECT)
+                    return false;
+
+                final JsonNode digest = ObjectSchemaDigester.getInstance()
+                    .digest(node);
+
+                // FIXME: as for array digester, the result should really be
+                // a POJO
+                if (!digest.get("hasAdditional").booleanValue())
+                    return false;
+
+                return digest.get("properties").size() == 0
+                    && digest.get("patternProperties").size() == 0;
+            }
+        };
+    }
+
     private static JsonNode schemaNode(final AvroPayload payload)
     {
         return payload.getTree().getNode();
     }
+
+    private static NodeType getType(final JsonNode node)
+    {
+        final JsonNode typeNode = node.path("type");
+        return typeNode.isTextual() ? NodeType.fromName(typeNode.textValue())
+            : null;
+    }
 }

src/test/java/com/github/fge/AvroTesting.java

@@ -0,0 +1,70 @@
+package com.github.fge.jsonschema2avro;
+
+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.google.common.collect.Lists;
+import org.apache.avro.Schema;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.assertEquals;
+
+public abstract class AvroWriterProcessorTest
+{
+    private final JsonNode testNode;
+
+    private AvroWriterProcessor processor;
+    private ProcessingReport report;
+
+    protected AvroWriterProcessorTest(final String prefix)
+        throws IOException
+    {
+        testNode = JsonLoader.fromResource("/jsonschema2avro/" + prefix
+            + ".json");
+    }
+
+    @BeforeTest
+    public final void init()
+    {
+        processor = new AvroWriterProcessor();
+        report = mock(ProcessingReport.class);
+    }
+
+    @DataProvider
+    public final Iterator<Object[]> testData()
+    {
+        final List<Object[]> list = Lists.newArrayList();
+
+        for (final JsonNode element: testNode)
+            list.add(new Object[] {
+                element.get("jsonSchema"),
+                element.get("avroSchema")
+            });
+
+        return list.iterator();
+    }
+
+    @Test(dataProvider = "testData")
+    public final void JsonSchemasAreCorrectlyTranslated(final JsonNode schema,
+        final JsonNode avro)
+        throws ProcessingException
+    {
+        final SchemaTree tree = new CanonicalSchemaTree(schema);
+        final SchemaHolder input = new SchemaHolder(tree);
+        final Schema expected = new Schema.Parser().parse(avro.toString());
+
+        final Schema actual = processor.process(report, input).getValue();
+        assertEquals(expected, actual);
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.github.fge.jsonschema2avro;
+
+import java.io.IOException;
+
+public final class SimpleTypesTest
+    extends AvroWriterProcessorTest
+{
+    public SimpleTypesTest()
+        throws IOException
+    {
+        super("simple");
+    }
+}

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

@@ -0,0 +1,24 @@
+[
+    {
+        "avroSchema": "null",
+        "jsonSchema": { "type": "null" }
+    },
+    {
+        "avroSchema": "boolean",
+        "jsonSchema": { "type": "boolean" }
+    },
+    {
+        "avroSchema": "long",
+        "jsonSchema": {
+            "type": "integer"
+        }
+    },
+    {
+        "avroSchema": "double",
+        "jsonSchema": { "type": "number" }
+    },
+    {
+        "avroSchema": "string",
+        "jsonSchema": { "type": "string" }
+    }
+]