Skip to content

feat: Indent fixes #916

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
ldintr wants to merge 1 commit into from
Open

feat: Indent fixes #916

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
14 changes: 7 additions & 7 deletions pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/impl/Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ public static String getFieldsHashCode(
} else if (f.type() == Field.FieldType.BOOL) {
generatedCodeSoFar += ("""
if ($prefixFieldName$fieldName != $modelClassName.DEFAULT.$thatFieldName$suffix) {
result = 31 * result + Boolean.hashCode($prefixFieldName$fieldName);
result = 31 * result + Boolean.hashCode($prefixFieldName$fieldName);
}
""")
.replace("$modelClassName", modelClassName)
Expand All @@ -275,7 +275,7 @@ public static String getFieldsHashCode(
} else if (f.type() == Field.FieldType.FLOAT) {
generatedCodeSoFar += ("""
if ($prefixFieldName$fieldName != $modelClassName.DEFAULT.$thatFieldName$suffix) {
result = 31 * result + Float.hashCode($prefixFieldName$fieldName);
result = 31 * result + Float.hashCode($prefixFieldName$fieldName);
}
""")
.replace("$modelClassName", modelClassName)
Expand All @@ -286,7 +286,7 @@ public static String getFieldsHashCode(
} else if (f.type() == Field.FieldType.DOUBLE) {
generatedCodeSoFar += ("""
if ($prefixFieldName$fieldName != $modelClassName.DEFAULT.$thatFieldName$suffix) {
result = 31 * result + Double.hashCode($prefixFieldName$fieldName);
result = 31 * result + Double.hashCode($prefixFieldName$fieldName);
}
""")
.replace("$modelClassName", modelClassName)
Expand All @@ -297,7 +297,7 @@ public static String getFieldsHashCode(
} else if (f.type() == Field.FieldType.BYTES) {
generatedCodeSoFar += ("""
if ($prefixFieldName$fieldName != null && !$prefixFieldName$fieldName.equals($modelClassName.DEFAULT.$thatFieldName$suffix)) {
result = 31 * result + $prefixFieldName$fieldName.hashCode();
result = 31 * result + $prefixFieldName$fieldName.hashCode();
}
""")
.replace("$modelClassName", modelClassName)
Expand All @@ -308,7 +308,7 @@ public static String getFieldsHashCode(
} else if (f.type() == Field.FieldType.ENUM) {
generatedCodeSoFar += ("""
if ($prefixFieldName$fieldName != null && !$prefixFieldName$fieldName.equals($modelClassName.DEFAULT.$thatFieldName$suffix)) {
result = 31 * result + Integer.hashCode(EnumWithProtoMetadata.protoOrdinal($prefixFieldName$fieldName));
result = 31 * result + Integer.hashCode(EnumWithProtoMetadata.protoOrdinal($prefixFieldName$fieldName));
}
""")
.replace("$modelClassName", modelClassName)
Expand All @@ -321,7 +321,7 @@ public static String getFieldsHashCode(
} else if (f.type() == Field.FieldType.STRING || f.parent() == null) { // process sub message
generatedCodeSoFar += ("""
if ($prefixFieldName$fieldName != null && !$prefixFieldName$fieldName.equals($modelClassName.DEFAULT.$thatFieldName$suffix)) {
result = 31 * result + $prefixFieldName$fieldName.hashCode();
result = 31 * result + $prefixFieldName$fieldName.hashCode();
}
""")
.replace("$modelClassName", modelClassName)
Expand Down Expand Up @@ -451,7 +451,7 @@ private static String getRepeatedHashCodeGeneration(String generatedCodeSoFar, F
} else {
result = 31 * result;
}
}
}
}
""")
.replace("$prefixFieldName", fieldNamePrefix)
Expand Down
20 changes: 10 additions & 10 deletions ...re/pbj-compiler/src/main/java/com/hedera/pbj/compiler/impl/generators/ModelGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public final class ModelGenerator implements Generator {
hashCode += hashCode << 10;
hashCode ^= hashCode >>> 24;
hashCode += hashCode << 30;
""".indent(DEFAULT_INDENT * 2);
""";

/**
* {@inheritDoc}
Expand Down Expand Up @@ -570,7 +570,7 @@ public int compareTo($javaRecordName thatObj) {
// This doesn't have unknown fields, but that one has some. So they are greater:
return -1;
}
""".indent(DEFAULT_INDENT);
""".indent(DEFAULT_INDENT * 2);

bodyContent +=
"""
Expand Down Expand Up @@ -608,7 +608,7 @@ public boolean equals(Object that) {

bodyContent +=
"""
$equalsBody
$equalsBody
}"""
.replace("$equalsBody", generateEqualsBody(fields, javaRecordName, ""))
.indent(DEFAULT_INDENT);
Expand All @@ -624,7 +624,7 @@ public static String generateEqualsBody(
// and calculates the hashcode.
equalsStatements = Common.getFieldsEqualsStatements(fields, equalsStatements, prefixFieldName);
// spotless:off
String bodyContent = equalsStatements.indent(DEFAULT_INDENT);
String bodyContent = equalsStatements;
bodyContent +=
"""
// Treat null and empty lists as equal
Expand All @@ -644,8 +644,7 @@ public static String generateEqualsBody(
}
return true;
"""
.replace("$thatUnknownFields", thatUnknownFields)
.indent(DEFAULT_INDENT);
.replace("$thatUnknownFields", thatUnknownFields);
// spotless:on
return bodyContent;
}
Expand Down Expand Up @@ -682,9 +681,10 @@ public int hashCode() {
}
return $hashCode;
}
""".replace("$hashCodeManipulation", HASH_CODE_MANIPULATION)
.replace("$hashCodeBody", generateHashCodeBody(modelClassName, fields, "").indent(DEFAULT_INDENT))
.indent(DEFAULT_INDENT);
"""
.replace("$hashCodeManipulation", HASH_CODE_MANIPULATION)
.replace("$hashCodeBody", generateHashCodeBody(modelClassName, fields, "").indent(DEFAULT_INDENT))
.indent(DEFAULT_INDENT);
// spotless:on
return bodyContent;
}
Expand Down Expand Up @@ -894,7 +894,7 @@ private static String generateConstructorCodeForField(final Field f) {
}
}
// spotless:on
return sb.toString().indent(DEFAULT_INDENT);
return sb.toString();
}

/**
Expand Down
27 changes: 17 additions & 10 deletions ...main/java/com/hedera/pbj/compiler/impl/generators/json/JsonCodecParseMethodGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ static String generateParseObjectMethod(final String modelClassName, final List<
}
try {
// -- TEMP STATE FIELDS --------------------------------------
$fieldDefs
$fieldDefs

// -- EXTRACT VALUES FROM PARSE TREE ---------------------------------------------

for (JSONParser.PairContext kvPair : root.pair()) {
switch (toJsonFieldName(kvPair.STRING().getText())) {
$caseStatements
$caseStatements
default: {
if (strictMode) {
// Since we are parsing is strict mode, this is an exceptional condition.
Expand All @@ -102,13 +102,19 @@ static String generateParseObjectMethod(final String modelClassName, final List<
.replace(
"$fieldDefs",
fields.stream()
.map(field -> " %s temp_%s = %s;"
.map(field -> "%s temp_%s = %s;"
.formatted(field.javaFieldType(), field.name(), field.javaDefault()))
.collect(Collectors.joining("\n")))
.collect(Collectors.joining("\n"))
.indent(DEFAULT_INDENT * 2)
.stripTrailing())
.replace(
"$fieldsList",
fields.stream().map(field -> "temp_" + field.name()).collect(Collectors.joining(", ")))
.replace("$caseStatements", generateCaseStatements(fields))
.replace(
"$caseStatements",
generateCaseStatements(fields)
.indent(DEFAULT_INDENT * 4)
.stripTrailing())
.indent(DEFAULT_INDENT);
}

Expand All @@ -126,11 +132,12 @@ private static String generateCaseStatements(final List<Field> fields) {
for (final Field subField : oneOfField.fields()) {
sb.append("case \"" + toJsonFieldName(subField.name()) + "\" /* [" + subField.fieldNumber()
+ "] */ " + ": temp_"
+ oneOfField.name() + " = new %s<>(\n".formatted(oneOfField.className())
+ oneOfField.getEnumClassRef().indent(DEFAULT_INDENT)
+ "." + Common.camelToUpperSnake(subField.name()) + ", \n".indent(DEFAULT_INDENT));
generateFieldCaseStatement(sb, subField, "kvPair.value()");
sb.append("); break;\n");
+ oneOfField.name() + " = new %s<>(\n".formatted(oneOfField.className()));
final StringBuilder valueSb = new StringBuilder();
generateFieldCaseStatement(valueSb, subField, "kvPair.value()");
sb.append((oneOfField.getEnumClassRef() + "." + Common.camelToUpperSnake(subField.name()) + ",\n"
+ valueSb + "); break;\n")
.indent(DEFAULT_INDENT));
}
} else {
sb.append("case \"" + toJsonFieldName(field.name()) + "\" /* [" + field.fieldNumber() + "] */ "
Expand Down
6 changes: 3 additions & 3 deletions ...mpiler/src/main/java/com/hedera/pbj/compiler/impl/generators/protobuf/CodecGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ public void generate(
/**
* Empty constructor
*/
public $codecClass() {
// no-op
}
public $codecClass() {
// no-op
}

$unsetOneOfConstants
$parseMethod
Expand Down
60 changes: 32 additions & 28 deletions ...a/com/hedera/pbj/compiler/impl/generators/protobuf/CodecMeasureRecordMethodGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,27 +87,29 @@ private static String generateFieldSizeOfLines(
+ switch (field.messageType()) {
case "StringValue" -> "size += sizeOfOptionalString(%s, %s);".formatted(fieldDef, getValueCode);
case "BoolValue" -> "size += sizeOfOptionalBoolean(%s, %s);".formatted(fieldDef, getValueCode);
case "Int32Value", "UInt32Value" -> "size += sizeOfOptionalInteger(%s, %s);"
.formatted(fieldDef, getValueCode);
case "Int64Value", "UInt64Value" -> "size += sizeOfOptionalLong(%s, %s);"
.formatted(fieldDef, getValueCode);
case "Int32Value", "UInt32Value" ->
"size += sizeOfOptionalInteger(%s, %s);".formatted(fieldDef, getValueCode);
case "Int64Value", "UInt64Value" ->
"size += sizeOfOptionalLong(%s, %s);".formatted(fieldDef, getValueCode);
case "FloatValue" -> "size += sizeOfOptionalFloat(%s, %s);".formatted(fieldDef, getValueCode);
case "DoubleValue" -> "size += sizeOfOptionalDouble(%s, %s);".formatted(fieldDef, getValueCode);
case "BytesValue" -> "size += sizeOfOptionalBytes(%s, %s);".formatted(fieldDef, 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 prefix
+ switch (field.type()) {
case ENUM -> "size += sizeOfEnumList(%s, %s);".formatted(fieldDef, getValueCode);
case MESSAGE -> "size += sizeOfMessageList($fieldDef, $valueCode, $codec);"
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ Common.capitalizeFirstLetter(field.messageType()) + ".PROTOBUF");
case MESSAGE ->
"size += sizeOfMessageList($fieldDef, $valueCode, $codec);"
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ Common.capitalizeFirstLetter(field.messageType()) + ".PROTOBUF");
default -> "size += sizeOf%sList(%s, %s);".formatted(writeMethodName, fieldDef, getValueCode);
};
} else if (field.type() == Field.FieldType.MAP) {
Expand All @@ -127,7 +129,7 @@ private static String generateFieldSizeOfLines(
final int sizePre = size;
$K k = pbjMap.getSortedKeys().get(i);
$V v = pbjMap.get(k);
$fieldSizeOfLines
$fieldSizeOfLines
size += sizeOfVarInt32(size - sizePre);
}
}
Expand All @@ -137,24 +139,25 @@ private static String generateFieldSizeOfLines(
.replace("$javaFieldType", mapField.javaFieldType())
.replace("$K", mapField.keyField().type().boxedType)
.replace("$V", mapField.valueField().type() == Field.FieldType.MESSAGE ? mapField.valueField().messageType() : mapField.valueField().type().boxedType)
.replace("$fieldSizeOfLines", fieldSizeOfLines.indent(DEFAULT_INDENT))
.replace("$fieldSizeOfLines", fieldSizeOfLines.indent(DEFAULT_INDENT * 2))
;
// spotless:on
} else {
return prefix
+ switch (field.type()) {
case ENUM -> "size += sizeOfEnum(%s, %s);".formatted(fieldDef, getValueCode);
case STRING -> "size += sizeOfString(%s, %s, %s);"
.formatted(fieldDef, getValueCode, skipDefault);
case MESSAGE -> "size += sizeOfMessage($fieldDef, $valueCode, $codec);"
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ Common.capitalizeFirstLetter(field.messageType()) + ".PROTOBUF");
case BOOL -> "size += sizeOfBoolean(%s, %s, %s);"
.formatted(fieldDef, getValueCode, skipDefault);
case STRING ->
"size += sizeOfString(%s, %s, %s);".formatted(fieldDef, getValueCode, skipDefault);
case MESSAGE ->
"size += sizeOfMessage($fieldDef, $valueCode, $codec);"
.replace("$fieldDef", fieldDef)
.replace("$valueCode", getValueCode)
.replace(
"$codec",
((SingleField) field).messageTypeModelPackage() + "."
+ Common.capitalizeFirstLetter(field.messageType()) + ".PROTOBUF");
case BOOL ->
"size += sizeOfBoolean(%s, %s, %s);".formatted(fieldDef, getValueCode, skipDefault);
case INT32,
UINT32,
SINT32,
Expand All @@ -165,8 +168,9 @@ private static String generateFieldSizeOfLines(
UINT64,
FIXED64,
SFIXED64,
BYTES -> "size += sizeOf%s(%s, %s, %s);"
.formatted(writeMethodName, fieldDef, getValueCode, skipDefault);
BYTES ->
"size += sizeOf%s(%s, %s, %s);"
.formatted(writeMethodName, fieldDef, getValueCode, skipDefault);
default -> "size += sizeOf%s(%s, %s);".formatted(writeMethodName, fieldDef, getValueCode);
};
}
Expand Down
Loading
Loading