Fixed bug with Nested Avro Composition

example-nested/nested-composition.dot

@@ -0,0 +1,17 @@
+digraph "Simple Composition" {
+    rankdir="BT";
+    nodesep=1;
+    node [shape=box,style="rounded,filled",penwidth=2.0,color=black,fillcolor=grey90];
+
+    ExampleMetadata [label="ExampleMetadata(timestamp: long, name: String, version: String)"];
+    ExampleSubscription [label="ExampleSubscription(raw: String, mimetype: String, subscriptionMetadata: ExampleMetadata)"];
+    ExampleToken [label="ExampleToken(raw: String, origin: String, metadata: ExampleMetadata, metadataBasic: ExampleMetadata, metadata: ExampleMetadata, subscription: ExampleSubscription)"];
+
+    ExampleMetadata -> ExampleToken [label="metadata"];
+    ExampleMetadata -> ExampleToken [label="metadataBasic"];
+
+    ExampleSubscription -> ExampleToken [label="subscription"];
+
+    ExampleMetadata -> ExampleSubscription [label="subscriptionMetadata"];
+
+}

example-nested/schemas/avro/examples/Metadata.avsc

@@ -0,0 +1,22 @@
+{
+  "type": "record",
+  "namespace": "com.oivanov.examples",
+  "name": "ExampleMetadata",
+  "fields": [
+    {
+      "name": "timestamp",
+      "type": {
+        "type": "long",
+        "logicalType": "timestamp-millis"
+      }
+    },
+    {
+      "name": "source",
+      "type": "string"
+    },
+    {
+      "name": "version",
+      "type": "string"
+    }
+  ]
+}

example-nested/schemas/avro/examples/Subscription.avsc

@@ -0,0 +1,23 @@
+{
+  "type": "record",
+  "name": "ExampleSubscription",
+  "namespace": "com.oivanov.examples",
+  "fields": [
+    {
+      "name": "raw",
+      "type": "string"
+    },
+    {
+      "name": "origin",
+      "type": ["string", "null"]
+    },
+    {
+      "name": "mimetype",
+      "type": "string"
+    },
+    {
+      "name": "metadata",
+      "type": "com.oivanov.examples.ExampleMetadata"
+    }
+  ]
+}

example-nested/schemas/avro/examples/Token.avsc

@@ -0,0 +1,27 @@
+{
+  "type": "record",
+  "name": "ExampleToken",
+  "namespace": "com.oivanov.examples",
+  "fields": [
+    {
+      "name": "raw",
+      "type": "string"
+    },
+    {
+      "name": "origin",
+      "type": "string"
+    },
+    {
+      "name": "metadataBasic",
+      "type": "com.oivanov.examples.ExampleMetadata"
+    },
+    {
+      "name": "metadata",
+      "type": "com.oivanov.examples.ExampleMetadata"
+    },
+    {
+      "name": "subscription",
+      "type": "com.oivanov.examples.ExampleSubscription"
+    }
+  ]
+}

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.michalklempa</groupId>
     <artifactId>avro-compose</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Avro Compose</name>
@@ -34,7 +34,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <avro.version>1.9.2</avro.version>
+        <avro.version>1.11.3</avro.version>
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

src/main/java/com/michalklempa/avro/compose/SchemaFile.java

@@ -13,6 +13,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.google.common.collect.MapDifference;
+import com.google.common.collect.Maps;
+
 public interface SchemaFile {
     String name();
 
@@ -132,7 +135,8 @@ public static Attempt attempt(Attempt attempt, SchemaFile.Parsed dependency) {
         public static Parsed parsed(Attempt schemaFile) throws IOException {
             Schema.Parser parser = new Schema.Parser();
             for (SchemaFile.Parsed dependency : schemaFile.dependencies()) {
-                parser.addTypes(dependency.types());
+                MapDifference<String, Schema> difference = Maps.difference(parser.getTypes(), dependency.types());
+                parser.addTypes(difference.entriesOnlyOnRight());
             }
             try (InputStream is = new FileInputStream(schemaFile.filename())) {
                 Set<String> typeNames = new HashSet<>();