Skip to content

fix: don't compare strings with != in JSON codec #686

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
anthony-swirldslabs merged 1 commit into from
Nov 17, 2025
+38 −27
Merged

fix: don't compare strings with != in JSON codec #686

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
65 changes: 38 additions & 27 deletions ...main/java/com/hedera/pbj/compiler/impl/generators/json/JsonCodecWriteMethodGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ private static String generateFieldWriteLines(final Field field, final String mo
return prefix + "if (data." + field.nameCamelFirstLower() + "() != " + field.javaDefault()
+ " && !data." + field.nameCamelFirstLower() + "().isEmpty()) fieldLines.add(" + basicFieldCode
+ ");";
} else if (field.optionalValueType() && "StringValue".equals(field.messageType())) {
return prefix + "if (data." + field.nameCamelFirstLower() + "() != null) fieldLines.add("
+ basicFieldCode + ");";
} else if (field.type() == Field.FieldType.STRING) {
return prefix + "if (data." + field.nameCamelFirstLower() + "() != null"
+ " && !data." + field.nameCamelFirstLower() + "().isEmpty()) fieldLines.add(" + basicFieldCode
+ ");";
} else {
return prefix + "if (data." + field.nameCamelFirstLower() + "() != " + field.javaDefault()
+ ") fieldLines.add(" + basicFieldCode + ");";
Expand All @@ -121,23 +128,25 @@ private static String generateBasicFieldLines(
"DoubleValue",
"BytesValue" -> "field(%s, %s)".formatted(fieldName, getValueCode);
case "Int64Value", "UInt64Value" -> "field(%s, %s, true)".formatted(fieldName, getValueCode);
default -> throw new UnsupportedOperationException(
"Unhandled optional message type:" + field.messageType());
default ->
throw new UnsupportedOperationException("Unhandled optional message type:" + field.messageType());
};
} else if (field.repeated()) {
return switch (field.type()) {
case MESSAGE -> "arrayField(childIndent, $fieldName, $codec, $valueCode)"
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ ((SingleField) field).completeClassName() + ".JSON");
default -> "arrayField($fieldName, $fieldDef, $valueCode)"
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode);
case MESSAGE ->
"arrayField(childIndent, $fieldName, $codec, $valueCode)"
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ ((SingleField) field).completeClassName() + ".JSON");
default ->
"arrayField($fieldName, $fieldDef, $valueCode)"
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode);
};
} else if (field.type() == Field.FieldType.MAP) {
final MapField mapField = (MapField) field;
Expand All @@ -156,19 +165,21 @@ private static String generateBasicFieldLines(
.replace("$vComposer", "(n, v) -> " + vComposerMethod);
} else {
return switch (field.type()) {
case ENUM -> "field($fieldName, $valueCode.protoName())"
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode);
case MESSAGE -> "field($childIndent, $fieldName, $codec, $valueCode)"
.replace("$childIndent", childIndent)
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ ((SingleField) field).completeClassName() + ".JSON");
case ENUM ->
"field($fieldName, $valueCode.protoName())"
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode);
case MESSAGE ->
"field($childIndent, $fieldName, $codec, $valueCode)"
.replace("$childIndent", childIndent)
.replace("$fieldName", fieldName)
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ ((SingleField) field).completeClassName() + ".JSON");
default -> "field(%s, %s)".formatted(fieldName, getValueCode);
};
}
Expand Down
Loading