issues/200 - Fixed stream matchers for inversion of unserializable to…

… serializable
casper-network · Feb 5, 2024 · 792c776 · 792c776
1 parent 3951735
commit 792c776
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 7 deletions.
diff --git a/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeList.java b/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeList.java
@@ -54,7 +54,7 @@ public void setListType(AbstractCLType listType) {
     @Override
     public boolean isDeserializable() {
 
-        return getChildTypes().stream().anyMatch(childType -> {
+        return getChildTypes().stream().allMatch(childType -> {
             if (childType instanceof CLTypeAny) {
                 return false;
             } else {

diff --git a/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeMap.java b/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeMap.java
@@ -36,7 +36,7 @@ public boolean isDeserializable() {
             // The map contains an 'Any' type therefore cannot be deserialized
             return false;
         } else if (getKeyValueTypes().valueType instanceof AbstractCLTypeWithChildren) {
-           return getChildTypes().stream().anyMatch(childType -> {
+           return getChildTypes().stream().allMatch(childType -> {
                 if (childType instanceof CLTypeAny) {
                     return false;
                 } else {

diff --git a/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeOption.java b/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeOption.java
@@ -55,6 +55,6 @@ public void setOptionType(AbstractCLType listType) {
 
     @Override
     public boolean isDeserializable() {
-        return getOptionType().isDeserializable() || getChildTypes().stream().anyMatch(AbstractCLType::isDeserializable);
+        return getOptionType().isDeserializable() || getChildTypes().stream().allMatch(AbstractCLType::isDeserializable);
     }
 }
diff --git a/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeTuple1.java b/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeTuple1.java
@@ -37,6 +37,6 @@ protected List<Object> getChildTypeObjects() {
 
     @Override
     public boolean isDeserializable() {
-        return getChildTypes().stream().anyMatch(AbstractCLType::isDeserializable);
+        return getChildTypes().stream().allMatch(AbstractCLType::isDeserializable);
     }
 }
diff --git a/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeTuple2.java b/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeTuple2.java
@@ -37,6 +37,6 @@ protected List<Object> getChildTypeObjects() {
 
     @Override
     public boolean isDeserializable() {
-        return getChildTypes().stream().anyMatch(AbstractCLType::isDeserializable);
+        return getChildTypes().stream().allMatch(AbstractCLType::isDeserializable);
     }
 }
diff --git a/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeTuple3.java b/src/main/java/com/casper/sdk/model/clvalue/cltype/CLTypeTuple3.java
@@ -37,6 +37,6 @@ protected List<Object> getChildTypeObjects() {
 
     @Override
     public boolean isDeserializable() {
-        return getChildTypes().stream().anyMatch(AbstractCLType::isDeserializable);
+        return getChildTypes().stream().allMatch(AbstractCLType::isDeserializable);
     }
 }
diff --git a/src/test/java/com/casper/sdk/model/clvalue/NestedAnyTest.java b/src/test/java/com/casper/sdk/model/clvalue/NestedAnyTest.java
@@ -74,7 +74,7 @@ void readStepEventWithMapContainingAnyValue() throws Exception {
     }
 
     @Test
-    public void nestedMapWithoutAny() throws Exception {
+    public void nestedEmptyMapiWithoutAny() throws Exception {
 
         final String json = " {\n" +
                 "  \"cl_type\": {\n" +
@@ -93,4 +93,37 @@ public void nestedMapWithoutAny() throws Exception {
         assertThat(clValueMap.getBytes(), is("00000000"));
     }
 
+    @Test
+    void nestedListWithAny() throws Exception {
+
+        final String json = " {\n" +
+                "  \"cl_type\": {\n" +
+                "    \"List\": \"Any\"\n" +
+                "  },\n" +
+                "  \"bytes\": \"00000000\",\n" +
+                "  \"parsed\": null\n" +
+                "}";
+
+        final CLValueList clValueList = (CLValueList) new ObjectMapper().readValue(json, AbstractCLValue.class);
+        assertThat(clValueList, is(notNullValue()));
+        assertThat(clValueList.getClType().isDeserializable(), is(false));
+        assertThat(clValueList.getBytes(), is("00000000"));
+    }
+
+    @Test
+    void nestedListWithoutAny() throws Exception {
+
+        final String json = " {\n" +
+                "  \"cl_type\": {\n" +
+                "    \"List\": \"U256\"\n" +
+                "  },\n" +
+                "  \"bytes\": \"00000000\",\n" +
+                "  \"parsed\": null\n" +
+                "}";
+
+        final CLValueList clValueList = (CLValueList) new ObjectMapper().readValue(json, AbstractCLValue.class);
+        assertThat(clValueList, is(notNullValue()));
+        assertThat(clValueList.getClType().isDeserializable(), is(true));
+        assertThat(clValueList.getBytes(), is("00000000"));
+    }
 }