replace JSONRPC2SessionException (#60)

starcoinorg · Dec 25, 2023 · 9e2763d · 9e2763d
1 parent 850d5e2
commit 9e2763d
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 19 deletions.
diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/ElasticSearchHandler.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/ElasticSearchHandler.java
@@ -1,10 +1,10 @@
 package org.starcoin.indexer.handler;
 
 import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.novi.serde.Bytes;
 import com.novi.serde.DeserializationError;
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.bouncycastle.util.Arrays;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.DocWriteResponse;
@@ -62,6 +62,7 @@
 import org.starcoin.types.event.WithdrawEvent;
 import org.starcoin.utils.Hex;
 import org.starcoin.utils.StructTagUtil;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import javax.annotation.PostConstruct;
 import java.io.IOException;
@@ -378,7 +379,7 @@ public void bulk(List<Block> blockList) {
  addTokenInfo(tokenInfo, codeStr);
  //add to cache
  tokenCache.put(codeStr, tokenInfo);
- } catch (JSONRPC2SessionException e) {
+ } catch (JSONRPC2SessionException | JsonProcessingException e) {
  logger.error("flush token error:", e);
  }
  }

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/IndexerHandle.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/IndexerHandle.java
@@ -1,6 +1,6 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +12,7 @@
 import org.starcoin.bean.Block;
 import org.starcoin.bean.BlockHeader;
 import org.starcoin.bean.BlockOffset;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
@@ -163,7 +164,7 @@ protected void executeInternal(JobExecutionContext jobExecutionContext) {
  localBlockOffset.setBlockHash(currentHandleHeader.getBlockHash());
  elasticSearchHandler.setRemoteOffset(localBlockOffset);
  logger.info("indexer update success: {}", localBlockOffset);
- } catch (JSONRPC2SessionException e) {
+ } catch (JSONRPC2SessionException | JsonProcessingException e) {
  logger.error("chain header error:", e);
  }
  }

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/MarketCapHandle.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/MarketCapHandle.java
@@ -1,6 +1,5 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
@@ -20,6 +19,7 @@
 import org.starcoin.api.TokenContractRPCClient;
 import org.starcoin.bean.*;
 import org.starcoin.constant.Constant;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import javax.annotation.PostConstruct;
 import java.io.IOException;

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/RepairHandle.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/RepairHandle.java
@@ -1,6 +1,6 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +10,8 @@
 import org.starcoin.api.TransactionRPCClient;
 import org.starcoin.bean.Block;
 import org.starcoin.bean.BlockHeader;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
+
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -65,7 +67,7 @@ public boolean autoRepair(long startNumber, int count) {
  logger.info("repair too fast: {}", startNumber);
  return false;
  }
- } catch (JSONRPC2SessionException e) {
+ } catch (JSONRPC2SessionException | JsonProcessingException e) {
  logger.error("get master error: ", e);
  return false;
  }

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/ServiceUtils.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/ServiceUtils.java
@@ -7,7 +7,6 @@
 import com.novi.bcs.BcsDeserializer;
 import com.novi.serde.Bytes;
 import com.novi.serde.DeserializationError;
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
@@ -29,6 +28,7 @@
 import org.starcoin.types.StructTag;
 import org.starcoin.types.TransactionPayload;
 import org.starcoin.utils.*;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -180,7 +180,7 @@ static TokenInfo getTokenInfo(StateRPCClient stateRPCClient, String tokenCode) {
  if (tokenInfo != null) {
  tokenCache.put(tokenCode, tokenInfo);
  }
- } catch (JSONRPC2SessionException e) {
+ } catch (JSONRPC2SessionException | JsonProcessingException e) {
  logger.error("get token info error:", e);
  }
  }

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/SubscribeHandler.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/SubscribeHandler.java
@@ -1,6 +1,5 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import io.reactivex.Flowable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,6 +8,7 @@
 import org.starcoin.bean.PendingTransaction;
 import org.starcoin.bean.PendingTransactionNotification;
 import org.web3j.protocol.websocket.WebSocketService;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import java.net.ConnectException;
 import java.net.MalformedURLException;

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/SwapHandle.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/SwapHandle.java
@@ -1,7 +1,5 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
-import org.elasticsearch.client.RestHighLevelClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +16,7 @@
 import org.starcoin.utils.StructTagUtil;
 import org.starcoin.utils.SwapApiClient;
 import org.starcoin.types.TypeTag;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import java.io.IOException;
 import java.math.BigDecimal;

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/TransactionInfoHandle.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/TransactionInfoHandle.java
@@ -1,6 +1,5 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
@@ -22,6 +21,7 @@
 import org.starcoin.api.TransactionRPCClient;
 import org.starcoin.bean.Transaction;
 import org.starcoin.constant.Constant;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import java.io.IOException;
 import java.util.List;

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/TransactionPayloadHandle.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/TransactionPayloadHandle.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.novi.serde.DeserializationError;
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
@@ -22,6 +21,7 @@
 import org.starcoin.types.TransactionPayload;
 import org.starcoin.types.TypeTag;
 import org.starcoin.utils.*;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import javax.annotation.PostConstruct;
 import java.io.IOException;

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/TvlService.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/TvlService.java
@@ -1,6 +1,5 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +8,7 @@
 import org.starcoin.bean.ContractCall;
 import org.starcoin.bean.TokenPairTvl;
 import org.starcoin.bean.TokenTvlAmount;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

diff --git a/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/UpdateTVLHandle.java b/starcoin-indexer/src/main/java/org/starcoin/indexer/handler/UpdateTVLHandle.java
@@ -1,6 +1,6 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/starcoin-indexer/src/test/java/org/starcoin/indexer/handler/SwapIndexerTest.java b/starcoin-indexer/src/test/java/org/starcoin/indexer/handler/SwapIndexerTest.java
@@ -1,6 +1,5 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,10 +15,10 @@
 import org.starcoin.bean.SwapType;
 import org.starcoin.indexer.service.SwapTxnService;
 import org.starcoin.utils.SwapApiClient;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Calendar;
 import java.util.List;
 
 import static org.starcoin.utils.DateTimeUtils.getTimeStamp;

diff --git a/starcoin-indexer/src/test/java/org/starcoin/indexer/handler/TvlTest.java b/starcoin-indexer/src/test/java/org/starcoin/indexer/handler/TvlTest.java
@@ -1,10 +1,11 @@
 package org.starcoin.indexer.handler;
 
-import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
 import org.junit.Test;
 import org.starcoin.api.ContractRPCClient;
 import org.starcoin.api.StateRPCClient;
 import org.starcoin.bean.ContractCall;
+import org.starcoin.jsonrpc.client.JSONRPC2SessionException;
+
 
 import java.net.MalformedURLException;
 import java.net.URL;