diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryProtocol.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryProtocol.java index 3e4a691a..ecaee503 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryProtocol.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryProtocol.java @@ -11,7 +11,6 @@ import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; public class BinaryProtocol { - public static void encode(Object data, Class contractType, OutputStream out) { DataContractEncoder encoder = DataContractContext.resolve(contractType); @@ -33,8 +32,6 @@ public class BinaryProtocol { byte[] bytes = BytesUtils.copyToBytes(in); return decode(bytes); } - - public static T decode(byte[] dataSegment) { BytesSlice bytes = new BytesSlice(dataSegment, 0, dataSegment.length); @@ -49,27 +46,32 @@ public class BinaryProtocol { return encoder.decode(bytes.getInputStream()); } - - - public static T decodeAs(byte[] dataSegment, Class contractType) { - return decodeAs(dataSegment, contractType, true); + public static T decode(byte[] dataSegment, Class contractType) { + return decode(dataSegment, contractType, true); } - - public static T decodeAs(byte[] dataSegment, Class contractType, boolean autoRegister) { + + public static T decode(byte[] dataSegment, Class contractType, boolean autoRegister) { DataContractEncoder encoder = DataContractContext.ENCODER_LOOKUP.lookup(contractType); if (encoder == null) { if (autoRegister) { encoder = DataContractContext.resolve(contractType); - }else { + } else { throw new DataContractException("Contract type is not registered! --" + contractType.toString()); } } BytesSlice bytes = new BytesSlice(dataSegment, 0, dataSegment.length); return encoder.decode(bytes.getInputStream()); } - - - - + + + @Deprecated + public static T decodeAs(byte[] dataSegment, Class contractType) { + return decode(dataSegment, contractType, true); + } + + @Deprecated + public static T decodeAs(byte[] dataSegment, Class contractType, boolean autoRegister) { + return decode(dataSegment, contractType, autoRegister); + } } diff --git a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java index 75288f47..c564a306 100644 --- a/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java +++ b/source/sdk/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_Tx_Persistance.java @@ -84,7 +84,7 @@ public class SDKDemo_Tx_Persistance { byte[] txContentBytes = BinaryProtocol.encode(prepTx.getTransactionContent(), TransactionContent.class); // 反序列化交易内容; - TransactionContent txContent = BinaryProtocol.decodeAs(txContentBytes, TransactionContent.class); + TransactionContent txContent = BinaryProtocol.decode(txContentBytes, TransactionContent.class); // 对交易内容签名; DigitalSignature signature1 = SignatureUtils.sign(txContent, keyPair1);