From 314e6be74c32a8fbc46d40c31f828c268f1ded04 Mon Sep 17 00:00:00 2001
From: Xiaoyu Yang <xyang1@linkedin.com>
Date: Wed, 7 Jun 2023 11:15:56 -0400
Subject: [PATCH] Fix issue with resolvePath to take multiple resolver items
 (#496)

* Fix issue with resolvePath to take multiple resolver items

* Fix issue with resolvePath to take multiple resolver items
---
 .../avroutil1/builder/SchemaBuilder.java         |   4 ++--
 .../avroutil1/builder/SchemaBuilderTest.java     |   3 ++-
 .../resolverpath-project/avro_zip.zip            | Bin 0 -> 1176 bytes
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 avro-builder/builder/src/test/resources/test-projects/resolverpath-project/avro_zip.zip

diff --git a/avro-builder/builder/src/main/java/com/linkedin/avroutil1/builder/SchemaBuilder.java b/avro-builder/builder/src/main/java/com/linkedin/avroutil1/builder/SchemaBuilder.java
index 886c5e68e..8840e7059 100644
--- a/avro-builder/builder/src/main/java/com/linkedin/avroutil1/builder/SchemaBuilder.java
+++ b/avro-builder/builder/src/main/java/com/linkedin/avroutil1/builder/SchemaBuilder.java
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
-
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
@@ -56,7 +55,8 @@ public static void main(String[] args) throws Exception {
         .describedAs("dir");
     OptionSpec<String> resolverPathOpt = parser.accepts("resolverPath", "Resolver path for dependent schemas")
         .withOptionalArg()
-        .describedAs("file");
+        .describedAs("file")
+        .withValuesSeparatedBy(File.pathSeparatorChar);
     OptionSpec<String> expandedSchemas = parser.accepts("expandedSchemas", "Directory for dumping expanded schemas")
         .withOptionalArg()
         .describedAs("dir");
diff --git a/avro-builder/builder/src/test/java/com/linkedin/avroutil1/builder/SchemaBuilderTest.java b/avro-builder/builder/src/test/java/com/linkedin/avroutil1/builder/SchemaBuilderTest.java
index a4abb8844..a7b5f5b1e 100644
--- a/avro-builder/builder/src/test/java/com/linkedin/avroutil1/builder/SchemaBuilderTest.java
+++ b/avro-builder/builder/src/test/java/com/linkedin/avroutil1/builder/SchemaBuilderTest.java
@@ -128,6 +128,7 @@ public void testWithImportsFromResolverPath() throws Exception {
     File simpleProjectRoot = new File(locateTestProjectsRoot(), "resolverpath-project");
     File inputFolder = new File(simpleProjectRoot, "input");
     File resolverFolder = new File(simpleProjectRoot, "resolverPath");
+    File resolverZip = new File(simpleProjectRoot, "avro_zip.zip");
     File outputFolder = new File(simpleProjectRoot, "output");
     if (outputFolder.exists()) { //clear output
       FileUtils.deleteDirectory(outputFolder);
@@ -137,7 +138,7 @@ public void testWithImportsFromResolverPath() throws Exception {
             "--input", inputFolder.getAbsolutePath(),
             "--output", outputFolder.getAbsolutePath(),
             "--generator", CodeGenerator.AVRO_UTIL.name(),
-            "--resolverPath", resolverFolder.getAbsolutePath()
+            "--resolverPath", String.join(File.pathSeparator, resolverFolder.getAbsolutePath(), resolverZip.getAbsolutePath())
         });
     //see output was generated
     List<Path> javaFiles = Files.find(outputFolder.toPath(), 5,
diff --git a/avro-builder/builder/src/test/resources/test-projects/resolverpath-project/avro_zip.zip b/avro-builder/builder/src/test/resources/test-projects/resolverpath-project/avro_zip.zip
new file mode 100644
index 0000000000000000000000000000000000000000..2757ddd73901fe3cdbfa8cf7a0d472c53d3d0b32
GIT binary patch
literal 1176
zcmWIWW@Zs#U|`^2;BZ?LHff!MdKr+n4T#woWEhH46H{_iLqj+jnEOrRQYHd%X$3a}
zBg+&U1_rRc&|XKb!wwv--z|^scc^Z7SJnRRv_Z1fp#_e)3v6qB6(;Dh{I$8izrS%N
zyJdvHT-n~<tQEBZJw|IE-(B%ksB6<KyZw7&iVapPo@jo`s(gLpq(se&=AlfNzr1Lf
zd#34d$!tB1Nown>_sv~?Zk15$QR6@EF8==Z0dQA;3tba-aPFB)i-0c9Vq{<t0lGRU
zH95a1B|NhvBQ!5FKTj{QtT-9shrqa$kIQ1w{gB)5$k(hO;QD=D(xF`+8TLAESMwD=
z);dv9_2@+gJ*mfcTQ!-w^El4b&;OsE&(QLJoyI!_9l!3WkHpeV&b_!+n3Ndx>{`aJ
z1y`<AmFzPJe0SsfrGI}__FnK0k?JjRe0P{T;rV7G&0`f)KK=gEcOlK^TKCRnueTkY
zZdWg`@Tt*Vd9Bc9t4YbPic~!&i@US({jBqC-_zw{ns<ynI%eU{1q&_xK>p<d`jCO)
z6VSh429#h0`ZuwxC|@7!!49AY9{@30Bq4$er2Sy*wQDbc+S{2K7?fbz5n&dbnOl&P
z>XMq4SejE(j0ilC*;oQ^ZqRAILka?WzH4(lUnYNHv*Elw6(1685_X3wwJtkw(ByA<
z<gX7Cn|j5Wc5gP`EWE2lAWM$-!ki0YTvw-=9G#V7`l3yAU*HNW;h1|1pBNc0ILqDq
zR`xP`oH>(OfT4De+$~Y|z$|u)o#Kjf?e8C3BKqjWS>H%wzF(I8Gj$Z(ekILsi`=$C
zL}K3Rrz<83uW`53_xfAXCXry2$LGjceECn4{pF~ROIerMB4XQ5zZQB~(`yuca_W(*
z-}M$>c(>f}X5_m+{wL&vs<+1F$i6<f`0$$GpvUHsQH<-gA4^?HimrLhyXT#adhI8c
z0B=SnIc8j0MFJch!1Twkq!Gk~WgJ#W#=(dWgjtvg7}+dPMnpsna&iWlj4h@?CgVyf
z5R(}g1Q^~rE(1Cins9(dfg%@=BQcW=vLm0uj6%2+Ya+sB4=Woe$XI|d5@?bpFj+D%
F002bnjO+ja

literal 0
HcmV?d00001