Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaae1546

Browse files
committed
[1.2.1]
TxInternal equal and toString asserts added[1.2.1]DTO internal fields exposure removedBasicProvider fake adapters registered[1.2.1]Code style fixed[1.2.1]TxInternal#getTraceId return 0 if null
1 parent1d1aa6f commitaae1546

File tree

11 files changed

+40
-18
lines changed

11 files changed

+40
-18
lines changed

‎src/main/java/io/api/etherscan/core/impl/BasicProvider.java‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
importjava.time.LocalDate;
1414
importjava.time.LocalDateTime;
15-
importjava.time.format.DateTimeFormatter;
1615
importjava.util.Map;
1716

1817
/**
@@ -44,21 +43,11 @@ abstract class BasicProvider {
4443
this.baseUrl =baseUrl;
4544
this.executor =executor;
4645
this.gson =newGsonBuilder()
47-
.registerTypeAdapter(LocalDateTime.class,
48-
(JsonSerializer<LocalDateTime>) (src,typeOfSrc,context) ->newJsonPrimitive(
49-
src.format(DateTimeFormatter.ISO_DATE_TIME)))
50-
.registerTypeAdapter(LocalDate.class,
51-
(JsonSerializer<LocalDate>) (src,typeOfSrc,
52-
context) ->newJsonPrimitive(src.format(DateTimeFormatter.ISO_DATE)))
53-
.registerTypeAdapter(LocalDateTime.class, (JsonDeserializer<LocalDateTime>) (json,type,context) -> {
54-
Stringdatetime =json.getAsJsonPrimitive().getAsString();
55-
returnLocalDateTime.parse(datetime,DateTimeFormatter.ISO_DATE_TIME);
56-
})
57-
.registerTypeAdapter(LocalDate.class, (JsonDeserializer<LocalDate>) (json,type,context) -> {
58-
Stringdatetime =json.getAsJsonPrimitive().getAsString();
59-
returnLocalDate.parse(datetime,DateTimeFormatter.ISO_DATE);
60-
}).create();
61-
46+
.registerTypeAdapter(LocalDateTime.class, (JsonSerializer<LocalDateTime>) (src,t,c) ->newJsonPrimitive(""))
47+
.registerTypeAdapter(LocalDate.class, (JsonSerializer<LocalDate>) (src,t,context) ->newJsonPrimitive(""))
48+
.registerTypeAdapter(LocalDateTime.class, (JsonDeserializer<LocalDateTime>) (json,t,c) ->null)
49+
.registerTypeAdapter(LocalDate.class, (JsonDeserializer<LocalDate>) (json,t,c) ->null)
50+
.create();
6251
}
6352

6453
<T>Tconvert(finalStringjson,finalClass<T>tClass) {

‎src/main/java/io/api/etherscan/model/BaseTx.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
packageio.api.etherscan.model;
22

3+
importcom.google.gson.annotations.Expose;
34
importio.api.etherscan.util.BasicUtils;
45

56
importjava.math.BigInteger;
@@ -17,6 +18,7 @@ abstract class BaseTx {
1718

1819
privatelongblockNumber;
1920
privateStringtimeStamp;
21+
@Expose(serialize =false,deserialize =false)
2022
privateLocalDateTime_timeStamp;
2123
privateStringhash;
2224
privateStringfrom;

‎src/main/java/io/api/etherscan/model/Block.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
packageio.api.etherscan.model;
22

3+
importcom.google.gson.annotations.Expose;
34
importio.api.etherscan.util.BasicUtils;
45

56
importjava.math.BigInteger;
@@ -17,6 +18,7 @@ public class Block {
1718
privatelongblockNumber;
1819
privateBigIntegerblockReward;
1920
privateStringtimeStamp;
21+
@Expose(serialize =false,deserialize =false)
2022
privateLocalDateTime_timeStamp;
2123

2224
// <editor-fold desc="Getter">

‎src/main/java/io/api/etherscan/model/Log.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
packageio.api.etherscan.model;
22

3+
importcom.google.gson.annotations.Expose;
34
importio.api.etherscan.util.BasicUtils;
45

56
importjava.math.BigInteger;
@@ -17,20 +18,26 @@
1718
publicclassLog {
1819

1920
privateStringblockNumber;
21+
@Expose(serialize =false,deserialize =false)
2022
privateLong_blockNumber;
2123
privateStringaddress;
2224
privateStringtransactionHash;
2325
privateStringtransactionIndex;
26+
@Expose(serialize =false,deserialize =false)
2427
privateLong_transactionIndex;
2528
privateStringtimeStamp;
29+
@Expose(serialize =false,deserialize =false)
2630
privateLocalDateTime_timeStamp;
2731
privateStringdata;
2832
privateStringgasPrice;
33+
@Expose(serialize =false,deserialize =false)
2934
privateBigInteger_gasPrice;
3035
privateStringgasUsed;
36+
@Expose(serialize =false,deserialize =false)
3137
privateBigInteger_gasUsed;
3238
privateList<String>topics;
3339
privateStringlogIndex;
40+
@Expose(serialize =false,deserialize =false)
3441
privateLong_logIndex;
3542

3643
// <editor-fold desc="Getters">

‎src/main/java/io/api/etherscan/model/Price.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packageio.api.etherscan.model;
22

3+
importcom.google.gson.annotations.Expose;
4+
35
importjava.time.LocalDateTime;
46
importjava.time.ZoneOffset;
57

@@ -15,7 +17,9 @@ public class Price {
1517
privatedoubleethbtc;
1618
privateStringethusd_timestamp;
1719
privateStringethbtc_timestamp;
20+
@Expose(serialize =false,deserialize =false)
1821
privateLocalDateTime_ethusd_timestamp;
22+
@Expose(serialize =false,deserialize =false)
1923
privateLocalDateTime_ethbtc_timestamp;
2024

2125
publicdoubleinUsd() {

‎src/main/java/io/api/etherscan/model/TxInternal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public String getType() {
2121
}
2222

2323
publiclonggetTraceId() {
24-
returnLong.parseLong(traceId);
24+
return(traceId ==null) ?0 :Long.parseLong(traceId);
2525
}
2626

2727
publicStringgetTraceIdAsString() {

‎src/main/java/io/api/etherscan/model/proxy/BlockProxy.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
packageio.api.etherscan.model.proxy;
22

3+
importcom.google.gson.annotations.Expose;
34
importio.api.etherscan.util.BasicUtils;
45

56
importjava.math.BigInteger;
@@ -16,15 +17,18 @@
1617
publicclassBlockProxy {
1718

1819
privateStringnumber;
20+
@Expose(serialize =false,deserialize =false)
1921
privateLong_number;
2022
privateStringhash;
2123
privateStringparentHash;
2224
privateStringstateRoot;
2325
privateStringsize;
26+
@Expose(serialize =false,deserialize =false)
2427
privateLong_size;
2528
privateStringdifficulty;
2629
privateStringtotalDifficulty;
2730
privateStringtimestamp;
31+
@Expose(serialize =false,deserialize =false)
2832
privateLocalDateTime_timestamp;
2933

3034
privateStringminer;
@@ -33,8 +37,10 @@ public class BlockProxy {
3337
privateStringlogsBloom;
3438
privateStringmixHash;
3539
privateStringgasUsed;
40+
@Expose(serialize =false,deserialize =false)
3641
privateBigInteger_gasUsed;
3742
privateStringgasLimit;
43+
@Expose(serialize =false,deserialize =false)
3844
privateBigInteger_gasLimit;
3945

4046
privateStringsha3Uncles;

‎src/main/java/io/api/etherscan/model/proxy/ReceiptProxy.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
packageio.api.etherscan.model.proxy;
22

3+
importcom.google.gson.annotations.Expose;
34
importio.api.etherscan.model.Log;
45
importio.api.etherscan.util.BasicUtils;
56

@@ -18,14 +19,18 @@ public class ReceiptProxy {
1819
privateStringfrom;
1920
privateStringto;
2021
privateStringblockNumber;
22+
@Expose(serialize =false,deserialize =false)
2123
privateLong_blockNumber;
2224
privateStringblockHash;
2325
privateStringtransactionHash;
2426
privateStringtransactionIndex;
27+
@Expose(serialize =false,deserialize =false)
2528
privateLong_transactionIndex;
2629
privateStringgasUsed;
30+
@Expose(serialize =false,deserialize =false)
2731
privateBigInteger_gasUsed;
2832
privateStringcumulativeGasUsed;
33+
@Expose(serialize =false,deserialize =false)
2934
privateBigInteger_cumulativeGasUsed;
3035
privateStringcontractAddress;
3136

‎src/main/java/io/api/etherscan/model/proxy/TxProxy.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
packageio.api.etherscan.model.proxy;
22

3+
importcom.google.gson.annotations.Expose;
34
importio.api.etherscan.util.BasicUtils;
45

56
importjava.math.BigInteger;
@@ -15,21 +16,26 @@ public class TxProxy {
1516
privateStringto;
1617
privateStringhash;
1718
privateStringtransactionIndex;
19+
@Expose(serialize =false,deserialize =false)
1820
privateLong_transactionIndex;
1921
privateStringfrom;
2022
privateStringv;
2123
privateStringinput;
2224
privateStrings;
2325
privateStringr;
2426
privateStringnonce;
27+
@Expose(serialize =false,deserialize =false)
2528
privateLong_nonce;
2629
privateStringvalue;
2730
privateStringgas;
31+
@Expose(serialize =false,deserialize =false)
2832
privateBigInteger_gas;
2933
privateStringgasPrice;
34+
@Expose(serialize =false,deserialize =false)
3035
privateBigInteger_gasPrice;
3136
privateStringblockHash;
3237
privateStringblockNumber;
38+
@Expose(serialize =false,deserialize =false)
3339
privateLong_blockNumber;
3440

3541
// <editor-fold desc="Getters">

‎src/test/java/io/api/etherscan/account/AccountTxInternalTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public void correctStartBlock() {
2929
List<TxInternal>txs =getApi().account().txsInternal("0x2C1ba59D6F58433FB1EaEe7d20b26Ed83bDA51A3",2558775);
3030
assertNotNull(txs);
3131
assertEquals(24,txs.size());
32+
assertNotEquals(txs.get(0),txs.get(1));
33+
assertNotEquals(txs.get(0).toString(),txs.get(1).toString());
3234
assertTxs(txs);
3335
}
3436

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp