Fix deprecation lint.

Also add an explicit reference to json-schema-core, since this imports it directly.

Author: Capstan

build.gradle

@@ -127,7 +127,7 @@ task sourcesJar(type: Jar, dependsOn: classes) {
 allprojects {
     gradle.projectsEvaluated {
         tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:all" << "-Xlint:-serial" << "-Xlint:-deprecation" << "-Werror"
+            options.compilerArgs << "-Xlint:all" << "-Xlint:-serial" << "-Werror"
         }
         tasks.withType(Javadoc) {
             options.addStringOption('Xwerror', '-quiet')

project.gradle

@@ -32,6 +32,8 @@ project.ext {
  * List of dependencies
  */
 dependencies {
+    compile(group: "com.github.java-json-tools", name: "json-schema-core",
+        version: "1.2.12");
     compile(group: "com.github.java-json-tools", name: "json-schema-validator",
         version: "2.2.12");
     compile(group: "org.apache.avro", name: "avro", version: "1.7.6") {
@@ -61,5 +63,6 @@ javadoc.options {
     links("https://fasterxml.github.com/jackson-annotations/javadoc/2.9/");
     links("https://www.javadoc.io/doc/com.google.guava/guava/28.1-android/");
     links("https://java-json-tools.github.io/msg-simple/");
+    links("https://java-json-tools.github.io/json-schema-core/1.2.x/");
     links("https://java-json-tools.github.io/json-schema-validator/2.2.x/");
 }

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

@@ -26,6 +26,7 @@
 import com.github.fge.jsonschema.core.tree.CanonicalSchemaTree;
 import com.github.fge.jsonschema.core.tree.JsonTree;
 import com.github.fge.jsonschema.core.tree.SchemaTree;
+import com.github.fge.jsonschema.core.tree.key.SchemaKey;
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 
@@ -65,6 +66,6 @@ public SchemaTree rawProcess(final ProcessingReport report,
         AvroTranslators.getTranslator(avroType)
             .translate(avroSchema, tree, report);
 
-        return new CanonicalSchemaTree(tree.getBaseNode());
+        return new CanonicalSchemaTree(SchemaKey.anonymousKey(), tree.getBaseNode());
     }
 }

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

@@ -72,14 +72,14 @@ public boolean hasDefinition(final String name)
 
         if (!baseNode.has("definitions")) {
             ret = false;
-            baseNode.put("definitions", FACTORY.objectNode());
+            baseNode.set("definitions", FACTORY.objectNode());
         }
 
         final ObjectNode definitions = (ObjectNode) baseNode.get("definitions");
 
         if (!definitions.has(name)) {
             ret = false;
-            definitions.put(name, FACTORY.objectNode());
+            definitions.set(name, FACTORY.objectNode());
         }
 
         return ret;

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

@@ -51,7 +51,7 @@ public void translate(final Schema avroSchema, final MutableTree jsonSchema,
         final ObjectNode subSchema = FACTORY.objectNode();
         final Schema valuesSchema = avroSchema.getElementType();
 
-        jsonSchema.getCurrentNode().put("items", subSchema);
+        jsonSchema.getCurrentNode().set("items", subSchema);
 
         jsonSchema.setPointer(pwd.append("items"));
         AvroTranslators.getTranslator(valuesSchema.getType())

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

@@ -48,6 +48,6 @@ protected void doTranslate(final Schema avroSchema,
         final ArrayNode enumValues = FACTORY.arrayNode();
         for (final String symbol: avroSchema.getEnumSymbols())
             enumValues.add(symbol);
-        jsonSchema.getCurrentNode().put("enum", enumValues);
+        jsonSchema.getCurrentNode().set("enum", enumValues);
     }
 }

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

@@ -51,7 +51,7 @@ public void translate(final Schema avroSchema, final MutableTree jsonSchema,
         final ObjectNode subSchema = FACTORY.objectNode();
         final Schema valuesSchema = avroSchema.getValueType();
 
-        jsonSchema.getCurrentNode().put("additionalProperties", subSchema);
+        jsonSchema.getCurrentNode().set("additionalProperties", subSchema);
 
         jsonSchema.setPointer(pwd.append("additionalProperties"));
         AvroTranslators.getTranslator(valuesSchema.getType())

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

@@ -60,7 +60,7 @@ protected void doTranslate(final Schema avroSchema,
         if (fields.isEmpty()) {
             final ArrayNode node = FACTORY.arrayNode();
             node.add(FACTORY.objectNode());
-            jsonSchema.getCurrentNode().put("enum", node);
+            jsonSchema.getCurrentNode().set("enum", node);
             return;
         }
 
@@ -72,12 +72,12 @@ protected void doTranslate(final Schema avroSchema,
         jsonSchema.setType(NodeType.OBJECT);
 
         final ArrayNode required = FACTORY.arrayNode();
-        jsonSchema.getCurrentNode().put("required", required);
+        jsonSchema.getCurrentNode().set("required", required);
 
         jsonSchema.getCurrentNode().put("additionalProperties", false);
 
         final ObjectNode properties = FACTORY.objectNode();
-        jsonSchema.getCurrentNode().put("properties", properties);
+        jsonSchema.getCurrentNode().set("properties", properties);
 
         String fieldName;
         Schema fieldSchema;
@@ -98,7 +98,7 @@ protected void doTranslate(final Schema avroSchema,
             required.add(fieldName);
             ptr = JsonPointer.of("properties", fieldName);
             propertyNode = FACTORY.objectNode();
-            properties.put(fieldName, propertyNode);
+            properties.set(fieldName, propertyNode);
             injectDefault(propertyNode, field);
             jsonSchema.setPointer(pwd.append(ptr));
             translator.translate(fieldSchema, jsonSchema, report);
@@ -119,7 +119,7 @@ private static void injectDefault(final ObjectNode propertyNode,
          */
         try {
             final String s = OLD_MAPPER.writeValueAsString(value);
-            propertyNode.put("default", JsonLoader.fromString(s));
+            propertyNode.set("default", JsonLoader.fromString(s));
         } catch (IOException ignored) {
             // cannot happen
         }

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

@@ -48,7 +48,7 @@ public void translate(final Schema avroSchema, final MutableTree jsonSchema,
     {
         final JsonPointer pwd = jsonSchema.getPointer();
         final ArrayNode schemas = FACTORY.arrayNode();
-        jsonSchema.getCurrentNode().put("oneOf", schemas);
+        jsonSchema.getCurrentNode().set("oneOf", schemas);
 
         Schema schema;
         Schema.Type type;

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

@@ -22,9 +22,11 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.ref.JsonRef;
 import com.github.fge.jsonschema.core.report.ProcessingReport;
 import com.github.fge.jsonschema.core.tree.CanonicalSchemaTree;
 import com.github.fge.jsonschema.core.tree.SchemaTree;
+import com.github.fge.jsonschema.core.tree.key.SchemaKey;
 import com.github.fge.jsonschema.core.util.ValueHolder;
 import com.github.fge.jsonschema2avro.AvroWriterProcessor;
 import com.google.common.collect.Lists;
@@ -53,17 +55,19 @@ protected Schema generate(final AvroWriterProcessor writer,
     {
         // In such a union, there cannot be embedded unions so we need not care
         // here
+        final JsonRef context = tree.getContext();
         final JsonNode node = tree.getNode();
         final List<Schema> schemas = Lists.newArrayList();
 
-        for (final ValueHolder<SchemaTree> holder: expand(node))
+        for (final ValueHolder<SchemaTree> holder: expand(context, node))
             schemas.add(writer.process(report, holder).getValue());
 
         return Schema.createUnion(schemas);
     }
 
-    private static List<ValueHolder<SchemaTree>> expand(final JsonNode node)
+    private static List<ValueHolder<SchemaTree>> expand(final JsonRef context, final JsonNode node)
     {
+        final SchemaKey key = SchemaKey.forJsonRef(context);
         final ObjectNode common = node.deepCopy();
         final ArrayNode typeNode = (ArrayNode) common.remove("type");
 
@@ -74,8 +78,8 @@ private static List<ValueHolder<SchemaTree>> expand(final JsonNode node)
 
         for (final JsonNode element: typeNode) {
             schema = common.deepCopy();
-            schema.put("type", element);
-            tree = new CanonicalSchemaTree(schema);
+            schema.set("type", element);
+            tree = new CanonicalSchemaTree(key, schema);
             ret.add(ValueHolder.hold("schema", tree));
         }