Skip to content

Minor improvement wrt #483: not a fix but better error message #513

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
merged 1 commit into from
Aug 22, 2024
Merged

Minor improvement wrt #483: not a fix but better error message #513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 25 additions & 24 deletions .../main/java/com/fasterxml/jackson/dataformat/protobuf/schemagen/ProtoBufSchemaVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,34 +80,35 @@ public Set<TypeElement> buildWithDependencies() {
/*********************************************************************
*/

@Override
public JsonObjectFormatVisitor expectObjectFormat(JavaType type) {
MessageElementVisitor visitor = new MessageElementVisitor(_provider, type, _definedTypeElementBuilders,
_isNested);
_builder = visitor;
_definedTypeElementBuilders.addTypeElement(type, visitor, _isNested);
return visitor;
}
@Override
public JsonObjectFormatVisitor expectObjectFormat(JavaType type) {
MessageElementVisitor visitor = new MessageElementVisitor(_provider, type, _definedTypeElementBuilders,
_isNested);
_builder = visitor;
_definedTypeElementBuilders.addTypeElement(type, visitor, _isNested);
return visitor;
}

@Override
public JsonMapFormatVisitor expectMapFormat(JavaType mapType) {
// 31-Mar-2017, tatu: I don't think protobuf v2 really supports map types natively,
// and we can't quite assume anything specific can we?
return _throwUnsupported("'Map' type not supported as type by protobuf module");
}
@Override
public JsonMapFormatVisitor expectMapFormat(JavaType mapType) {
// 31-Mar-2017, tatu: I don't think protobuf v2 really supports map types natively,
// and we can't quite assume anything specific can we?
return _throwUnsupported("'Map' type not supported as type by protobuf module");
}

@Override
public JsonArrayFormatVisitor expectArrayFormat(JavaType type) {
// 31-Mar-2017, tatu: This is bit messy, may get Base64 encoded or int array so
if (ProtobufSchemaHelper.isBinaryType(type)) {
_simpleType = ScalarType.BYTES;
return null;
}
@Override
public JsonArrayFormatVisitor expectArrayFormat(JavaType type) {
// 31-Mar-2017, tatu: This is bit messy, may get Base64 encoded or int array so
if (ProtobufSchemaHelper.isBinaryType(type)) {
_simpleType = ScalarType.BYTES;
return null;
}

// !!! TODO: surely we should support array types, right?
// !!! TODO: surely we should support array types, right?
// 21-Aug-2024, tatu: [dataformats-binary#483] caused by this

return _throwUnsupported("'Map' type not supported as type by protobuf module");
}
return _throwUnsupported("'Array' type not supported as type by protobuf module");
}

/*
/*********************************************************************
Expand Down