Skip to content

Commit 99dd27e

Browse files
committed
[C++] Improve naming conventions in DTOs.
Changes: - `encode` -> `encodeWith` - `decode` -> `decodeWith`
1 parent 586fcf7 commit 99dd27e

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/CppDtoGenerator.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ private void generateCompositeDecodeFrom(
274274
final String indent)
275275
{
276276
final StringBuilder decodeBuilder = classBuilder.appendPublic().append("\n")
277-
.append(indent).append("static void decode(").append(codecClassName).append("& codec, ")
277+
.append(indent).append("static void decodeWith(").append(codecClassName).append("& codec, ")
278278
.append(dtoClassName).append("& dto)\n")
279279
.append(indent).append("{\n");
280280

@@ -299,7 +299,7 @@ private void generateCompositeEncodeInto(
299299
final String indent)
300300
{
301301
final StringBuilder encodeBuilder = classBuilder.appendPublic().append("\n")
302-
.append(indent).append("static void encode(").append(codecClassName).append("& codec,")
302+
.append(indent).append("static void encodeWith(").append(codecClassName).append("& codec,")
303303
.append("const ").append(dtoClassName).append("& dto)\n")
304304
.append(indent).append("{\n");
305305

@@ -322,7 +322,7 @@ private void generateDecodeListFrom(
322322
final String indent)
323323
{
324324
classBuilder.appendPublic().append("\n")
325-
.append(indent).append("static std::vector<").append(dtoClassName).append("> decodeMany(")
325+
.append(indent).append("static std::vector<").append(dtoClassName).append("> decodeManyWith(")
326326
.append(codecClassName).append("& codec)\n")
327327
.append(indent).append("{\n")
328328
.append(indent).append(INDENT).append("std::vector<").append(dtoClassName)
@@ -334,7 +334,7 @@ private void generateDecodeListFrom(
334334
.append(indent).append(INDENT).append(INDENT)
335335
.append(dtoClassName).append(" dto;\n")
336336
.append(indent).append(INDENT).append(INDENT)
337-
.append(dtoClassName).append("::decode(codec.next(), dto);\n")
337+
.append(dtoClassName).append("::decodeWith(codec.next(), dto);\n")
338338
.append(indent).append(INDENT).append(INDENT)
339339
.append("dtos[i] = dto;\n")
340340
.append(indent).append(INDENT)
@@ -354,7 +354,7 @@ private void generateMessageDecodeFrom(
354354
final String indent)
355355
{
356356
final StringBuilder decodeBuilder = classBuilder.appendPublic().append("\n")
357-
.append(indent).append("static void decode(").append(codecClassName).append("& codec, ")
357+
.append(indent).append("static void decodeWith(").append(codecClassName).append("& codec, ")
358358
.append(dtoClassName).append("& dto)\n")
359359
.append(indent).append("{\n");
360360

@@ -526,7 +526,7 @@ private void generateBitSetDecodeFrom(
526526
sb.append(")\n")
527527
.append(indent).append("{\n");
528528

529-
sb.append(indent).append(INDENT).append(dtoTypeName).append("::decode(codec.")
529+
sb.append(indent).append(INDENT).append(dtoTypeName).append("::decodeWith(codec.")
530530
.append(formattedPropertyName).append("(), ")
531531
.append("dto.").append(formattedPropertyName).append("());\n");
532532

@@ -538,7 +538,7 @@ private void generateBitSetDecodeFrom(
538538
}
539539
else
540540
{
541-
sb.append(indent).append(dtoTypeName).append("::decode(codec.")
541+
sb.append(indent).append(dtoTypeName).append("::decodeWith(codec.")
542542
.append(formattedPropertyName).append("(), ")
543543
.append("dto.").append(formattedPropertyName).append("());\n");
544544
}
@@ -571,7 +571,7 @@ private void generateCompositePropertyDecodeFrom(
571571
final String formattedPropertyName = formatPropertyName(propertyName);
572572
final String dtoClassName = formatDtoClassName(typeToken.applicableTypeName());
573573

574-
sb.append(indent).append(dtoClassName).append("::decode(codec.")
574+
sb.append(indent).append(dtoClassName).append("::decodeWith(codec.")
575575
.append(formattedPropertyName).append("(), ")
576576
.append("dto.").append(formattedPropertyName).append("());\n");
577577
}
@@ -593,7 +593,7 @@ private void generateGroupsDecodeFrom(
593593
final String groupDtoClassName = formatDtoClassName(groupName);
594594

595595
sb.append(indent).append("dto.").append(formattedPropertyName).append("(")
596-
.append(groupDtoClassName).append("::decodeMany(codec.")
596+
.append(groupDtoClassName).append("::decodeManyWith(codec.")
597597
.append(formattedPropertyName).append("()));\n");
598598

599599
i++;
@@ -729,7 +729,7 @@ private void generateMessageEncodeInto(
729729
final String indent)
730730
{
731731
final StringBuilder encodeBuilder = classBuilder.appendPublic().append("\n")
732-
.append(indent).append("static void encode(").append(codecClassName).append("& codec, const ")
732+
.append(indent).append("static void encodeWith(").append(codecClassName).append("& codec, const ")
733733
.append(dtoClassName).append("& dto)\n")
734734
.append(indent).append("{\n");
735735

@@ -914,7 +914,7 @@ private void generateComplexPropertyEncodeInto(
914914
final String formattedPropertyName = formatPropertyName(propertyName);
915915
final String typeName = formatDtoClassName(typeToken.applicableTypeName());
916916

917-
sb.append(indent).append(typeName).append("::encode(codec.")
917+
sb.append(indent).append(typeName).append("::encodeWith(codec.")
918918
.append(formattedPropertyName).append("(), dto.")
919919
.append(formattedPropertyName).append("());\n");
920920
}
@@ -944,7 +944,7 @@ private void generateGroupsEncodeInto(
944944
.append("Count(").append(formattedPropertyName).append(".size());\n\n")
945945
.append(indent).append("for (const auto& group: ").append(formattedPropertyName).append(")\n")
946946
.append(indent).append("{\n")
947-
.append(indent).append(INDENT).append(groupDtoTypeName).append("::encode(").append(groupCodecVarName)
947+
.append(indent).append(INDENT).append(groupDtoTypeName).append("::encodeWith(").append(groupCodecVarName)
948948
.append(".next(), group);\n")
949949
.append(indent).append("}\n\n");
950950

@@ -1024,7 +1024,7 @@ private void generateDisplay(
10241024

10251025
toStringBuilder.append(", ").append("length);\n");
10261026

1027-
toStringBuilder.append(indent).append(INDENT).append("encode(codec, *this);\n")
1027+
toStringBuilder.append(indent).append(INDENT).append("encodeWith(codec, *this);\n")
10281028
.append(indent).append(INDENT).append("std::ostringstream oss;\n")
10291029
.append(indent).append(INDENT).append("oss << codec;\n")
10301030
.append(indent).append(INDENT).append("return oss.str();\n")
@@ -1591,7 +1591,7 @@ private void generateChoiceSetEncodeInto(
15911591
{
15921592
final StringBuilder encodeBuilder = classBuilder.appendPublic()
15931593
.append("\n")
1594-
.append(indent).append("static void encode(\n")
1594+
.append(indent).append("static void encodeWith(\n")
15951595
.append(indent).append(INDENT).append(codecClassName).append("& codec, ")
15961596
.append("const ").append(dtoClassName).append("& dto)\n")
15971597
.append(indent).append("{\n");
@@ -1620,7 +1620,7 @@ private void generateChoiceSetDecodeFrom(
16201620
{
16211621
final StringBuilder decodeBuilder = classBuilder.appendPublic()
16221622
.append("\n")
1623-
.append(indent).append("static void decode(\n")
1623+
.append(indent).append("static void decodeWith(\n")
16241624
.append(indent).append(INDENT).append("const ").append(codecClassName).append("& codec, ")
16251625
.append(dtoClassName).append("& dto)\n")
16261626
.append(indent).append("{\n");

0 commit comments

Comments
 (0)