(pulsar) branch branch-4.0 updated: [fix][client] Apply Avro logical type conversions when decoding schema without classloader (#25759)

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-4.0 by this push:
     new e7c37315024 [fix][client] Apply Avro logical type conversions when 
decoding schema without classloader (#25759)
e7c37315024 is described below

commit e7c37315024afd99813642ffd3e3a571f9a871a9
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Wed May 13 15:44:45 2026 +0300

    [fix][client] Apply Avro logical type conversions when decoding schema 
without classloader (#25759)
    
    (cherry picked from commit 30ca23f463412de0fe49007d8d5215252e693c56)
---
 .../client/impl/schema/reader/AvroReader.java      | 24 ++++---------
 .../pulsar/client/impl/schema/AvroSchemaTest.java  | 40 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java
 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java
index 3ad43dbd9f2..0c9b8d37ae2 100644
--- 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java
+++ 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/schema/reader/AvroReader.java
@@ -18,6 +18,7 @@
  */
 package org.apache.pulsar.client.impl.schema.reader;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Optional;
@@ -39,32 +40,21 @@ public class AvroReader<T> implements SchemaReader<T> {
             new ThreadLocal<>();
     private final Schema schema;
 
+    @VisibleForTesting
     public AvroReader(Schema schema) {
-        this.reader = new ReflectDatumReader<>(schema);
-        this.schema = schema;
+        this(schema, schema, null, false);
     }
 
     public AvroReader(Schema schema, ClassLoader classLoader, boolean 
jsr310ConversionEnabled) {
-        this.schema = schema;
-        if (classLoader != null) {
-            ReflectData reflectData = new ReflectData(classLoader);
-            AvroSchema.addLogicalTypeConversions(reflectData, 
jsr310ConversionEnabled);
-            this.reader = new ReflectDatumReader<>(schema, schema, 
reflectData);
-        } else {
-            this.reader = new ReflectDatumReader<>(schema);
-        }
+        this(schema, schema, classLoader, jsr310ConversionEnabled);
     }
 
     public AvroReader(Schema writerSchema, Schema readerSchema, ClassLoader 
classLoader,
         boolean jsr310ConversionEnabled) {
         this.schema = readerSchema;
-        if (classLoader != null) {
-            ReflectData reflectData = new ReflectData(classLoader);
-            AvroSchema.addLogicalTypeConversions(reflectData, 
jsr310ConversionEnabled);
-            this.reader = new ReflectDatumReader<>(writerSchema, readerSchema, 
reflectData);
-        } else {
-            this.reader = new ReflectDatumReader<>(writerSchema, readerSchema);
-        }
+        ReflectData reflectData = classLoader != null ? new 
ReflectData(classLoader) : new ReflectData();
+        AvroSchema.addLogicalTypeConversions(reflectData, 
jsr310ConversionEnabled);
+        this.reader = new ReflectDatumReader<>(writerSchema, readerSchema, 
reflectData);
     }
 
     @Override
diff --git 
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
 
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
index 3dedf3c978c..41c4fb3dc86 100644
--- 
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
+++ 
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
@@ -570,4 +570,44 @@ public class AvroSchemaTest {
         LocalDateTimePojo pojo = avroSchema.decode(bytes);
         assertEquals(pojo.getValue().truncatedTo(ChronoUnit.MILLIS), 
now.truncatedTo(ChronoUnit.MILLIS));
     }
+
+    public static class UuidLogicalTypeDto {
+        public UUID id;
+        public String name;
+
+        public UuidLogicalTypeDto() {
+        }
+
+        public UuidLogicalTypeDto(UUID id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+    }
+
+    @Test
+    public void testDecodeUuidLogicalTypeWithClass() {
+        UUID id = UUID.randomUUID();
+        String name = "name";
+        AvroSchema<UuidLogicalTypeDto> schema = 
AvroSchema.of(UuidLogicalTypeDto.class);
+        byte[] encoded = schema.encode(new UuidLogicalTypeDto(id, name));
+
+        UuidLogicalTypeDto decoded = schema.decode(encoded);
+        assertEquals(decoded.id, id);
+        assertEquals(decoded.name, name);
+    }
+
+    @Test
+    public void testDecodeUuidLogicalTypeWithJsonDef() {
+        UUID id = UUID.randomUUID();
+        String name = "name";
+        AvroSchema<UuidLogicalTypeDto> schemaFromClass = 
AvroSchema.of(UuidLogicalTypeDto.class);
+        byte[] encoded = schemaFromClass.encode(new UuidLogicalTypeDto(id, 
name));
+        String jsonDef = schemaFromClass.getSchemaInfo().getSchemaDefinition();
+
+        AvroSchema<UuidLogicalTypeDto> schemaFromJsonDef = AvroSchema.of(
+                
SchemaDefinition.<UuidLogicalTypeDto>builder().withJsonDef(jsonDef).build());
+        UuidLogicalTypeDto decoded = schemaFromJsonDef.decode(encoded);
+        assertEquals(decoded.id, id);
+        assertEquals(decoded.name, name);
+    }
 }