From cce6c10ce63c6a3ccc5caec8cbba1da6fa0323d1 Mon Sep 17 00:00:00 2001 From: meywood <105049338+meywood@users.noreply.github.com> Date: Wed, 24 Apr 2024 13:04:26 +0100 Subject: [PATCH] issues/262 - Fixed issue with builder methods. --- .../StoredVersionedContractByHash.java | 11 +++++-- .../StoredVersionedContractByName.java | 11 ++++++- .../StoredVersionedContractByHashTest.java | 30 ++++++++----------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHash.java b/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHash.java index f196d2a4..365c7686 100644 --- a/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHash.java +++ b/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHash.java @@ -1,10 +1,13 @@ package com.casper.sdk.model.deploy.executabledeploy; +import com.casper.sdk.model.deploy.NamedArg; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import dev.oak3.sbs4j.SerializerBuffer; import lombok.*; +import java.util.List; + /** * Executable Deploy Item containing the StoredVersionedContractByHash. * @@ -15,12 +18,16 @@ */ @Getter @Setter -@Builder -@AllArgsConstructor @NoArgsConstructor @JsonTypeName("StoredVersionedContractByHash") public class StoredVersionedContractByHash extends AbstractStoredVersionedContract { + @Builder + public StoredVersionedContractByHash(final String hash, final Long version, final String entryPoint, final List> args) { + super(version, entryPoint, args); + this.hash = hash; + } + /** Hex-encoded Hash */ @JsonProperty("hash") private String hash; diff --git a/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByName.java b/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByName.java index 1ff1f21c..e2443498 100644 --- a/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByName.java +++ b/src/main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByName.java @@ -1,9 +1,12 @@ package com.casper.sdk.model.deploy.executabledeploy; +import com.casper.sdk.model.deploy.NamedArg; import com.fasterxml.jackson.annotation.JsonTypeName; import dev.oak3.sbs4j.SerializerBuffer; import lombok.*; +import java.util.List; + /** * Executable Deploy Item containing the StoredVersionedContractByName. * @@ -14,7 +17,7 @@ */ @Getter @Setter -@Builder +@Builder(access = AccessLevel.PROTECTED) @AllArgsConstructor @NoArgsConstructor @JsonTypeName("StoredVersionedContractByName") @@ -23,6 +26,12 @@ public class StoredVersionedContractByName extends AbstractStoredVersionedContra /** Contract Name */ private String name; + @Builder + public StoredVersionedContractByName(final String name, final Long version, final String entryPoint, final List> args) { + super(version, entryPoint, args); + this.name = name; + } + /** {@link ExecutableDeployItem} order 4 */ @Override public byte getOrder() { diff --git a/src/test/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHashTest.java b/src/test/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHashTest.java index 6d380ddb..b58f1de3 100644 --- a/src/test/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHashTest.java +++ b/src/test/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHashTest.java @@ -27,15 +27,12 @@ class StoredVersionedContractByHashTest { @Test void jsonSerializeStoredVersionedContractByHash() throws ValueSerializationException, JsonProcessingException { - final StoredVersionedContractByHash versionedContractByHash = new StoredVersionedContractByHash(); - - versionedContractByHash.setHash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5"); - versionedContractByHash.setEntryPoint("counter_inc"); - versionedContractByHash.setVersion(1L); - versionedContractByHash.setArgs(Arrays.asList( - new NamedArg<>("one", new CLValueI32(1)), - new NamedArg<>("two", new CLValueI32(2)) - )); + final StoredVersionedContractByHash versionedContractByHash = StoredVersionedContractByHash.builder() + .hash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5") + .version(1L) + .entryPoint("counter_inc") + .args(Arrays.asList(new NamedArg<>("one", new CLValueI32(1)), new NamedArg<>("two", new CLValueI32(2)))) + .build(); final String json = new ObjectMapper().writeValueAsString(versionedContractByHash); @@ -53,15 +50,12 @@ void jsonSerializeStoredVersionedContractByHash() throws ValueSerializationExcep @Test void serializeStoredVersionedContractByHashTest() throws Exception { - final StoredVersionedContractByHash versionedContractByHash = new StoredVersionedContractByHash(); - - versionedContractByHash.setHash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5"); - versionedContractByHash.setVersion(1L); - versionedContractByHash.setEntryPoint("transfer"); - versionedContractByHash.setArgs(Arrays.asList( - new NamedArg<>("one", new CLValueI32(1)), - new NamedArg<>("two", new CLValueI32(2)) - )); + final StoredVersionedContractByHash versionedContractByHash = StoredVersionedContractByHash.builder() + .hash("92173d49744c790d47e50d011d89e1b5a33ed2d9fae8d9459325224d8f98f3e5") + .version(1L) + .entryPoint("transfer") + .args(Arrays.asList(new NamedArg<>("one", new CLValueI32(1)), new NamedArg<>("two", new CLValueI32(2)))) + .build(); final SerializerBuffer serializerBuffer = new SerializerBuffer(); versionedContractByHash.serialize(serializerBuffer, Target.BYTE);