From 8b0c293a9297e11a8bd05e15ce02c4c16878cb53 Mon Sep 17 00:00:00 2001 From: kyonRay Date: Tue, 30 Nov 2021 21:15:50 +0800 Subject: [PATCH] (precompiled): Deprecated crud service. --- .../bcos/sdk/codec/abi/TypeEncoderTest.java | 2 +- .../precompiled/crud/TableCRUDService.java | 35 ++++++++++++++----- .../precompiled/crud/TablePrecompiled.java | 2 ++ .../precompiled/crud/common/Condition.java | 1 + .../crud/common/ConditionOperator.java | 1 + .../precompiled/crud/common/Entry.java | 1 + .../precompiled/model/PrecompiledAddress.java | 5 ++- 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/sdk-codec/src/test/java/org/fisco/bcos/sdk/codec/abi/TypeEncoderTest.java b/sdk-codec/src/test/java/org/fisco/bcos/sdk/codec/abi/TypeEncoderTest.java index 494678ec0..c68ecf2b8 100644 --- a/sdk-codec/src/test/java/org/fisco/bcos/sdk/codec/abi/TypeEncoderTest.java +++ b/sdk-codec/src/test/java/org/fisco/bcos/sdk/codec/abi/TypeEncoderTest.java @@ -1047,7 +1047,7 @@ public void testInvalidAddress() { UnsupportedOperationException.class, () -> new Address( - "0xa04462684b510796c186d19abfa6929742f79394583d6efb1243bbb473f21d9f")); + "0xa044321313121362684b510796c186d19abfa6929742f79394583d6efb1243bbb473f21d9f")); } @Test diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java index 95b89f0c7..391c15c6c 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TableCRUDService.java @@ -24,7 +24,6 @@ import org.fisco.bcos.sdk.contract.precompiled.callback.PrecompiledCallback; import org.fisco.bcos.sdk.contract.precompiled.crud.common.Condition; import org.fisco.bcos.sdk.contract.precompiled.crud.common.Entry; -import org.fisco.bcos.sdk.contract.precompiled.model.PrecompiledAddress; import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair; import org.fisco.bcos.sdk.model.PrecompiledConstant; import org.fisco.bcos.sdk.model.PrecompiledRetCode; @@ -35,32 +34,40 @@ import org.fisco.bcos.sdk.transaction.model.exception.ContractException; import org.fisco.bcos.sdk.utils.StringUtils; +/** This class not support in FISCO BCOS 3.0.0 rc1 Do not use it. */ +@Deprecated public class TableCRUDService { private final Client client; private final TablePrecompiled tablePrecompiled; private static final String ValueFieldsDelimiter = ","; + @Deprecated public TableCRUDService(Client client, CryptoKeyPair credential) { - this.client = client; - this.tablePrecompiled = - TablePrecompiled.load( - client.isWASM() - ? PrecompiledAddress.TABLEFACTORY_PRECOMPILED_NAME - : PrecompiledAddress.TABLEFACTORY_PRECOMPILED_ADDRESS, - client, - credential); + this.client = null; + this.tablePrecompiled = null; + // this.client = client; + // this.tablePrecompiled = + // TablePrecompiled.load( + // client.isWASM() + // ? PrecompiledAddress.TABLEFACTORY_PRECOMPILED_NAME + // : PrecompiledAddress.TABLEFACTORY_PRECOMPILED_ADDRESS, + // client, + // credential); } + @Deprecated public static String convertValueFieldsToString(List valueFields) { return StringUtils.join(valueFields, ValueFieldsDelimiter); } + @Deprecated public void checkKey(String key) throws ContractException { if (key.length() > PrecompiledConstant.TABLE_KEY_MAX_LENGTH) { throw new ContractException(PrecompiledRetCode.OVER_TABLE_KEY_LENGTH_LIMIT); } } + @Deprecated public RetCode createTable(String tableName, String keyFieldName, List valueFields) throws ContractException { checkKey(keyFieldName); @@ -69,11 +76,13 @@ public RetCode createTable(String tableName, String keyFieldName, List v tablePrecompiled.createTable(tableName, keyFieldName, valueFieldsString)); } + @Deprecated public RetCode insert(String tableName, Entry fieldNameToValue) throws ContractException { return ReceiptParser.parseTransactionReceipt( tablePrecompiled.insert(tableName, fieldNameToValue.getTablePrecompiledEntry())); } + @Deprecated public RetCode update(String tableName, Entry fieldNameToValue, Condition condition) throws ContractException { return ReceiptParser.parseTransactionReceipt( @@ -83,11 +92,13 @@ public RetCode update(String tableName, Entry fieldNameToValue, Condition condit condition.getTableCondition())); } + @Deprecated public RetCode remove(String tableName, Condition condition) throws ContractException { return ReceiptParser.parseTransactionReceipt( tablePrecompiled.remove(tableName, condition.getTableCondition())); } + @Deprecated public List> select(String tableName, Condition condition) throws ContractException { try { @@ -106,6 +117,7 @@ public List> select(String tableName, Condition condition) } } + @Deprecated public static List> parseSelectResult( List selectResult) throws JsonProcessingException { List> result = new ArrayList<>(); @@ -130,6 +142,7 @@ private List> getTableDesc(String tableName) throws Contract return tableDescList; } + @Deprecated public List> desc(String tableName) throws ContractException { try { return getTableDesc(tableName); @@ -138,6 +151,7 @@ public List> desc(String tableName) throws ContractException } } + @Deprecated private TransactionCallback createTransactionCallback(PrecompiledCallback callback) { return new TransactionCallback() { @Override @@ -156,12 +170,14 @@ public void onResponse(TransactionReceipt receipt) { }; } + @Deprecated public void asyncInsert(String tableName, Entry entry, PrecompiledCallback callback) throws ContractException { this.tablePrecompiled.insert( tableName, entry.getTablePrecompiledEntry(), createTransactionCallback(callback)); } + @Deprecated public void asyncUpdate( String tableName, Entry entry, Condition condition, PrecompiledCallback callback) throws ContractException { @@ -172,6 +188,7 @@ public void asyncUpdate( createTransactionCallback(callback)); } + @Deprecated public void asyncRemove(String tableName, Condition condition, PrecompiledCallback callback) throws ContractException { this.tablePrecompiled.remove( diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TablePrecompiled.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TablePrecompiled.java index 8f4f43370..dbd2f3ca1 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TablePrecompiled.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/TablePrecompiled.java @@ -24,6 +24,8 @@ import org.fisco.bcos.sdk.model.callback.TransactionCallback; import org.fisco.bcos.sdk.transaction.model.exception.ContractException; +/** This class not support in FISCO BCOS 3.0.0 rc1 Do not use it. */ +@Deprecated @SuppressWarnings("unchecked") public class TablePrecompiled extends Contract { public static final String[] BINARY_ARRAY = { diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Condition.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Condition.java index 24a9655d6..0155ae2e1 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Condition.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Condition.java @@ -20,6 +20,7 @@ import java.util.Map; import org.fisco.bcos.sdk.contract.precompiled.crud.TablePrecompiled; +@Deprecated public class Condition { private Map> conditions; diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/ConditionOperator.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/ConditionOperator.java index 939df7af2..f6021382e 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/ConditionOperator.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/ConditionOperator.java @@ -16,6 +16,7 @@ import java.math.BigInteger; +@Deprecated public enum ConditionOperator { eq(0), ne(1), diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Entry.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Entry.java index 34e99f65c..ad2da9328 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Entry.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/common/Entry.java @@ -20,6 +20,7 @@ import java.util.Map; import org.fisco.bcos.sdk.contract.precompiled.crud.TablePrecompiled; +@Deprecated public class Entry { private Map fieldNameToValue = new HashMap<>(); diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledAddress.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledAddress.java index a4ec1a9fb..75a9ba85d 100644 --- a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledAddress.java +++ b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/precompiled/model/PrecompiledAddress.java @@ -17,8 +17,11 @@ public class PrecompiledAddress { public static final String SYSCONFIG_PRECOMPILED_ADDRESS = "0000000000000000000000000000000000001000"; + + @Deprecated public static final String TABLEFACTORY_PRECOMPILED_ADDRESS = "0000000000000000000000000000000000001001"; + public static final String CONSENSUS_PRECOMPILED_ADDRESS = "0000000000000000000000000000000000001003"; public static final String CNS_PRECOMPILED_ADDRESS = "0000000000000000000000000000000000001004"; @@ -28,10 +31,10 @@ public class PrecompiledAddress { public static final String CONTRACT_AUTH_ADDRESS = "0000000000000000000000000000000000001005"; public static final String SYSCONFIG_PRECOMPILED_NAME = "/sys/status"; - public static final String TABLEFACTORY_PRECOMPILED_NAME = "/sys/table_storage"; public static final String CONSENSUS_PRECOMPILED_NAME = "/sys/consensus"; public static final String CNS_PRECOMPILED_NAME = "/sys/cns"; public static final String BFS_PRECOMPILED_NAME = "/sys/bfs"; + @Deprecated public static final String TABLEFACTORY_PRECOMPILED_NAME = "/sys/table_storage"; private PrecompiledAddress() {} }