Merge pull request #22315 from glefloch/fix/21529

Add the ability to set custom converters to avro compiler
quarkusio · Dec 20, 2021 · 7c71329 · 7c71329
2 parents cc118fd + e8b15c7
commit 7c71329
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/...ons/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroCodeGenProviderBase.java b/...ons/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroCodeGenProviderBase.java
@@ -4,8 +4,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -141,6 +143,14 @@ public static class AvroOptions {
          */
         final boolean optionalGettersForNullableFieldsOnly;
 
+        /**
+         * A list of custom converter classes to register on the avro compiler. <code>Conversions.UUIDConversion</code> is
+         * registered by default.
+         * <p>
+         * Passed as a comma-separated list.
+         */
+        final List<String> customConversions = new ArrayList<>();
+
         AvroOptions(Config config, String specificPropertyKey) {
             this.config = config;
             String imports = prop("avro.codegen." + specificPropertyKey + ".imports", "");
@@ -153,6 +163,12 @@ public static class AvroOptions {
             gettersReturnOptional = getBooleanProperty("avro.codegen.gettersReturnOptional", false);
             optionalGettersForNullableFieldsOnly = getBooleanProperty("avro.codegen.optionalGettersForNullableFieldsOnly",
                     false);
+            String conversions = prop("avro.codegen.customConversions", "");
+            if (!"".equals(conversions)) {
+                for (String conversion : conversions.split(",")) {
+                    customConversions.add(conversion.trim());
+                }
+            }
         }
 
         private String prop(String propName, String defaultValue) {

diff --git a/...s/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroSchemaCodeGenProvider.java b/...s/avro/deployment/src/main/java/io/quarkus/avro/deployment/AvroSchemaCodeGenProvider.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 
+import org.apache.avro.Conversions;
 import org.apache.avro.Schema;
 import org.apache.avro.compiler.specific.SpecificCompiler;
 
@@ -65,6 +66,19 @@ void compileSingleFile(Path filePath,
         compiler.setCreateSetters(options.createSetters);
         compiler.setEnableDecimalLogicalType(options.enableDecimalLogicalType);
         compiler.setOutputCharacterEncoding("UTF-8");
+        compiler.addCustomConversion(Conversions.UUIDConversion.class);
+
+        for (String customConversion : options.customConversions) {
+            try {
+                Class<?> conversionClass = Class.forName(customConversion);
+                if (!conversionClass.isInstance(Conversions.UUIDConversion.class)) {
+                    compiler.addCustomConversion(conversionClass);
+                }
+            } catch (ClassNotFoundException e) {
+                throw new CodeGenException("Unable to find the following conversion class: " + customConversion, e);
+            }
+        }
+
         try {
             compiler.compileToDestination(file, outputDirectory.toFile());
         } catch (IOException e) {

diff --git a/integration-tests/avro-reload/src/test/avro/User.avsc b/integration-tests/avro-reload/src/test/avro/User.avsc
@@ -6,7 +6,7 @@
   "fields": [
     {
       "name": "id",
-      "type": ["null", "string"],
+      "type": ["null", {"type": "string", "logicalType": "UUID"}],
       "default": null
     },
     {