Skip to content

[Java] Fix NullPointerException in protobuf FieldBuilder for schemas without parameters #518

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

Open
jvdadda wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Java] Fix NullPointerException in protobuf FieldBuilder for schemas without parameters #518

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e41113e
Fix NullPointerException in FieldBuilder for schemas without parameters
jvdadda Mar 12, 2026
5f7ac70
Address review: use local variable for parameters, fix typeName for
jvdadda Mar 12, 2026
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
9 changes: 6 additions & 3 deletions ...azonaws/services/schemaregistry/kafkaconnect/protobuf/fromconnectschema/FieldBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ public static void build(
messageDescriptorProtoBuilder.addNestedType(buildMap(fieldSchema, mapEntryName,
fileDescriptorProtoBuilder, messageDescriptorProtoBuilder));
} else if (Schema.Type.STRUCT.equals(fieldSchema.type())) {
if (fieldSchema.parameters().containsKey(PROTOBUF_TYPE)
if (fieldSchema.parameters() != null
&& fieldSchema.parameters().containsKey(PROTOBUF_TYPE)
&& fieldSchema.parameters().get(PROTOBUF_TYPE).equals(PROTOBUF_ONEOF_TYPE)) {
Comment thread
jvdadda marked this conversation as resolved.
Outdated
buildOneof(fieldSchema, fieldName, tagNumber, fileDescriptorProtoBuilder,
messageDescriptorProtoBuilder, fieldBuilderMap);
Expand All @@ -99,11 +100,13 @@ public static void build(
// Convert the Struct type schema to a Protobuf message schema
DescriptorProtos.DescriptorProto.Builder nestedMessageDescriptorProtoBuilder =
DescriptorProtos.DescriptorProto.newBuilder();
nestedMessageDescriptorProtoBuilder.setName(getSchemaSimpleName(fieldSchema.name()));
String structName = fieldSchema.name() != null ? fieldSchema.name() : fieldName;
nestedMessageDescriptorProtoBuilder.setName(getSchemaSimpleName(structName));
build(fieldSchema, fileDescriptorProtoBuilder, nestedMessageDescriptorProtoBuilder);
Comment thread
jvdadda marked this conversation as resolved.
Outdated
// If schema is at parent level, Protobuf message is added as a message type
// If schema is not at parent level, Protobuf message is added as a nested type
if (isParentLevel(fileDescriptorProtoBuilder.getPackage(), fieldSchema.name())) {
if (fieldSchema.name() != null
&& isParentLevel(fileDescriptorProtoBuilder.getPackage(), fieldSchema.name())) {
fileDescriptorProtoBuilder.addMessageType(nestedMessageDescriptorProtoBuilder);
} else {
messageDescriptorProtoBuilder.addNestedType(nestedMessageDescriptorProtoBuilder);
Expand Down
Loading