WIP better way to handle contract calls/results for evaluation

Author: oak

near-java-api-common/src/main/java/com/syntifi/near/api/common/model/common/Base64String.java

@@ -1,7 +1,11 @@
 package com.syntifi.near.api.common.model.common;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.NoArgsConstructor;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.ToString;
 
 import java.util.Arrays;
 import java.util.Base64;
@@ -13,24 +17,25 @@
  * @author Andre Bertolace
  * @since 0.2.0
  */
-@NoArgsConstructor
+@Getter
+@Builder(access = AccessLevel.PRIVATE)
+@ToString
 public class Base64String {
     @JsonValue
     private String encodedString;
 
-    public Base64String(String value) {
-        setEncodedString(value);
-    }
-
-    public String getDecodedString() {
-        return Arrays.toString(Base64.getDecoder().decode(this.encodedString));
-    }
+    @JsonIgnore
+    private String decodedString;
 
-    public String getEncodedString() {
-        return encodedString;
+    public static Base64String fromDecodedString(String value) {
+        return Base64String.builder()
+                .decodedString(value)
+                .encodedString(Base64.getEncoder().encodeToString(value.getBytes())).build();
     }
 
-    public void setEncodedString(String decodedString) {
-        this.encodedString = Base64.getEncoder().encodeToString(decodedString.getBytes());
+    public static Base64String fromEncodedString(String value) {
+        return Base64String.builder()
+                .decodedString(Arrays.toString(Base64.getDecoder().decode(value)))
+                .encodedString(value).build();
     }
 }

near-java-api-common/src/main/java/com/syntifi/near/api/common/model/common/ConvertibleFromJsonToObject.java

@@ -0,0 +1,15 @@
+package com.syntifi.near.api.common.model.common;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.syntifi.near.api.common.service.NearObjectMapper;
+
+import java.io.IOException;
+
+public interface ConvertibleFromJsonToObject {
+    @JsonIgnore
+    byte[] getJson();
+
+    default <T> T toResultObject(Class<T> clazz) throws IOException {
+        return NearObjectMapper.INSTANCE.readValue(getJson(), clazz);
+    }
+}

near-java-api-common/src/main/java/com/syntifi/near/api/common/service/NearObjectMapper.java

@@ -10,4 +10,5 @@
  * @since 0.0.1
  */
 public class NearObjectMapper extends ObjectMapper {
+    public static final ObjectMapper INSTANCE = new NearObjectMapper();
 }

near-java-api-helper/src/main/java/com/syntifi/near/api/helper/service/NearHelperService.java

@@ -1,6 +1,5 @@
 package com.syntifi.near.api.helper.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.syntifi.near.api.common.service.NearObjectMapper;
 import com.syntifi.near.api.helper.model.NearValue;
 import com.syntifi.near.api.helper.model.RecentActivity;
@@ -45,8 +44,6 @@ public interface NearHelperService {
      * @return the helper service instance
      */
     static NearHelperService usingPeer(String url) {
-        ObjectMapper mapper = new NearObjectMapper();
-
         Headers customHeaders = new Headers.Builder()
                 .add("Content-Type", "application/json")
                 .add("Cache-Control", "no-cache")
@@ -57,7 +54,7 @@ static NearHelperService usingPeer(String url) {
                         .addInterceptor(
                                 chain -> chain.proceed(chain.request().newBuilder().headers(customHeaders).build())).build())
                 .baseUrl("https://" + url)
-                .addConverterFactory(JacksonConverterFactory.create(mapper))
+                .addConverterFactory(JacksonConverterFactory.create(NearObjectMapper.INSTANCE))
                 .build();
 
         return retrofit.create(NearHelperService.class);

near-java-api-indexer/src/main/java/com/syntifi/near/api/indexer/service/NearIndexerService.java

@@ -1,6 +1,5 @@
 package com.syntifi.near.api.indexer.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.syntifi.near.api.common.service.NearObjectMapper;
 import com.syntifi.near.api.indexer.model.AccountIdList;
 import com.syntifi.near.api.indexer.model.StakingDeposit;
@@ -23,31 +22,6 @@
  */
 public interface NearIndexerService {
 
-    /**
-     * NearIndexerService builder
-     *
-     * @param url the indexer url to connect to
-     * @return the indexer service instance
-     */
-    static NearIndexerService usingPeer(String url) {
-        ObjectMapper mapper = new NearObjectMapper();
-
-        Headers customHeaders = new Headers.Builder()
-                .add("Content-Type", "application/json")
-                .add("Cache-Control", "no-cache")
-                .build();
-
-        Retrofit retrofit = new Retrofit.Builder()
-                .client(new OkHttpClient.Builder()
-                        .addInterceptor(
-                                chain -> chain.proceed(chain.request().newBuilder().headers(customHeaders).build())).build())
-                .baseUrl("https://" + url)
-                .addConverterFactory(JacksonConverterFactory.create(mapper))
-                .build();
-
-        return retrofit.create(NearIndexerService.class);
-    }
-
     /**
      * Fetches all likely NFTs given an accountId
      *
@@ -74,4 +48,27 @@ static NearIndexerService usingPeer(String url) {
      */
     @GET("staking-deposits/{accountId}")
     Call<List<StakingDeposit>> getStakingDeposits(@Path("accountId") String accountId);
+
+    /**
+     * NearIndexerService builder
+     *
+     * @param url the indexer url to connect to
+     * @return the indexer service instance
+     */
+    static NearIndexerService usingPeer(String url) {
+        Headers customHeaders = new Headers.Builder()
+                .add("Content-Type", "application/json")
+                .add("Cache-Control", "no-cache")
+                .build();
+
+        Retrofit retrofit = new Retrofit.Builder()
+                .client(new OkHttpClient.Builder()
+                        .addInterceptor(
+                                chain -> chain.proceed(chain.request().newBuilder().headers(customHeaders).build())).build())
+                .baseUrl("https://" + url)
+                .addConverterFactory(JacksonConverterFactory.create(NearObjectMapper.INSTANCE))
+                .build();
+
+        return retrofit.create(NearIndexerService.class);
+    }
 }

near-java-api-rpc/src/main/java/com/syntifi/near/api/rpc/model/contract/ContractFunctionCallResult.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.syntifi.near.api.common.model.common.ConvertibleFromJsonToObject;
 import com.syntifi.near.api.common.model.common.EncodedHash;
 import com.syntifi.near.api.rpc.json.serializer.ByteArraySerializer;
 import lombok.AllArgsConstructor;
@@ -27,7 +28,7 @@
 @AllArgsConstructor
 @Builder
 @ToString
-public class ContractFunctionCallResult {
+public class ContractFunctionCallResult implements ConvertibleFromJsonToObject {
     @JsonProperty("result")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonSerialize(using = ByteArraySerializer.class)
@@ -45,4 +46,9 @@ public class ContractFunctionCallResult {
     @JsonProperty("error")
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String error;
+
+    @Override
+    public byte[] getJson() {
+        return getResult();
+    }
 }

near-java-api-rpc/src/main/java/com/syntifi/near/api/rpc/model/contract/NFTMetadata.java

@@ -15,7 +15,9 @@
  * @since 0.0.1
  */
 public class NearRpcObjectMapper extends NearObjectMapper {
-    public NearRpcObjectMapper() {
+    public static final ObjectMapper INSTANCE = new NearObjectMapper();
+
+    private NearRpcObjectMapper() {
         super();
 
         coercionConfigFor(SuccessReceiptIdStatus.class)

near-java-api-rpc/src/main/java/com/syntifi/near/api/rpc/service/NearRpcObjectMapper.java

@@ -6,7 +6,6 @@
 import com.googlecode.jsonrpc4j.JsonRpcParam;
 import com.googlecode.jsonrpc4j.JsonRpcParamsPassMode;
 import com.googlecode.jsonrpc4j.ProxyUtil;
-import com.syntifi.near.api.common.service.NearObjectMapper;
 import com.syntifi.near.api.rpc.model.accesskey.AccessKey;
 import com.syntifi.near.api.rpc.model.accesskey.AccessKeyChanges;
 import com.syntifi.near.api.rpc.model.accesskey.AccessKeyList;
@@ -31,7 +30,6 @@
 import com.syntifi.near.api.rpc.model.transaction.Receipt;
 import com.syntifi.near.api.rpc.model.transaction.TransactionAwait;
 import com.syntifi.near.api.rpc.model.transaction.TransactionStatus;
-import com.syntifi.near.api.rpc.service.exception.NearServiceExceptionResolver;
 import com.syntifi.near.api.rpc.service.exception.NearServiceException;
 import com.syntifi.near.api.rpc.service.exception.NearServiceExceptionResolver;
 
@@ -839,11 +837,10 @@ ContractFunctionCallResult callContractFunction(@JsonRpcParam("block_id") long b
      * @throws MalformedURLException thrown when url is invalid or unparseable
      */
     static NearService usingPeer(String url) throws MalformedURLException {
-        NearObjectMapper objectMapper = new NearRpcObjectMapper();
         Map<String, String> customHeaders = new TreeMap<>();
         customHeaders.put("Content-Type", "application/json");
 
-        JsonRpcHttpClient client = new JsonRpcHttpClient(objectMapper, new URL("https://" + url),
+        JsonRpcHttpClient client = new JsonRpcHttpClient(NearRpcObjectMapper.INSTANCE, new URL("https://" + url),
                 customHeaders);
 
         client.setExceptionResolver(new NearServiceExceptionResolver());

near-java-api-rpc/src/main/java/com/syntifi/near/api/rpc/service/NearService.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,8 +15,7 @@
 @Getter
 @Setter
 @AllArgsConstructor
-@Builder
-public class AccountIdParam {
+public class AccountIdParam implements ConvertibleToBase64String {
     @JsonProperty("account_id")
     private String accountId;
 }