Skip to content

Commit e3f19f1

Browse files
committed
Add support for @AvroAlias as well
1 parent 79dad0a commit e3f19f1

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroAnnotationIntrospector.java

+13
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
import com.fasterxml.jackson.databind.introspect.Annotated;
77
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
88

9+
import java.util.Collections;
10+
import java.util.List;
11+
12+
import org.apache.avro.reflect.AvroAlias;
913
import org.apache.avro.reflect.AvroDefault;
1014
import org.apache.avro.reflect.AvroIgnore;
1115
import org.apache.avro.reflect.AvroName;
@@ -52,6 +56,15 @@ public String findPropertyDefaultValue(Annotated m) {
5256
return (ann == null) ? null : ann.value();
5357
}
5458

59+
@Override
60+
public List<PropertyName> findPropertyAliases(Annotated m) {
61+
AvroAlias ann = _findAnnotation(m, AvroAlias.class);
62+
if (ann == null) {
63+
return null;
64+
}
65+
return Collections.singletonList(PropertyName.construct(ann.alias()));
66+
}
67+
5568
protected PropertyName _findName(Annotated a)
5669
{
5770
AvroName ann = _findAnnotation(a, AvroName.class);

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/ApacheAvroInteropUtil.java

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.apache.avro.io.EncoderFactory;
1616
import org.apache.avro.reflect.ReflectData;
1717

18-
import com.fasterxml.jackson.core.JsonProcessingException;
1918
import com.fasterxml.jackson.databind.JavaType;
2019
import com.fasterxml.jackson.databind.JsonMappingException;
2120
import com.fasterxml.jackson.dataformat.avro.AvroMapper;

0 commit comments

Comments
 (0)