issues/262 - Fixed issue with builder methods.

casper-network · Apr 24, 2024 · cce6c10 · cce6c10
1 parent 81d62cc
commit cce6c10
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 21 deletions.
diff --git a/...main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHash.java b/...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<NamedArg<?>> args) {
+        super(version, entryPoint, args);
+        this.hash = hash;
+    }
+
     /** Hex-encoded Hash */
     @JsonProperty("hash")
     private String hash;

diff --git a/...main/java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByName.java b/...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<NamedArg<?>> args) {
+        super(version, entryPoint, args);
+        this.name = name;
+    }
+
     /** {@link ExecutableDeployItem} order 4 */
     @Override
     public byte getOrder() {

diff --git a/.../java/com/casper/sdk/model/deploy/executabledeploy/StoredVersionedContractByHashTest.java b/.../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);