Skip to content

AVRO-4133: Support default enum value in Protobuf to Avro #3367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opwvhk merged 3 commits into from
Jun 10, 2025
Merged

AVRO-4133: Support default enum value in Protobuf to Avro #3367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af8c494
[AVRO-4133] Support default enum value in Protobuf to Avro
zenfenan May 1, 2025
825a3ec
[AVRO-4133] Add unit test for proto schema enum default
Jun 6, 2025
8728c43
[AVRO-4133] Exclude generated test proto code
Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lang/java/protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
<arg value="--java_out=src/test/java/"/>
<arg value="src/test/protobuf/test_multiple_files.proto"/>
</exec>
<exec executable="protoc">
<arg value="--java_out=src/test/java/"/>
<arg value="src/test/protobuf/test_proto3.proto"/>
</exec>
</target>
</configuration>
<goals>
Expand Down
16 changes: 14 additions & 2 deletions lang/java/protobuf/src/main/java/org/apache/avro/protobuf/ProtobufData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,8 @@ private Schema getNonRepeatedSchema(FieldDescriptor f) {
case SFIXED64:
return Schema.create(Schema.Type.LONG);
case ENUM:
return getSchema(f.getEnumType());
return f.hasDefaultValue() ? getSchema(f.getEnumType(), ((EnumValueDescriptor) f.getDefaultValue()).getName())
: getSchema(f.getEnumType());
case MESSAGE:
result = getSchema(f.getMessageType());
if (f.isOptional())
Expand All @@ -315,11 +316,22 @@ private Schema getNonRepeatedSchema(FieldDescriptor f) {
}

public Schema getSchema(EnumDescriptor d) {
List<String> symbols = getEnumSymbols(d);
String enumDefault = symbols.isEmpty() ? null : symbols.get(0);
return Schema.createEnum(d.getName(), null, getNamespace(d.getFile(), d.getContainingType()), symbols, enumDefault);
}

public Schema getSchema(EnumDescriptor d, String enumDefault) {
List<String> symbols = getEnumSymbols(d);
return Schema.createEnum(d.getName(), null, getNamespace(d.getFile(), d.getContainingType()), symbols, enumDefault);
}

private List<String> getEnumSymbols(EnumDescriptor d) {
List<String> symbols = new ArrayList<>(d.getValues().size());
for (EnumValueDescriptor e : d.getValues()) {
symbols.add(e.getName());
}
return Schema.createEnum(d.getName(), null, getNamespace(d.getFile(), d.getContainingType()), symbols);
return symbols;
}

private static final JsonFactory FACTORY = new JsonFactory();
Expand Down
14 changes: 14 additions & 0 deletions lang/java/protobuf/src/test/java/org/apache/avro/protobuf/TestProtobuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.avro.io.DecoderFactory;
import org.apache.avro.io.Encoder;
import org.apache.avro.io.EncoderFactory;
import org.apache.avro.protobuf.noopt.TestProto3;
import org.apache.avro.specific.SpecificData;
import org.apache.commons.compress.utils.Lists;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -146,4 +147,17 @@ void getNonRepeatedSchemaWithLogicalType() throws Exception {
Schema s2 = instance2.getSchema(com.google.protobuf.Timestamp.class);
assertEquals(conversion.getRecommendedSchema(), s2);
}

@Test
void enumDefault() {
Schema fooSchema = ProtobufData.get().getSchema(Foo.class);
assertEquals("Z", fooSchema.getField("enum").schema().getEnumDefault());

Schema nSchema = ProtobufData.get().getSchema(N.class);
assertEquals("A", nSchema.getEnumDefault());

Schema proto3Schema = ProtobufData.get().getSchema(TestProto3.User.class);
assertEquals("STATUS_UNKNOWN", proto3Schema.getField("status").defaultVal());
assertEquals("STATUS_UNKNOWN", proto3Schema.getField("status").schema().getEnumDefault());
}
}
Loading