Skip to content

AVRO-4254: [Java] Avoid logging datum values in UnresolvedUnionException #3764

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
RyanSkraba merged 1 commit into from
May 7, 2026
+8 −3
Merged

AVRO-4254: [Java] Avoid logging datum values in UnresolvedUnionException #3764

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions lang/java/avro/src/main/java/org/apache/avro/UnresolvedUnionException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ public class UnresolvedUnionException extends AvroRuntimeException {
private Schema unionSchema;

public UnresolvedUnionException(Schema unionSchema, Object unresolvedDatum) {
super("Not in union " + unionSchema + ": " + unresolvedDatum);
super("Not in union " + unionSchema + ": " + datumTypeDescription(unresolvedDatum));
this.unionSchema = unionSchema;
this.unresolvedDatum = unresolvedDatum;
}

public UnresolvedUnionException(Schema unionSchema, Schema.Field field, Object unresolvedDatum) {
super("Not in union " + unionSchema + ": " + unresolvedDatum + " (field=" + field.name() + ")");
super(
"Not in union " + unionSchema + ": " + datumTypeDescription(unresolvedDatum) + " (field=" + field.name() + ")");
this.unionSchema = unionSchema;
this.unresolvedDatum = unresolvedDatum;
}
Expand All @@ -42,4 +43,8 @@ public Object getUnresolvedDatum() {
public Schema getUnionSchema() {
return unionSchema;
}

private static String datumTypeDescription(Object datum) {
return datum == null ? "null" : datum.getClass().getName();
}
}
2 changes: 1 addition & 1 deletion lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericDatumWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void unionUnresolvedExceptionExplicitWhichField() throws IOException {
new GenericDatumWriter<>(s).write(r, EncoderFactory.get().jsonEncoder(s, bao));
fail();
} catch (final UnresolvedUnionException uue) {
assertEquals("Not in union [\"null\",\"string\"]: 100 (field=f)", uue.getMessage());
assertEquals("Not in union [\"null\",\"string\"]: java.lang.Integer (field=f)", uue.getMessage());
}
}

Expand Down
Loading