Migrate schemaParser property to avroSchemaParser task

README.md

@@ -108,3 +108,4 @@ This program is distributed under the BSD license. See the file `LICENSE` for mo
 - [Przemysław Dubaniewicz](https://github.com/przemekd)
 - [Neville Li](https://github.com/nevillelyh)
 - [Michel Davit](https://github.com/RustedBones)
+- [Mārtiņš Kalvāns](https://github.com/sisidra)

src/main/java/com/spotify/avro/mojo/AvscFilesCompiler.java

@@ -19,6 +19,7 @@ public class AvscFilesCompiler {
 
   private static final Logger LOG = LoggerFactory.getLogger(AvscFilesCompiler.class);
 
+  private final SchemaParserBuilder builder;
   private Schema.Parser schemaParser;
   private String templateDirectory;
   private GenericData.StringType stringType;
@@ -29,8 +30,9 @@ public class AvscFilesCompiler {
   private Map<AvroFileRef, Exception> compileExceptions;
   private boolean logCompileExceptions;
 
-  public AvscFilesCompiler(Schema.Parser schemaParser) {
-    this.schemaParser = schemaParser;
+  public AvscFilesCompiler(SchemaParserBuilder builder) {
+    this.builder = builder;
+    this.schemaParser = builder.build();
   }
 
   public void compileFiles(Set<AvroFileRef> files, File outputDirectory) {
@@ -74,46 +76,27 @@ public void compileFiles(Set<AvroFileRef> files, File outputDirectory) {
   }
 
   private boolean tryCompile(AvroFileRef src, File outputDirectory) {
-    // on failure Schema.Parser changes cache state.
-    // We want last successful state.
-    Schema.Parser successfulSchemaParser = new Schema.Parser();
-    successfulSchemaParser.addTypes(schemaParser.getTypes());
-    successfulSchemaParser.setValidate(schemaParser.getValidate());
-    successfulSchemaParser.setValidateDefaults(schemaParser.getValidateDefaults());
-
+    Schema.Parser successfulSchemaParser = stashParser();
+    final Schema schema;
     try {
-      Schema schema = schemaParser.parse(src.getFile());
-
-      if (useNamespace) {
-        if (schema.getType() != Schema.Type.RECORD && schema.getType() != Schema.Type.ENUM) {
-          throw new SchemaGenerationException(String.format(
-              "Error compiling schema file %s. "
-                  + "Only one root RECORD or ENUM type is allowed per file.",
-              src
-          ));
-        } else if (!src.pathToClassName().equals(schema.getFullName())) {
-          throw new SchemaGenerationException(String.format(
-              "Error compiling schema file %s. "
-                  + "File class name %s does not match record class name %s",
-              src,
-              src.pathToClassName(),
-              schema.getFullName()
-          ));
-        }
-      }
-
-      SpecificCompiler compiler = new SpecificCompiler(schema);
-      compiler.setTemplateDir(templateDirectory);
-      compiler.setStringType(stringType);
-      compiler.setFieldVisibility(fieldVisibility);
-      compiler.setEnableDecimalLogicalType(enableDecimalLogicalType);
-      compiler.setCreateSetters(createSetters);
-      compiler.compileToDestination(src.getFile(), outputDirectory);
-
+      schema = schemaParser.parse(src.getFile());
+      validateParsedSchema(src, schema);
     } catch (SchemaParseException e) {
       schemaParser = successfulSchemaParser;
       compileExceptions.put(src, e);
       return false;
+    } catch (IOException e) {
+      throw new SchemaGenerationException(String.format("Error parsing schema file %s", src), e);
+    }
+
+    SpecificCompiler compiler = new SpecificCompiler(schema);
+    compiler.setTemplateDir(templateDirectory);
+    compiler.setStringType(stringType);
+    compiler.setFieldVisibility(fieldVisibility);
+    compiler.setEnableDecimalLogicalType(enableDecimalLogicalType);
+    compiler.setCreateSetters(createSetters);
+    try {
+      compiler.compileToDestination(src.getFile(), outputDirectory);
     } catch (IOException e) {
       throw new SchemaGenerationException(
           String.format("Error compiling schema file %s to %s", src, outputDirectory), e);
@@ -122,6 +105,37 @@ private boolean tryCompile(AvroFileRef src, File outputDirectory) {
     return true;
   }
 
+  private Schema.Parser stashParser() {
+    // on failure Schema.Parser changes cache state.
+    // We want last successful state.
+    Schema.Parser parser = builder.build();
+    Set<String> predefinedTypes = parser.getTypes().keySet();
+    Map<String, Schema> compiledTypes = schemaParser.getTypes();
+    compiledTypes.keySet().removeAll(predefinedTypes);
+    parser.addTypes(compiledTypes);
+    return parser;
+  }
+
+  private void validateParsedSchema(AvroFileRef src, Schema schema) {
+    if (useNamespace) {
+      if (schema.getType() != Schema.Type.RECORD && schema.getType() != Schema.Type.ENUM) {
+        throw new SchemaGenerationException(String.format(
+            "Error compiling schema file %s. "
+                + "Only one root RECORD or ENUM type is allowed per file.",
+            src
+        ));
+      } else if (!src.pathToClassName().equals(schema.getFullName())) {
+        throw new SchemaGenerationException(String.format(
+            "Error compiling schema file %s. "
+                + "File class name %s does not match record class name %s",
+            src,
+            src.pathToClassName(),
+            schema.getFullName()
+        ));
+      }
+    }
+  }
+
   public void setTemplateDirectory(String templateDirectory) {
     this.templateDirectory = templateDirectory;
   }

src/main/java/com/spotify/avro/mojo/SchemaParserBuilder.java

@@ -0,0 +1,7 @@
+package com.spotify.avro.mojo;
+
+import org.apache.avro.Schema;
+
+public interface SchemaParserBuilder {
+  Schema.Parser build();
+}

src/main/scala/sbtavro/DefaultSchemaParserBuilder.scala

@@ -0,0 +1,33 @@
+package sbtavro
+
+import com.spotify.avro.mojo.SchemaParserBuilder
+import org.apache.avro.Schema
+import scala.collection.JavaConverters._
+
+case class DefaultSchemaParserBuilder(types: Iterable[Schema],
+                                      validate: Boolean,
+                                      validateDefaults: Boolean)
+    extends SchemaParserBuilder {
+
+  override def build(): Schema.Parser = {
+    val parser = new Schema.Parser
+    parser.addTypes(types.map(el => el.getFullName() -> el).toMap.asJava)
+    parser.setValidate(validate)
+    parser.setValidateDefaults(validateDefaults)
+    parser
+  }
+}
+
+object DefaultSchemaParserBuilder {
+  def default(): DefaultSchemaParserBuilder = {
+    template(new Schema.Parser())
+  }
+
+  def template(template: Schema.Parser): DefaultSchemaParserBuilder = {
+    DefaultSchemaParserBuilder(
+      template.getTypes.values().asScala,
+      template.getValidate,
+      template.getValidateDefaults
+    )
+  }
+}

src/main/scala/sbtavro/SbtAvro.scala

@@ -11,7 +11,7 @@ import org.apache.avro.{Protocol, Schema}
 import sbt.Keys._
 import sbt._
 import Path.relativeTo
-import com.spotify.avro.mojo.AvroFileRef
+import com.spotify.avro.mojo.{AvroFileRef, SchemaParserBuilder}
 import sbt.librarymanagement.DependencyFilter
 
 /**
@@ -38,8 +38,9 @@ object SbtAvro extends AutoPlugin {
     val avroFieldVisibility = settingKey[String]("Field visibility for the properties. Possible values: private, public, public_deprecated. Default: public_deprecated.")
     val avroUseNamespace = settingKey[Boolean]("Validate that directory layout reflects namespaces, i.e. src/main/avro/com/myorg/MyRecord.avsc.")
     val avroSource = settingKey[File]("Default Avro source directory.")
-    val avroValidate = settingKey[Boolean]("Avro Schema.Parser name validation. Default: `new Schema.Parser.getValidate()`")
-    val avroValidateDefaults = settingKey[Boolean]("Avro Schema.Parser default value validation. Default: `new Schema.Parser.getValidateDefaults()`")
+
+    val avroSchemaParserBuilder = settingKey[SchemaParserBuilder](".avsc schema parser builder")
+
     val avroUnpackDependencies = taskKey[Seq[File]]("Unpack avro dependencies.")
     val avroDependencyIncludeFilter = settingKey[DependencyFilter]("Filter for including modules containing avro dependencies.")
 
@@ -71,11 +72,6 @@ object SbtAvro extends AutoPlugin {
       // packaging
       packageAvro / artifactClassifier := Some(AvroClassifier),
       packageAvro / publishArtifact := false,
-      // clean
-      clean := {
-        schemaParser.set(new Schema.Parser())
-        clean.value
-      }
     ) ++ packageTaskSettings(packageAvro, packageAvroMappings) ++ Seq(
       packageAvro / artifact := (packageAvro / artifact).value.withType(Artifact.SourceType)
     )
@@ -96,8 +92,7 @@ object SbtAvro extends AutoPlugin {
     avroFieldVisibility := "public_deprecated",
     avroEnableDecimalLogicalType := true,
     avroUseNamespace := false,
-    avroValidate := schemaParser.get().getValidate,
-    avroValidateDefaults := schemaParser.get().getValidateDefaults
+    avroSchemaParserBuilder := DefaultSchemaParserBuilder.default()
   )
 
   override lazy val projectSettings: Seq[Setting[_]] = defaultSettings ++
@@ -150,18 +145,9 @@ object SbtAvro extends AutoPlugin {
     compiler.compileToDestination(null, target)
   }
 
-  val schemaParser = new AtomicReference(new Schema.Parser())
-
-  def compileAvscs(refs: Seq[AvroFileRef], target: File, stringType: StringType, fieldVisibility: FieldVisibility, enableDecimalLogicalType: Boolean, useNamespace: Boolean, validate: Boolean, validateDefaults: Boolean) {
+  def compileAvscs(refs: Seq[AvroFileRef], target: File, stringType: StringType, fieldVisibility: FieldVisibility, enableDecimalLogicalType: Boolean, useNamespace: Boolean, builder: SchemaParserBuilder) {
     import com.spotify.avro.mojo._
-
-    val global = schemaParser.get()
-    // copy of global schemaParser to avoid race condition
-    val parser = new Schema.Parser()
-      .addTypes(global.getTypes)
-      .setValidate(validate)
-      .setValidateDefaults(validateDefaults)
-    val compiler = new AvscFilesCompiler(parser)
+    val compiler = new AvscFilesCompiler(builder)
     compiler.setStringType(stringType)
     compiler.setFieldVisibility(fieldVisibility)
     compiler.setUseNamespace(useNamespace)
@@ -190,8 +176,7 @@ object SbtAvro extends AutoPlugin {
                                       fieldVisibility: FieldVisibility,
                                       enableDecimalLogicalType: Boolean,
                                       useNamespace: Boolean,
-                                      validate: Boolean,
-                                      validateDefaults: Boolean): Set[File] = {
+                                      builder: SchemaParserBuilder): Set[File] = {
     (srcDir ** AvroAvdlFilter).get.foreach { idl =>
       log.info(s"Compiling Avro IDL $idl")
       compileIdl(idl, target, stringType, fieldVisibility, enableDecimalLogicalType)
@@ -201,7 +186,7 @@ object SbtAvro extends AutoPlugin {
       log.info(s"Compiling Avro schemas $avsc")
       new AvroFileRef(srcDir, avsc.relativeTo(srcDir).get.toString)
     }
-    compileAvscs(avscs, target, stringType, fieldVisibility, enableDecimalLogicalType, useNamespace, validate, validateDefaults)
+    compileAvscs(avscs, target, stringType, fieldVisibility, enableDecimalLogicalType, useNamespace, builder)
 
     (srcDir ** AvroAvrpFilter).get.foreach { avpr =>
       log.info(s"Compiling Avro protocol $avpr")
@@ -220,13 +205,12 @@ object SbtAvro extends AutoPlugin {
     val fieldVis = SpecificCompiler.FieldVisibility.valueOf(avroFieldVisibility.value.toUpperCase)
     val enbDecimal = avroEnableDecimalLogicalType.value
     val useNs = avroUseNamespace.value
-    val validate = avroValidate.value
-    val validateDefaults = avroValidateDefaults.value
+    val builder = avroSchemaParserBuilder.value
     val cachedCompile = {
       FileFunction.cached(out.cacheDirectory / "avro", FilesInfo.lastModified, FilesInfo.exists) { _ =>
         out.log.info(s"Avro compiler using stringType=$strType")
-        compileAvroSchema(externalSrcDir, outDir, out.log, strType, fieldVis, enbDecimal, useNs, validate, validateDefaults)
-        compileAvroSchema(srcDir, outDir, out.log, strType, fieldVis, enbDecimal, useNs, validate, validateDefaults)
+        compileAvroSchema(externalSrcDir, outDir, out.log, strType, fieldVis, enbDecimal, useNs, builder)
+        compileAvroSchema(srcDir, outDir, out.log, strType, fieldVis, enbDecimal, useNs, builder)
 
       }
     }

src/sbt-test/sbt-avro/avscparser/build.sbt

@@ -0,0 +1,15 @@
+import java.util.Collections.{singletonMap, singletonList}
+import org.apache.avro.Schema
+
+name := "avscparser-test"
+
+libraryDependencies ++= Seq(
+  "org.apache.avro" % "avro" % "1.10.0",
+  "org.specs2" %% "specs2-core" % "4.9.4" % Test
+)
+
+avroSchemaParserBuilder := AnnotateWithArtifactSchemaParser
+  .newBuilder(projectID.value)
+  .copy(types = singletonMap(
+    "B", Schema.createEnum("B", null, "com.cavorite.test.avscparser", singletonList("B1"))
+  ))

src/sbt-test/sbt-avro/avscparser/project/AnnotateWithArtifactSchemaParser.scala

@@ -0,0 +1,34 @@
+import com.spotify.avro.mojo.SchemaParserBuilder
+import org.apache.avro.Schema
+import sbt.ModuleID
+
+class AnnotateWithArtifactSchemaParser(
+  moduleID: ModuleID,
+  types: java.util.Map[String, Schema]
+) extends org.apache.avro.Schema.Parser {
+
+  addTypes(types)
+
+  override def parse(file: java.io.File): org.apache.avro.Schema = {
+    val schema = super.parse(file)
+    if (schema.getType == org.apache.avro.Schema.Type.RECORD) {
+      schema.addProp("com.cavorite.sbt-avro.artifact", moduleID.toString())
+    }
+    schema
+  }
+
+}
+
+object AnnotateWithArtifactSchemaParser {
+
+  case class Builder(moduleID: ModuleID, types: java.util.Map[String, Schema])
+      extends SchemaParserBuilder {
+
+    override def build(): Schema.Parser =
+      new AnnotateWithArtifactSchemaParser(moduleID, types)
+  }
+
+  def newBuilder(moduleID: ModuleID): AnnotateWithArtifactSchemaParser.Builder =
+    new Builder(moduleID, java.util.Collections.emptyMap())
+
+}

src/sbt-test/sbt-avro/avscparser/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.3.13

src/sbt-test/sbt-avro/avscparser/project/plugins.sbt

@@ -0,0 +1,7 @@
+sys.props.get("plugin.version") match {
+  case Some(x) => addSbtPlugin("com.cavorite" % "sbt-avro" % x)
+  case _ => sys.error("""|The system property 'plugin.version' is not defined.
+                         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+}
+
+libraryDependencies += "org.apache.avro" % "avro-compiler" % "1.10.0"

src/sbt-test/sbt-avro/avscparser/src/main/avro/a.avsc

@@ -0,0 +1,11 @@
+{
+    "name": "A",
+    "namespace": "com.cavorite.test.avscparser",
+    "type": "record",
+    "fields": [
+        {
+            "name": "supportsCustomRegisteredType",
+            "type": "B"
+        }
+    ]
+}

src/sbt-test/sbt-avro/avscparser/src/test/scala/sbtavro/AvscParserSpec.scala

@@ -0,0 +1,17 @@
+package sbtavro
+
+import java.io.File
+
+import org.apache.avro.Schema
+import org.apache.avro.generic.GenericData.StringType
+import org.specs2.mutable.Specification
+
+import com.cavorite.test.avscparser.A
+
+class AvscParserSpec extends Specification {
+
+  "A should have artifact property" >> {
+    A.getClassSchema().getProp("com.cavorite.sbt-avro.artifact") == "avscparser-test:avscparser-test:0.1.0-SNAPSHOT"
+  }
+
+}

src/sbt-test/sbt-avro/avscparser/test

@@ -0,0 +1,10 @@
+> compile
+
+$ exists target/scala-2.12/src_managed/main/compiled_avro/com/cavorite/test/avscparser/A.java
+$ exists target/scala-2.12/src_managed/main/compiled_avro/com/cavorite/test/avscparser/B.java
+
+> test
+
+> clean
+
+> compile

src/sbt-test/sbt-avro/basic_1.10/test

@@ -1,4 +1,4 @@
-> set avroValidateDefaults := false
+> set avroSchemaParserBuilder := sbtavro.DefaultSchemaParserBuilder.default().copy(validateDefaults = false)
 > avroGenerate
 
 $ exists target/scala-2.12/src_managed/main/compiled_avro/com/cavorite/A.java
@@ -36,7 +36,7 @@ $ exists target/scala-2.12/test-classes/com/cavorite/Z.class
 
 > clean
 
-> set avroValidateDefaults := true
+> set avroSchemaParserBuilder := sbtavro.DefaultSchemaParserBuilder.default().copy(validateDefaults = true)
 
 # should fail because f.avsc has invalid default value
 -> avroGenerate