Revert "Reuse SpecificCompiler for all Schemas (#231)"

This reverts commit e904bb3.
sbt · Jan 15, 2025 · 2407602 · 2407602
1 parent 355f214
commit 2407602
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/bridge/src/main/java/com/github/sbt/avro/AvroCompilerBridge.java b/bridge/src/main/java/com/github/sbt/avro/AvroCompilerBridge.java
@@ -90,7 +90,7 @@ public void compileIdls(File[] idls, File target) throws Exception {
             Protocol protocol = parser.CompilationUnit();
             SpecificCompiler compiler = new SpecificCompiler(protocol);
             configureCompiler(compiler);
-            compiler.compileToDestination(null, target);
+            compiler.compileToDestination(idl, target);
         }
     }
 
@@ -101,14 +101,15 @@ public void compileAvscs(File[] avscs, File target) throws Exception {
             System.out.println("Compiling Avro schema: " + schema);
             files.add(schema);
         }
-        List<Schema> schemas = parser.parseFiles(files);
-
-        // This is a trick to use a single instance on the SpecificCompiler for all schemas
-        // only avro 1.12+ SpecificCompiler has a constructor accepting a schema collection
-        Schema schema = Schema.createUnion(schemas);
-        SpecificCompiler compiler = new SpecificCompiler(schema);
-        configureCompiler(compiler);
-        compiler.compileToDestination(null, target);
+        Map<File, Schema> schemas = parser.parseFiles(files);
+
+        for (Map.Entry<File, Schema> entry: schemas.entrySet()) {
+            File file = entry.getKey();
+            Schema schema = entry.getValue();
+            SpecificCompiler compiler = new SpecificCompiler(schema);
+            configureCompiler(compiler);
+            compiler.compileToDestination(file, target);
+        }
     }
 
     @Override

diff --git a/bridge/src/main/java/com/github/sbt/avro/AvscFilesParser.java b/bridge/src/main/java/com/github/sbt/avro/AvscFilesParser.java
@@ -31,7 +31,7 @@ public void addTypes(Iterable<Schema> types) {
     }
   }
 
-  public List<Schema> parseFiles(Collection<File> files) {
+  public Map<File, Schema> parseFiles(Collection<File> files) {
     Set<File> unparsedFiles = new HashSet<>(files);
     Map<File, Schema> parsedFiles = new HashMap<>();
     Map<File, Exception> parseExceptions = new HashMap<>();
@@ -72,7 +72,7 @@ public List<Schema> parseFiles(Collection<File> files) {
       throw new SchemaGenerationException("Can not parse schema files:\n" + failedFiles);
     }
 
-    return new ArrayList<>(parsedFiles.values());
+    return parsedFiles;
   }
 
   private void stashParser(Schema.Parser parser) {

diff --git a/bridge/src/test/scala/com/github/sbt/avro/AvscFilesParserSpec.scala b/bridge/src/test/scala/com/github/sbt/avro/AvscFilesParserSpec.scala
@@ -33,7 +33,7 @@ class AvscFilesParserSpec extends Specification {
 
     val sourceFiles = fullyQualifiedNames ++ simpleNames
     val schemas = parser.parseFiles(sourceFiles.asJava)
-    val names = schemas.asScala.map(_.getFullName)
+    val names = schemas.asScala.values.map(_.getFullName)
     names must contain(
       exactly(
         "com.github.sbt.avro.test.A",
@@ -69,7 +69,7 @@ class AvscFilesParserSpec extends Specification {
     val parent = new File(sourceDir, "test_records.avsc")
     parser.addTypes(Seq(dependant).asJava)
     val schemas = parser.parseFiles(Seq(parent).asJava)
-    val names = schemas.asScala.map(_.getFullName)
+    val names = schemas.asScala.values.map(_.getFullName)
     names must contain(exactly("com.github.sbt.avro.TestSpecificRecordParent"))
   }