Skip to content

Commit cce6c10

Browse files
committed
issues/262 - Fixed issue with builder methods.
1 parent 81d62cc commit cce6c10

3 files changed

Lines changed: 31 additions & 21 deletions

File tree

src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHash.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.casper.sdk.model.deploy.executabledeploy;
22

3+
import com.casper.sdk.model.deploy.NamedArg;
34
import com.fasterxml.jackson.annotation.JsonProperty;
45
import com.fasterxml.jackson.annotation.JsonTypeName;
56
import dev.oak3.sbs4j.SerializerBuffer;
67
import lombok.*;
78

9+
import java.util.List;
10+
811
/**
912
* Executable Deploy Item containing the StoredVersionedContractByHash.
1013
*
@@ -15,12 +18,16 @@
1518
*/
1619
@Getter
1720
@Setter
18-
@Builder
19-
@AllArgsConstructor
2021
@NoArgsConstructor
2122
@JsonTypeName("StoredVersionedContractByHash")
2223
public class StoredVersionedContractByHash extends AbstractStoredVersionedContract {
2324

25+
@Builder
26+
public StoredVersionedContractByHash(final String hash, final Long version, final String entryPoint, final List<NamedArg<?>> args) {
27+
super(version, entryPoint, args);
28+
this.hash = hash;
29+
}
30+
2431
/** Hex-encoded Hash */
2532
@JsonProperty("hash")
2633
private String hash;

src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByName.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.casper.sdk.model.deploy.executabledeploy;
22

3+
import com.casper.sdk.model.deploy.NamedArg;
34
import com.fasterxml.jackson.annotation.JsonTypeName;
45
import dev.oak3.sbs4j.SerializerBuffer;
56
import lombok.*;
67

8+
import java.util.List;
9+
710
/**
811
* Executable Deploy Item containing the StoredVersionedContractByName.
912
*
@@ -14,7 +17,7 @@
1417
*/
1518
@Getter
1619
@Setter
17-
@Builder
20+
@Builder(access = AccessLevel.PROTECTED)
1821
@AllArgsConstructor
1922
@NoArgsConstructor
2023
@JsonTypeName("StoredVersionedContractByName")
@@ -23,6 +26,12 @@ public class StoredVersionedContractByName extends AbstractStoredVersionedContra
2326
/** Contract Name */
2427
private String name;
2528

29+
@Builder
30+
public StoredVersionedContractByName(final String name, final Long version, final String entryPoint, final List<NamedArg<?>> args) {
31+
super(version, entryPoint, args);
32+
this.name = name;
33+
}
34+
2635
/** {@link ExecutableDeployItem} order 4 */
2736
@Override
2837
public byte getOrder() {

src/test/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHashTest.java

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,12 @@ class StoredVersionedContractByHashTest {
2727
@Test
2828
void jsonSerializeStoredVersionedContractByHash() throws ValueSerializationException, JsonProcessingException {
2929

30-
final StoredVersionedContractByHash versionedContractByHash = new StoredVersionedContractByHash();
31-
32-
versionedContractByHash.setHash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5");
33-
versionedContractByHash.setEntryPoint("counter_inc");
34-
versionedContractByHash.setVersion(1L);
35-
versionedContractByHash.setArgs(Arrays.asList(
36-
new NamedArg<>("one", new CLValueI32(1)),
37-
new NamedArg<>("two", new CLValueI32(2))
38-
));
30+
final StoredVersionedContractByHash versionedContractByHash = StoredVersionedContractByHash.builder()
31+
.hash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5")
32+
.version(1L)
33+
.entryPoint("counter_inc")
34+
.args(Arrays.asList(new NamedArg<>("one", new CLValueI32(1)), new NamedArg<>("two", new CLValueI32(2))))
35+
.build();
3936

4037
final String json = new ObjectMapper().writeValueAsString(versionedContractByHash);
4138

@@ -53,15 +50,12 @@ void jsonSerializeStoredVersionedContractByHash() throws ValueSerializationExcep
5350
@Test
5451
void serializeStoredVersionedContractByHashTest() throws Exception {
5552

56-
final StoredVersionedContractByHash versionedContractByHash = new StoredVersionedContractByHash();
57-
58-
versionedContractByHash.setHash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5");
59-
versionedContractByHash.setVersion(1L);
60-
versionedContractByHash.setEntryPoint("transfer");
61-
versionedContractByHash.setArgs(Arrays.asList(
62-
new NamedArg<>("one", new CLValueI32(1)),
63-
new NamedArg<>("two", new CLValueI32(2))
64-
));
53+
final StoredVersionedContractByHash versionedContractByHash = StoredVersionedContractByHash.builder()
54+
.hash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5")
55+
.version(1L)
56+
.entryPoint("transfer")
57+
.args(Arrays.asList(new NamedArg<>("one", new CLValueI32(1)), new NamedArg<>("two", new CLValueI32(2))))
58+
.build();
6559

6660
final SerializerBuffer serializerBuffer = new SerializerBuffer();
6761
versionedContractByHash.serialize(serializerBuffer, Target.BYTE);

0 commit comments

Comments
 (0)