Skip to content

Commit 5a5f0f7

Browse files
committed
Fixes
Signed-off-by: Ivan Malygin <ivan@swirldslabs.com>
1 parent 5b3b661 commit 5a5f0f7

File tree

6 files changed

+26
-3
lines changed

6 files changed

+26
-3
lines changed

pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/impl/generators/TestGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ public void testTestEqualsAndHashCode() throws Exception {
410410
@Test
411411
public void testCodecGetDefaultValueMethod(){
412412
final var codec = $modelClassName.PROTOBUF;
413-
final var codecDefaultValue = codec.getDefaultValue();
414-
assertEquals($modelClassName.DEFAULT, codecDefaultValue);
413+
final var codecDefaultInstance = codec.getDefaultInstance();
414+
assertEquals($modelClassName.DEFAULT, codecDefaultInstance);
415415
}
416416
"""
417417
.replace("$modelClassName",modelClassName)

pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/impl/generators/protobuf/CodecDefaultInstanceMethodGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ static String generateGetDefaultInstanceMethod(String modelClassName) {
1515
*
1616
* @return The default value for the model class
1717
*/
18+
@Override
1819
public $modelClass getDefaultInstance() {
19-
return $modelClass.getDefaultInstance();
20+
return $modelClass.DEFAULT;
2021
}
2122
"""
2223
.replace("$modelClass", modelClassName)

pbj-core/pbj-runtime/src/main/java/com/hedera/pbj/runtime/Codec.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,11 @@ default Bytes toBytes(@NonNull T item) {
182182
}
183183
return Bytes.wrap(bytes);
184184
}
185+
186+
/**
187+
* Get the default value for the model class.
188+
*
189+
* @return The default value for the model class
190+
*/
191+
T getDefaultInstance();
185192
}

pbj-core/pbj-runtime/src/main/java/com/hedera/pbj/runtime/JsonCodec.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,9 @@ default int measureRecord(T item) {
125125
default boolean fastEquals(@NonNull T item, @NonNull ReadableSequentialData input) throws ParseException {
126126
return Objects.equals(item, parse(input));
127127
}
128+
129+
@Override
130+
default T getDefaultInstance() {
131+
return null;
132+
}
128133
}

pbj-core/pbj-runtime/src/test/java/com/hedera/pbj/runtime/CodecWrapper.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ public int measureRecord(T item) {
4747
public boolean fastEquals(@NonNull T item, @NonNull ReadableSequentialData input) throws ParseException {
4848
throw new UnsupportedOperationException();
4949
}
50+
51+
@Override
52+
public T getDefaultInstance() {
53+
throw new UnsupportedOperationException();
54+
}
5055
}

pbj-core/pbj-runtime/src/test/java/com/hedera/pbj/runtime/ProtoParserToolsTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,5 +531,10 @@ public boolean fastEquals(@NonNull TestMessage item, @NonNull ReadableSequential
531531
throws ParseException {
532532
throw new UnsupportedOperationException();
533533
}
534+
535+
@Override
536+
public TestMessage getDefaultInstance() {
537+
throw new UnsupportedOperationException();
538+
}
534539
}
535540
}

0 commit comments

Comments
 (0)