From df3f4f833bd29ad300a5d056155b4dcbf863953d Mon Sep 17 00:00:00 2001 From: huanghaiquan Date: Sun, 14 Apr 2019 21:44:22 +0800 Subject: [PATCH] Remove unused codes and rename packages in binary-proto project; --- .../binaryproto/BinaryEncodingUtils.java | 4 +- .../binaryproto/DataContractRegistry.java | 2 +- .../AbstractDynamicValueConverter.java | 2 +- .../{impl2 => impl}/AbstractFieldEncoder.java | 2 +- .../binaryproto/impl/BinaryEncoderImpl.java | 861 ------------------ .../{impl2 => impl}/BoolConverter.java | 2 +- .../{impl2 => impl}/BoolWrapperConverter.java | 2 +- .../BytesSerializableValueConverter.java | 2 +- .../{impl2 => impl}/BytesValueConverter.java | 2 +- .../{impl2 => impl}/DataContractContext.java | 4 +- .../DataContractEncoderImpl.java | 2 +- .../DataContractEncoderLookup.java | 2 +- .../DataContractGenericRefConverter.java | 2 +- .../{impl2 => impl}/DataContractHeader.java | 1 + .../DataContractSpecification.java | 2 +- .../DataContractValueConverter.java | 2 +- .../impl/DataSpecificationImpl.java | 94 -- .../DynamicArrayFieldEncoder.java | 2 +- .../{impl2 => impl}/DynamicDataContract.java | 2 +- .../{impl2 => impl}/DynamicFieldEncoder.java | 2 +- .../DynamicValueConverter.java | 2 +- .../impl/EnumContractRegistry.java | 32 - .../impl/EnumSpecificationImpl.java | 84 -- .../EnumSpecificationInfo.java | 2 +- .../{impl2 => impl}/EnumValueConverter.java | 2 +- .../{impl2 => impl}/FieldEncoder.java | 2 +- .../binaryproto/impl/FieldSpecImpl.java | 142 --- .../{impl2 => impl}/FieldSpecInfo.java | 2 +- .../FixedArrayFieldEncoder.java | 2 +- .../{impl2 => impl}/FixedFieldEncoder.java | 2 +- .../{impl2 => impl}/FixedValueConverter.java | 2 +- .../{impl2 => impl}/GenericFieldEncoder.java | 1 + .../{impl2 => impl}/HeaderEncoder.java | 2 +- .../{impl2 => impl}/Int16CharConverter.java | 2 +- .../Int16CharWrapperConverter.java | 2 +- .../{impl2 => impl}/Int16ShortConverter.java | 2 +- .../Int16ShortWrapperConverter.java | 2 +- .../{impl2 => impl}/Int32IntConverter.java | 2 +- .../Int32IntWrapperConverter.java | 2 +- .../{impl2 => impl}/Int64LongConverter.java | 2 +- .../Int64LongWrapperConverter.java | 2 +- .../{impl2 => impl}/Int8ByteConverter.java | 2 +- .../Int8ByteWrapperConverter.java | 2 +- .../RepeatableFieldEncoder.java | 1 + .../{impl2 => impl}/SliceEncoder.java | 2 +- .../{impl2 => impl}/StringValueConverter.java | 2 +- .../{impl2 => impl}/ValueConverter.java | 2 +- 47 files changed, 44 insertions(+), 1254 deletions(-) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/AbstractDynamicValueConverter.java (96%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/AbstractFieldEncoder.java (96%) delete mode 100644 source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BinaryEncoderImpl.java rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/BoolConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/BoolWrapperConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/BytesSerializableValueConverter.java (97%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/BytesValueConverter.java (93%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DataContractContext.java (99%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DataContractEncoderImpl.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DataContractEncoderLookup.java (90%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DataContractGenericRefConverter.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DataContractHeader.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DataContractSpecification.java (96%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DataContractValueConverter.java (95%) delete mode 100644 source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataSpecificationImpl.java rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DynamicArrayFieldEncoder.java (97%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DynamicDataContract.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DynamicFieldEncoder.java (96%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/DynamicValueConverter.java (90%) delete mode 100644 source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumContractRegistry.java delete mode 100644 source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumSpecificationImpl.java rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/EnumSpecificationInfo.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/EnumValueConverter.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/FieldEncoder.java (86%) delete mode 100644 source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldSpecImpl.java rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/FieldSpecInfo.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/FixedArrayFieldEncoder.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/FixedFieldEncoder.java (97%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/FixedValueConverter.java (93%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/GenericFieldEncoder.java (99%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/HeaderEncoder.java (98%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int16CharConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int16CharWrapperConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int16ShortConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int16ShortWrapperConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int32IntConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int32IntWrapperConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int64LongConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int64LongWrapperConverter.java (92%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int8ByteConverter.java (91%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/Int8ByteWrapperConverter.java (91%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/RepeatableFieldEncoder.java (94%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/SliceEncoder.java (96%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/StringValueConverter.java (93%) rename source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/{impl2 => impl}/ValueConverter.java (77%) diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryEncodingUtils.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryEncodingUtils.java index 66a9094b..7abe013c 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryEncodingUtils.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/BinaryEncodingUtils.java @@ -4,8 +4,8 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.OutputStream; -import com.jd.blockchain.binaryproto.impl2.DataContractContext; -import com.jd.blockchain.binaryproto.impl2.HeaderEncoder; +import com.jd.blockchain.binaryproto.impl.DataContractContext; +import com.jd.blockchain.binaryproto.impl.HeaderEncoder; import com.jd.blockchain.utils.io.BytesOutputBuffer; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/DataContractRegistry.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/DataContractRegistry.java index 3c985b59..e6848575 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/DataContractRegistry.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/DataContractRegistry.java @@ -1,6 +1,6 @@ package com.jd.blockchain.binaryproto; -import com.jd.blockchain.binaryproto.impl2.DataContractContext; +import com.jd.blockchain.binaryproto.impl.DataContractContext; /** * 数据实体注册表； diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/AbstractDynamicValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/AbstractDynamicValueConverter.java similarity index 96% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/AbstractDynamicValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/AbstractDynamicValueConverter.java index d4ca0593..b0536f76 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/AbstractDynamicValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/AbstractDynamicValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesInputStream; import com.jd.blockchain.utils.io.BytesOutputBuffer; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/AbstractFieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/AbstractFieldEncoder.java similarity index 96% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/AbstractFieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/AbstractFieldEncoder.java index 6a17f8d7..597d3e2e 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/AbstractFieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/AbstractFieldEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BinaryEncoderImpl.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BinaryEncoderImpl.java deleted file mode 100644 index c0c0f147..00000000 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BinaryEncoderImpl.java +++ /dev/null @@ -1,861 +0,0 @@ -//package com.jd.blockchain.binaryproto.impl; -// -//import my.utils.ValueType; -//import my.utils.io.*; -//import my.utils.net.NetworkAddress; -// -//import java.io.IOException; -//import java.io.InputStream; -//import java.io.OutputStream; -//import java.lang.annotation.Annotation; -//import java.lang.reflect.Constructor; -//import java.lang.reflect.Field; -//import java.lang.reflect.InvocationTargetException; -//import java.lang.reflect.Method; -//import java.util.*; -// -//import com.jd.blockchain.binaryproto.BinaryEncoder; -//import com.jd.blockchain.binaryproto.ContractTypeResolver; -//import com.jd.blockchain.binaryproto.DConstructor; -//import com.jd.blockchain.binaryproto.DataContractException; -//import com.jd.blockchain.binaryproto.DataContractRegistry; -//import com.jd.blockchain.binaryproto.DataSpecification; -//import com.jd.blockchain.binaryproto.EnumSpecification; -//import com.jd.blockchain.binaryproto.FieldSetter; -//import com.jd.blockchain.binaryproto.FieldSpec; -// -///** -// * Created by zhangshuang3 on 2018/6/21. -// */ -//public class BinaryEncoderImpl implements BinaryEncoder { -// private DataSpecification spec; -// private Class contractType; -// -// public BinaryEncoderImpl(DataSpecification spec, Class contractType) { -// this.spec = spec; -// this.contractType = contractType; -// } -// -// @Override -// public DataSpecification getSepcification() { -// return spec; -// } -// -// @Override -// public Class getContractType() { -// return contractType; -// } -// -// public void write(FieldSpec spec, OutputStream out, Object value) { -// ValueType primitive = spec.getPrimitiveType(); -// EnumSpecification refEnum = spec.getRefEnum(); -// DataSpecification refContract = spec.getRefContract(); -// boolean list = spec.isRepeatable(); -// boolean refPubKey = spec.isRefPubKey(); -// boolean refPrivKey = spec.isRefPrivKey(); -// boolean refHashDigest = spec.isRefHashDigest(); -// boolean refSignatureDigest = spec.isRefSignatureDigest(); -// boolean refIdentity = spec.isRefIdentity(); -// boolean refNetworkAddr = spec.isRefNetworkAddr(); -// Class contractTypeResolverClass = spec.getContractTypeResolver(); -// -// try { -// // basic data type -// if ((primitive != ValueType.NIL) && (list == false)) { -// writePrimitive(value, primitive, out); -// } -// // enum type -// else if (refEnum != null) { -// writeEnum(value, refEnum, out); -// } -// // ref contract -// else if (refContract != null && list == false) { -// writeContract(value, refContract, contractTypeResolverClass, out); -// } -// // array type -// else if ((primitive != ValueType.NIL) && (list == true)) { -// writePrimitiveList(value, primitive, out); -// } -// // refcontract array -// else if (refContract != null && list == true) { -// writeContractList(value, refContract, contractTypeResolverClass, out); -// } -// // HashDigest type | PubKey type | PrivKey type -// else if (refPubKey == true | refPrivKey == true | refHashDigest == true | refSignatureDigest == true) { -// writeBytesSerializeObject(value, out); -// } -// // BlockChainIdentity type -// // else if (refIdentity == true) { -// // if (obj == null) { -// // BytesEncoding.writeInNormal(null, out); -// // } -// // else { -// // BytesEncoding.writeInNormal(obj.getClass().getName().getBytes(), out); -// // BytesWriter writer = (BytesWriter)obj; -// // writer.writeTo(out); -// // } -// // } -// // NetworkAddress type -// else if (refNetworkAddr == true) { -// wirteNetworkAddressValue(value, out); -// } else { -// throw new IllegalStateException("Unexpected contract field and value!"); -// } -// } catch (InstantiationException | IllegalAccessException e) { -// throw new DataContractException(e.getMessage(), e); -// } -// -// } -// -// private void wirteNetworkAddressValue(Object value, OutputStream out) { -// if (value == null) { -// BytesEncoding.writeInNormal(null, out); -// } else { -// // write host ,port and secure flag -// NetworkAddress address = (NetworkAddress) value; -// BytesEncoding.writeInNormal(address.getHost().getBytes(), out); -// BytesUtils.writeInt(address.getPort(), out); -// BytesUtils.writeByte((byte) (address.isSecure() ? 1 : 0), out); -// } -// } -// -// private void writeBytesSerializeObject(Object value, OutputStream out) { -// if (value == null) { -// BytesEncoding.writeInNormal(null, out); -// } else { -// BytesEncoding.writeInNormal(value.getClass().getName().getBytes(), out); -// BytesSerializable serializable = (BytesSerializable) value; -// // refPubKey:1bytes algorithm code , 1byte key type, and others are raw bytes -// // refPrivKey:1bytes algorithm code , 1byte key type, and others are raw bytes -// // refHashDigest:1bytes algorithm code , and others are raw bytes -// BytesEncoding.writeInNormal(serializable.toBytes(), out); -// } -// } -// -// private void writeContractList(Object value, DataSpecification contractSpeci, Class contractTypeResolverClass, -// OutputStream out) throws InstantiationException, IllegalAccessException { -// BinaryEncoder encoder1 = null; -// Object[] refContractArray = (Object[]) value; -// if (refContractArray == null) { -// BytesUtils.writeInt(0, out); -// } else { -// BytesUtils.writeInt(refContractArray.length, out); -// if (contractTypeResolverClass.isInterface() == true) { -// encoder1 = DataContractRegistry.getEncoder(contractSpeci.getCode(), contractSpeci.getVersion()); -// if (encoder1 == null) { -// throw new DataContractException("write: get encoder null error!"); -// } -// for (Object ref : refContractArray) { -// BytesUtils.writeInt(encoder1.getSepcification().getCode(), out); -// BytesUtils.writeLong(encoder1.getSepcification().getVersion(), out); -// // record class name -// BytesEncoding.writeInNormal(ref.getClass().getName().getBytes(), out); -// encoder1.encode(ref, out); -// } -// } else { -// // TODO: 不必每次都实例化，应该对此实例建立单例缓存； -// ContractTypeResolver resolver = (ContractTypeResolver) (contractTypeResolverClass.newInstance()); -// for (Object ref : refContractArray) { -// Class subContractType = resolver.getContractType(ref, null); -// encoder1 = DataContractRegistry.register(subContractType); -// if (encoder1 == null) { -// throw new DataContractException("write: regist sub contract type failed error!"); -// } -// BytesUtils.writeInt(encoder1.getSepcification().getCode(), out); -// BytesUtils.writeLong(encoder1.getSepcification().getVersion(), out); -// // record class name -// BytesEncoding.writeInNormal(ref.getClass().getName().getBytes(), out); -// encoder1.encode(ref, out); -// encoder1 = null; -// } -// } -// } -// } -// -// private void writePrimitiveList(Object value, ValueType primitive, OutputStream out) { -// switch (primitive) { -// case BOOLEAN: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// -// boolean[] boolArray = (boolean[]) value; -// BytesUtils.writeInt(boolArray.length, out); -// for (boolean i : boolArray) { -// BytesUtils.writeByte((byte) (i ? 1 : 0), out); -// } -// break; -// case INT8: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// byte[] byteArray = (byte[]) value; -// BytesUtils.writeInt(byteArray.length, out); -// for (byte i : byteArray) { -// BytesUtils.writeByte(i, out); -// } -// break; -// case INT16: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// short[] shortArray = (short[]) value; -// BytesUtils.writeInt(shortArray.length, out); -// for (short i : shortArray) { -// byte[] bytes = BytesUtils.toBytes(i); -// BytesEncoding.writeInShort(bytes, out); -// } -// break; -// case INT32: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// int[] intArray = (int[]) value; -// BytesUtils.writeInt(intArray.length, out); -// for (int i : intArray) { -// BytesUtils.writeInt(i, out); -// } -// break; -// case INT64: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// long[] longArray = (long[]) value; -// BytesUtils.writeInt(longArray.length, out); -// for (long i : longArray) { -// BytesUtils.writeLong(i, out); -// } -// break; -// case DATETIME: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// Date[] dateArray = (Date[]) value; -// BytesUtils.writeInt(dateArray.length, out); -// long elemSeconds; -// for (Date i : dateArray) { -// elemSeconds = i.getTime(); -// BytesUtils.writeLong(elemSeconds, out); -// } -// break; -// case BYTES: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// ByteArray[] byteArrays = (ByteArray[]) value; -// BytesUtils.writeInt(byteArrays.length, out); -// for (ByteArray elem : byteArrays) { -// BytesEncoding.writeInNormal(elem.bytes(), out); -// } -// break; -// case TEXT: -// case JSON: -// case XML: -// case BIG_INT: -// case IMG: -// case VIDEO: -// case LOCATION: -// if (value == null) { -// BytesUtils.writeInt(0, out); -// break; -// } -// Object[] dynamicArray = (Object[]) value; -// BytesUtils.writeInt(dynamicArray.length, out); -// for (Object i : dynamicArray) { -// BytesEncoding.writeInNormal(i.toString().getBytes(), out); -// } -// break; -// default: -// throw new DataContractException("write: array type error!"); -// } -// } -// -// private void writeContract(Object value, DataSpecification contractSpeci, Class contractTypeResolverClass, -// OutputStream out) throws InstantiationException, IllegalAccessException { -// BinaryEncoder encoder = null; -// if (contractTypeResolverClass.isInterface() == true) { -// encoder = DataContractRegistry.getEncoder(contractSpeci.getCode(), contractSpeci.getVersion()); -// if (encoder == null) { -// throw new DataContractException("write: get encoder null error!"); -// } -// } else { -// // get sub contract type -// ContractTypeResolver resolver = (ContractTypeResolver) (contractTypeResolverClass.newInstance()); -// if (resolver == null) { -// throw new DataContractException("write: newInstance null error!"); -// } -// Class subContractType = resolver.getContractType(value, null); -// encoder = DataContractRegistry.register(subContractType); -// if (encoder == null) { -// throw new DataContractException("write: regist sub contract type failed error!"); -// } -// } -// BytesUtils.writeInt(encoder.getSepcification().getCode(), out); -// BytesUtils.writeLong(encoder.getSepcification().getVersion(), out); -// if (value == null) { -// BytesEncoding.writeInNormal(null, out); -// } else { -// // record class name -// BytesEncoding.writeInNormal(value.getClass().getName().getBytes(), out); -// encoder.encode(value, out); -// } -// } -// -// private void writeEnum(Object value, EnumSpecification enumType, OutputStream out) { -// int code = 0; -// EnumSpecificationImpl refEnumImpl = (EnumSpecificationImpl) enumType; -// Map constant = refEnumImpl.getEnumConstants(); -// for (Object enumConstant : constant.keySet()) { -// if (enumConstant.toString().equals(value.toString()) == true) { -// code = constant.get(enumConstant); -// break; -// } -// } -// switch (refEnumImpl.getValueType()) { -// case INT8: -// BytesUtils.writeByte((byte) (code & 0xff), out); -// break; -// case INT16: -// byte[] bytes = BytesUtils.toBytes((short) code); -// BytesEncoding.writeInShort(bytes, out); -// break; -// case INT32: -// BytesUtils.writeInt(code, out); -// break; -// default: -// throw new DataContractException("write: enum type error!"); -// } -// } -// -// private void writePrimitive(Object value, ValueType primitive, OutputStream out) { -// switch (primitive) { -// case BOOLEAN: -// BytesUtils.writeByte((byte) ((boolean) value ? 1 : 0), out); -// break; -// case INT8: -// BytesUtils.writeByte((byte) value, out); -// break; -// case INT16: -// // TODO 可修改为short类型 -// byte[] bytes = BytesUtils.toBytes((short) value); -// BytesEncoding.writeInShort(bytes, out); -// break; -// case INT32: -// BytesUtils.writeInt((int) value, out); -// break; -// case INT64: -// BytesUtils.writeLong((long) value, out); -// break; -// case DATETIME: -// long seconds = ((Date) value).getTime(); -// BytesUtils.writeLong(seconds, out); -// break; -// case BYTES: -// ByteArray byteArray = (ByteArray) value; -// BytesEncoding.writeInNormal(byteArray.bytes(), out); -// break; -// case TEXT: -// case JSON: -// case XML: -// case BIG_INT: -// case IMG: -// case VIDEO: -// case LOCATION: -// if (value == null) { -// BytesEncoding.writeInNormal(null, out); -// } else { -// BytesEncoding.writeInNormal(value.toString().getBytes(), out); -// } -// break; -// default: -// throw new DataContractException("write: primitive type error!"); -// } -// } -// -// @Override -// public void encode(Object data, OutputStream out) { -// DataSpecificationImpl impl = (DataSpecificationImpl) this.getSepcification(); -// List fields = impl.getFields(); -// -// try { -// for (FieldSpec spec : fields) { -// Method mth = ((FieldSpecImpl) spec).getReadMethod(); -// // mth.setAccessible(true); -// Object obj = mth.invoke(data); -// write(spec, out, obj); -// } -// } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { -// throw new DataContractException(e.getMessage(), e); -// } -// } -// -// public void read(FieldSpec spec, Method mth, InputStream in, Map fieldOutter) { -// ValueType primitive = spec.getPrimitiveType(); -// EnumSpecification refEnum = spec.getRefEnum(); -// DataSpecification refContract = spec.getRefContract(); -// boolean list = spec.isRepeatable(); -// boolean refPubKey = spec.isRefPubKey(); -// boolean refPrivKey = spec.isRefPrivKey(); -// boolean refHashDigest = spec.isRefHashDigest(); -// boolean refSignatureDigest = spec.isRefSignatureDigest(); -// boolean refIdentity = spec.isRefIdentity(); -// boolean refNetworkAddr = spec.isRefNetworkAddr(); -// -// try { -// // primitive data type -// if ((primitive != ValueType.NIL) && (list == false)) { -// switch (primitive) { -// case BOOLEAN: -// boolean boolValue = BytesUtils.readByte(in) == 1 ? true : false; -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), boolValue); -// } -// break; -// case INT8: -// byte int8Value = BytesUtils.readByte(in); -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), int8Value); -// } -// break; -// case INT16: -// short shortValue = (short) ((BytesUtils.readByte(in) << 8) | (BytesUtils.readByte(in))); -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), shortValue); -// } -// break; -// case INT32: -// int intValue = BytesUtils.readInt(in); -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), intValue); -// } -// break; -// case INT64: -// long value = BytesUtils.readLong(in); -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), value); -// } -// break; -// case DATETIME: -// long seconds = BytesUtils.readLong(in); -// Date date = new Date(seconds); -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), date); -// } -// break; -// case BYTES: -// byte[] bytes = BytesEncoding.read(NumberMask.NORMAL, in); -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), ByteArray.wrap(bytes)); -// } -// break; -// case TEXT: -// case JSON: -// case XML: -// case BIG_INT: -// case IMG: -// case VIDEO: -// case LOCATION: -// byte[] dynamicResult = BytesEncoding.read(NumberMask.NORMAL, in); -// if (dynamicResult.length == 0) { -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), null); -// } -// } else { -// StringBuffer buffer = new StringBuffer(); -// for (byte i : dynamicResult) { -// buffer.append((char) i); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), buffer.toString()); -// } -// } -// break; -// default: -// throw new DataContractException("read: primitive type error!"); -// } -// } -// // enum type -// else if (refEnum != null) { -// int code = 0; -// switch (refEnum.getValueType()) { -// case INT8: -// code = BytesUtils.readByte(in); -// break; -// case INT16: -// code = (BytesUtils.readByte(in) << 8) | (BytesUtils.readByte(in)); -// break; -// case INT32: -// code = BytesUtils.readInt(in); -// break; -// default: -// throw new DataContractException("read: enum type error!"); -// } -// EnumSpecificationImpl refEnumImpl = (EnumSpecificationImpl) refEnum; -// Map constant = refEnumImpl.getEnumConstants(); -// Object enumConstant = null; -// for (Map.Entry vo : constant.entrySet()) { -// if (vo.getValue() == code) { -// enumConstant = vo.getKey(); -// break; -// } -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), enumConstant); -// } -// } -// // ref contract type -// else if (refContract != null && list == false) { -// BinaryEncoder encoder = null; -// Object object = null; -// int code = BytesUtils.readInt(in); -// long version = BytesUtils.readLong(in); -// encoder = DataContractRegistry.getEncoder(code, version); -// if (encoder == null) { -// throw new DataContractException("read: get encoder null error!"); -// } -// byte[] className = BytesEncoding.read(NumberMask.NORMAL, in); -// if (className.length != 0) { -// StringBuffer buffer = new StringBuffer(); -// for (byte i : className) { -// buffer.append((char) i); -// } -// object = encoder.decode(in, null, Class.forName(buffer.toString())); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), object); -// } -// } -// // array type -// else if ((primitive != ValueType.NIL) && list == true) { -// int arrayCount = BytesUtils.readInt(in); -// int i; -// -// if (arrayCount == 0) { -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), null); -// } -// } else { -// switch (primitive) { -// case BOOLEAN: -// boolean[] boolArray = new boolean[arrayCount]; -// for (i = 0; i < arrayCount; i++) { -// boolArray[i] = (BytesUtils.readByte(in) == 1) ? true : false; -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), boolArray); -// } -// break; -// case INT8: -// byte[] byteArray = new byte[arrayCount]; -// for (i = 0; i < arrayCount; i++) { -// byteArray[i] = (BytesUtils.readByte(in)); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), byteArray); -// } -// break; -// case INT16: -// short[] shortArray = new short[arrayCount]; -// for (i = 0; i < arrayCount; i++) { -// shortArray[i] = (short) ((BytesUtils.readByte(in) << 8) | (BytesUtils.readByte(in))); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), shortArray); -// } -// break; -// case INT32: -// int[] intArray = new int[arrayCount]; -// for (i = 0; i < arrayCount; i++) { -// intArray[i] = BytesUtils.readInt(in); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), intArray); -// } -// break; -// case INT64: -// long[] longArray = new long[arrayCount]; -// for (i = 0; i < arrayCount; i++) { -// longArray[i] = BytesUtils.readLong(in); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), longArray); -// } -// break; -// case DATETIME: -// Date[] dateArray = new Date[arrayCount]; -// for (i = 0; i < arrayCount; i++) { -// long seconds = BytesUtils.readLong(in); -// dateArray[i].setTime(seconds); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), dateArray); -// } -// break; -// case TEXT: -// case JSON: -// case XML: -// case BYTES: -// case BIG_INT: -// case IMG: -// case VIDEO: -// case LOCATION: -// StringBuffer[] stringBufferArray = new StringBuffer[arrayCount]; -// String[] buffer = new String[arrayCount]; -// for (i = 0; i < arrayCount; i++) { -// byte[] dynamicResult = BytesEncoding.read(NumberMask.NORMAL, in); -// stringBufferArray[i] = new StringBuffer(); -// for (byte j : dynamicResult) { -// stringBufferArray[i].append((char) j); -// } -// buffer[i] = stringBufferArray[i].toString(); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), buffer); -// } -// break; -// default: -// throw new DataContractException("read: array type error!"); -// } -// } -// } -// // ref contract type array -// else if (refContract != null && list == true) { -// int code; -// long version; -// BinaryEncoder encoder = null; -// Object[] refContractArray = null; -// int refContractArraySize = BytesUtils.readInt(in); -// if (refContractArraySize != 0) { -// refContractArray = new Object[refContractArraySize]; -// for (int i = 0; i < refContractArray.length; i++) { -// code = BytesUtils.readInt(in); -// version = BytesUtils.readLong(in); -// encoder = DataContractRegistry.getEncoder(code, version); -// if (encoder == null) { -// throw new DataContractException("read: get encoder null error!"); -// } -// byte[] className = BytesEncoding.read(NumberMask.NORMAL, in); -// if (className.length == 0) { -// refContractArray[i] = null; -// } else { -// StringBuffer buffer = new StringBuffer(); -// for (byte var : className) { -// buffer.append((char) var); -// } -// refContractArray[i] = encoder.decode(in, null, Class.forName(buffer.toString())); -// } -// } -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), refContractArray); -// } -// } else if (refPubKey == true | refPrivKey == true | refHashDigest == true | refSignatureDigest == true) { -// Object object = null; -// byte[] className = BytesEncoding.read(NumberMask.NORMAL, in); -// -// if (className.length != 0) { -// StringBuffer buffer = new StringBuffer(); -// for (byte var : className) { -// buffer.append((char) var); -// } -// byte[] bytes = BytesEncoding.read(NumberMask.NORMAL, in); -// object = Class.forName(buffer.toString()).getConstructor(byte[].class).newInstance(bytes); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), object); -// } -// } -// // else if (refIdentity == true) { -// // BytesReader reader = null; -// // byte[] className = BytesEncoding.read(NumberMask.NORMAL, in); -// // if (className.length != 0) { -// // StringBuffer buffer = new StringBuffer(); -// // for (byte var : className) { -// // buffer.append((char) var); -// // } -// // reader = (BytesReader)Class.forName(buffer.toString()).newInstance(); -// // reader.resolvFrom(in); -// // } -// // if (fieldOutter != null) { -// // fieldOutter.put(mth.getName(), reader); -// // } -// // } -// else if (refNetworkAddr == true) { -// NetworkAddress networkAddress = null; -// byte[] buffer = BytesEncoding.read(NumberMask.NORMAL, in); -// if (buffer.length != 0) { -// StringBuffer host = new StringBuffer(); -// for (byte var : buffer) { -// host.append((char) var); -// } -// int port = BytesUtils.readInt(in); -// boolean secure = BytesUtils.readByte(in) == 1 ? true : false; -// networkAddress = new NetworkAddress(host.toString(), port, secure); -// } -// if (fieldOutter != null) { -// fieldOutter.put(mth.getName(), networkAddress); -// } -// } -// } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException -// | InvocationTargetException e) { -// throw new DataContractException(e.getMessage(), e); -// } -// } -// -// public boolean checkConstructor(Class concretedDataType) { -// int count = 0; -// Constructor[] constructors = concretedDataType.getConstructors(); -// for (Constructor constructor : constructors) { -// if (constructor.getDeclaredAnnotation(DConstructor.class) != null) { -// count++; -// } -// } -// if (count >= 2) { -// return false; -// } -// return true; -// } -// -// // convert the first char to lowercase -// public String toLowerCaseFirstOne(String s) { -// if (Character.isLowerCase(s.charAt(0))) -// return s; -// else -// return (new StringBuilder()).append(Character.toLowerCase(s.charAt(0))).append(s.substring(1)).toString(); -// } -// -// public void executeSet(List fields, Map fieldOutter, Object object, -// Class concretedDataType) { -// Method mth; -// try { -// for (FieldSpec spec : fields) { -// mth = ((FieldSpecImpl) spec).getReadMethod(); -// if (mth.getName().length() < 4) { -// throw new DataContractException("executeSet: mth name error!"); -// } -// // skip "get",get substring -// String getName = mth.getName().substring(3); -// // "set" concat with getmthName -// String setName = "set".concat(getName); -// Method[] allMths = concretedDataType.getMethods(); -// Method setMth = null; -// for (Method x : allMths) { -// if (x.getName().equals(setName)) { -// setMth = x; -// break; -// } -// } -// if (setMth != null) { -// // invoke related set method -// Object arg = fieldOutter.get(mth.getName()); -// if (arg != null) { -// setMth.invoke(object, arg); -// } -// } -// // set related member field -// else { -// String member = toLowerCaseFirstOne(getName); -// Field field = concretedDataType.getDeclaredField(member); -// if (field != null) { -// field.setAccessible(true); -// field.set(object, fieldOutter.get(mth.getName())); -// } -// } -// } -// } catch (IllegalAccessException | InvocationTargetException | NoSuchFieldException e) { -// throw new DataContractException(e.getMessage(), e); -// } -// } -// -// @Override -// public Object decode(InputStream in, Map fieldOutter, Class concretedDataType) { -// // TODO: 未缓存对实现类的解析； -// DataSpecificationImpl impl = (DataSpecificationImpl) this.getSepcification(); -// List fields = impl.getFields(); -// Constructor constructor = null; -// Object object = null; -// Method mthType = null; -// -// if (fieldOutter == null) { -// fieldOutter = new HashMap<>(); -// } -// -// try { -// // first check constructor with annotation, count >=2 throw exception -// if (checkConstructor(concretedDataType) == false) { -// throw new DataContractException("decode: constructor with annotation number error!"); -// } -// // get constructor with annotation -// for (Constructor construct : concretedDataType.getConstructors()) { -// if (construct.getDeclaredAnnotation(DConstructor.class) != null) { -// constructor = construct; -// break; -// } -// } -// // fill fieldOutter with fieldsetter -// for (FieldSpec spec : fields) { -// Method mth = ((FieldSpecImpl) spec).getReadMethod(); -// if (mth == null) { -// throw new DataContractException("decode: mth null error!"); -// } -// read(spec, mth, in, fieldOutter); -// } -// // save constructor parameters -// if (constructor != null) { -// Annotation[][] annotations = constructor.getParameterAnnotations(); -// Object[] obj = new Object[annotations.length]; -// int i = 0; -// for (Annotation[] annoArray : annotations) { -// for (Annotation annotation : annoArray) { -// FieldSetter anno = (FieldSetter) annotation; -// obj[i] = fieldOutter.get(anno.name()); -// for (FieldSpec spec : fields) { -// mthType = ((FieldSpecImpl) spec).getReadMethod(); -// // in case :constructor and data contract method name is same ,but return type -// // is different -// if (mthType.getName().equals(anno.name())) { -// String retType = mthType.getReturnType().getSimpleName(); -// String annoType = anno.type(); -// if ((retType.equals(annoType) == false) && (retType.equals("ByteArray")) -// && (annoType.equals("byte[]"))) { -// ByteArray byteArray = (ByteArray) obj[i]; -// obj[i] = byteArray.bytes(); -// break; -// } else if ((retType.equals(annoType) == false) && (retType.equals("byte[]")) -// && (annoType.equals("ByteArray"))) { -// byte[] bytes = (byte[]) obj[i]; -// obj[i] = ByteArray.wrap(bytes); -// break; -// } -// } -// } -// i++; -// } -// } -// // exec constructor with parameters -// object = constructor.newInstance(obj); -// } -// if (object == null) { -// // use default constructor, -// constructor = concretedDataType.getDeclaredConstructor(); -// if (!constructor.isAccessible()) { -// constructor.setAccessible(true); -// } -// object = constructor.newInstance(); -// } -// // exec set method -// executeSet(fields, fieldOutter, object, concretedDataType); -// return object; -// } catch (IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException -// | SecurityException e) { -// throw new DataContractException(e.getMessage(), e); -// } -// } -//} diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BoolConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BoolConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BoolConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BoolConverter.java index 0b32e040..c6c9c0f6 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BoolConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BoolConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BoolWrapperConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BoolWrapperConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BoolWrapperConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BoolWrapperConverter.java index 54592434..f4eff751 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BoolWrapperConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BoolWrapperConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BytesSerializableValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BytesSerializableValueConverter.java similarity index 97% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BytesSerializableValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BytesSerializableValueConverter.java index c0ad5acd..6ac29b9b 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BytesSerializableValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BytesSerializableValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BytesValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BytesValueConverter.java similarity index 93% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BytesValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BytesValueConverter.java index 27664b6c..071fdeaa 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/BytesValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/BytesValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesOutputBuffer; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractContext.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractContext.java similarity index 99% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractContext.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractContext.java index 82bdf68b..f5efaa0e 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractContext.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractContext.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -22,7 +22,7 @@ import com.jd.blockchain.binaryproto.EnumContract; import com.jd.blockchain.binaryproto.EnumField; import com.jd.blockchain.binaryproto.EnumSpecification; import com.jd.blockchain.binaryproto.FieldSpec; -import com.jd.blockchain.binaryproto.impl2.EnumSpecificationInfo.EnumConstant; +import com.jd.blockchain.binaryproto.impl.EnumSpecificationInfo.EnumConstant; import com.jd.blockchain.utils.ValueType; import com.jd.blockchain.utils.io.BytesSerializable; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractEncoderImpl.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractEncoderImpl.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractEncoderImpl.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractEncoderImpl.java index 2c9c40b6..f8989cfc 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractEncoderImpl.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractEncoderImpl.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractEncoderLookup.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractEncoderLookup.java similarity index 90% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractEncoderLookup.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractEncoderLookup.java index 41de58b0..37f77e32 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractEncoderLookup.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractEncoderLookup.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.binaryproto.DataContractEncoder; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractGenericRefConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractGenericRefConverter.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractGenericRefConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractGenericRefConverter.java index a87c4daa..9b926463 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractGenericRefConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractGenericRefConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractHeader.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractHeader.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractHeader.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractHeader.java index 33700b65..13eea96c 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractHeader.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractHeader.java @@ -1,3 +1,4 @@ +package com.jd.blockchain.binaryproto.impl; //package com.jd.blockchain.binaryproto.impl2; // //public class DataContractHeader { diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractSpecification.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractSpecification.java similarity index 96% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractSpecification.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractSpecification.java index 7bdb2b65..8a2d05b1 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractSpecification.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractSpecification.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.util.ArrayList; import java.util.Arrays; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractValueConverter.java similarity index 95% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractValueConverter.java index e9d9d401..75b52095 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DataContractValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataContractValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.binaryproto.DataContractEncoder; import com.jd.blockchain.utils.io.BytesOutputBuffer; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataSpecificationImpl.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataSpecificationImpl.java deleted file mode 100644 index 4276c83c..00000000 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DataSpecificationImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -//package com.jd.blockchain.binaryproto.impl; -// -//import java.lang.reflect.Method; -//import java.util.*; -// -//import com.jd.blockchain.binaryproto.BinarySliceSpec; -//import com.jd.blockchain.binaryproto.DataField; -//import com.jd.blockchain.binaryproto.DataSpecification; -//import com.jd.blockchain.binaryproto.FieldSpec; -// -///** -// * Created by zhangshuang3 on 2018/6/21. -// */ -//public class DataSpecificationImpl implements DataSpecification { -// private int code; -// private long version; -// private String name; -// private String description; -// private List fieldList = new ArrayList(); -// private List sliceList = new ArrayList<>(); -// -// -// public DataSpecificationImpl() { -// -// } -// //sort method by order id -// public Map sortMapByValues (Map mths) { -// Set> mapEntries = mths.entrySet(); -// List> aList = new LinkedList>(mapEntries); -// //sort list -// Collections.sort(aList, new Comparator>() { -// @Override -// public int compare(Map.Entry ele1, -// Map.Entry ele2) { -// return (ele1.getValue().getAnnotation(DataField.class).order()) - (ele2.getValue().getAnnotation(DataField.class).order()); -// } -// }); -// int count = aList.size(); -// //init Capacity -// Map aMap = new LinkedHashMap(count); -// for(Map.Entry entry: aList) { -// aMap.put(entry.getKey(), entry.getValue()); -// } -// return aMap; -// } -// -// @Override -// public int getCode() { -// return code; -// } -// public void setCode(int code) { -// this.code = code; -// } -// -// @Override -// public long getVersion() { -// return version; -// } -// public void setVersion(long version) { -// this.version = version; -// } -// -// @Override -// public String getName() { -// return name; -// } -// public void setName(String name) { -// this.name = name; -// } -// -// @Override -// public String getDescription() { -// return description; -// } -// public void setDescription(String description) {this.description = description;} -// -// @Override -// public List getFields() { -// return fieldList; -// } -// public void setFields(FieldSpec field) {this.fieldList.add(field);} -// -// @Override -// public List getSlices() { -// return sliceList; -// } -// public void setSlices(BinarySliceSpec slice) { -// this.sliceList.add(slice); -// } -// @Override -// public String toHtml() { -// return null; -// } -//} diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicArrayFieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicArrayFieldEncoder.java similarity index 97% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicArrayFieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicArrayFieldEncoder.java index 06d8b987..0c76d4c3 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicArrayFieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicArrayFieldEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Array; import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicDataContract.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicDataContract.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicDataContract.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicDataContract.java index 01240304..aaa8780b 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicDataContract.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicDataContract.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicFieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicFieldEncoder.java similarity index 96% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicFieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicFieldEncoder.java index ea70b10c..b49a5238 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicFieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicFieldEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicValueConverter.java similarity index 90% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicValueConverter.java index 81d18c63..d4c225e5 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/DynamicValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/DynamicValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesOutputBuffer; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumContractRegistry.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumContractRegistry.java deleted file mode 100644 index 7ac27dee..00000000 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumContractRegistry.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jd.blockchain.binaryproto.impl; - -import java.util.HashMap; -import java.util.Map; - -import com.jd.blockchain.binaryproto.EnumSpecification; - -/** - * Created by zhangshuang3 on 2018/6/27. - */ -public class EnumContractRegistry { - private static Map enumSpecs = new HashMap(); - - public EnumContractRegistry() { - } - - public static EnumSpecification getEnumSpec(Class contractType) { - //find encoder from dataSpecs by contractType - for (String key : enumSpecs.keySet()) - { - if (key.equals(contractType.getName())) { - return enumSpecs.get(key); - } - } - return null; - } - - public static void setEnumSpecs(String key, EnumSpecification value) { - enumSpecs.put(key, value); - } - -} diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumSpecificationImpl.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumSpecificationImpl.java deleted file mode 100644 index 5a500802..00000000 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumSpecificationImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -//package com.jd.blockchain.binaryproto.impl; -// -//import java.lang.reflect.Method; -//import java.util.*; -// -//import com.jd.blockchain.binaryproto.EnumSpecification; -// -//import my.utils.ValueType; -// -///** -// * Created by zhangshuang3 on 2018/6/21. -// */ -//public class EnumSpecificationImpl implements EnumSpecification { -// private int code; -// private long version; -// private String name; -// private String description; -// private ValueType item; -// private Set intSet = new LinkedHashSet<>(); -// private Set stringSet = new LinkedHashSet<>(); -// private Map readEnumConstants = new HashMap(); -// -// public EnumSpecificationImpl(int code, String name, String description) { -// this.code = code; -// this.name = name; -// this.description = description; -// } -// @Override -// public int getCode() { -// return this.code; -// } -// public void setCode(int code) { -// this.code = code; -// } -// @Override -// public long getVersion(){ -// return this.version; -// } -// public void setVersion(long version) { -// this.version = version; -// } -// @Override -// public String getName() { -// return this.name; -// } -// public void setName(String name) { -// this.name = name; -// } -// @Override -// public String getDescription() { -// return this.description; -// } -// public void setDescription(String description) { -// this.description = description; -// } -// @Override -// public ValueType getValueType() { -// return this.item; -// } -// public void setItemType(ValueType item) { -// this.item = item; -// } -// @Override -// public Set getItemValues() { -// return this.intSet; -// } -// public void setItemValues(Integer item) { -// this.intSet.add(item); -// } -// @Override -// public Set getItemNames() { -// return this.stringSet; -// } -// public void setItemNames(String item) { -// this.stringSet.add(item); -// } -// -// public Map getEnumConstants() { -// return this.readEnumConstants; -// } -// public void setEnumConstants(Object enumConstant , Integer code) { -// this.readEnumConstants.put(enumConstant, code); -// } -//} diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/EnumSpecificationInfo.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumSpecificationInfo.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/EnumSpecificationInfo.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumSpecificationInfo.java index a93d064d..baf753c5 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/EnumSpecificationInfo.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumSpecificationInfo.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.util.LinkedHashSet; import java.util.Set; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/EnumValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumValueConverter.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/EnumValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumValueConverter.java index b3c621aa..f0c57fb8 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/EnumValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/EnumValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.binaryproto.DataContractException; import com.jd.blockchain.utils.ValueType; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldEncoder.java similarity index 86% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldEncoder.java index 404b9334..0541c5f0 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldSpecImpl.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldSpecImpl.java deleted file mode 100644 index fd47d667..00000000 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldSpecImpl.java +++ /dev/null @@ -1,142 +0,0 @@ -//package com.jd.blockchain.binaryproto.impl; -// -// -//import org.omg.CORBA.PUBLIC_MEMBER; -// -//import com.jd.blockchain.binaryproto.DataSpecification; -//import com.jd.blockchain.binaryproto.EnumSpecification; -//import com.jd.blockchain.binaryproto.FieldSpec; -// -//import my.utils.ValueType; -// -//import java.lang.reflect.Method; -// -///** -// * Created by zhangshuang3 on 2018/6/21. -// */ -//public class FieldSpecImpl implements FieldSpec { -// private int typeCode; -// private ValueType primitiveType; -// private EnumSpecification enumSpec; -// private DataSpecification dataSpec; -// private boolean isRefPubKey; -// private boolean isRefPrivKey; -// private boolean isRefHashDigest; -// private boolean isRefSignatureDigest; -// private boolean isRefIdentity; -// private boolean isRefNetworkAddr; -// private String name; -// private String description; -// private boolean isList; -// private int maxLength; -// private Class contractTypeResolver; -// private Method readMethod; -// -// public FieldSpecImpl() { -// -// } -// public Method getReadMethod() { -// return readMethod; -// } -// public void setReadMethod(Method readMethod) { -// this.readMethod = readMethod; -// readMethod.setAccessible(true); -// } -// @Override -// public int getTypeCode() {return typeCode;} -// public void setTypeCode(int typeCode) {this.typeCode = typeCode;} -// -// @Override -// public ValueType getPrimitiveType() {return primitiveType;} -// public void setPrimitiveType(ValueType primitiveType) { -// this.primitiveType = primitiveType; -// } -// @Override -// public EnumSpecification getRefEnum() {return enumSpec;} -// public void setRefEnum(EnumSpecification enumSpec) { -// this.enumSpec = enumSpec; -// } -// -// @Override -// public DataSpecification getRefContract() {return dataSpec;} -// public void setRefContract(DataSpecification dataSpec) { -// this.dataSpec = dataSpec; -// } -// -// @Override -// public boolean isRepeatable() {return isList;} -// public void setIsList(boolean isList) {this.isList = isList;} -// -// @Override -// public int getMaxSize() {return maxLength;} -// public void setMaxLength(int length) { -// this.maxLength = maxLength; -// } -// @Override -// public String getName() {return name;} -// public void setName(String name) { -// this.name = name; -// } -// -// @Override -// public String getDescription() {return description;} -// public void setDescription(String description) { -// this.description = description; -// } -// -// @Override -// public boolean isRefPubKey() { -// return isRefPubKey; -// } -// public void setRefPubKey(boolean pubKey) { -// this.isRefPubKey = pubKey; -// } -// -// @Override -// public boolean isRefPrivKey() { -// return isRefPrivKey; -// } -// public void setRefPrivKey(boolean privKey) { -// this.isRefPrivKey = privKey; -// } -// -// @Override -// public boolean isRefSignatureDigest() { -// return isRefSignatureDigest; -// } -// public void setRefSignatureDigest(boolean signatureDigest) { -// this.isRefSignatureDigest = signatureDigest; -// } -// -// @Override -// public boolean isRefHashDigest() { -// return isRefHashDigest; -// } -// public void setRefHashDigest(boolean hashDigest) { -// this.isRefHashDigest = hashDigest; -// } -// -// @Override -// public Class getContractTypeResolver() { -// return this.contractTypeResolver; -// } -// public void setContractTypeResolver(Class resolver) { -// this.contractTypeResolver = resolver; -// } -// -// @Override -// public boolean isRefIdentity() { -// return isRefIdentity; -// } -// public void setRefIdentity(boolean identity) { -// this.isRefIdentity = identity; -// } -// -// @Override -// public boolean isRefNetworkAddr() { -// return isRefNetworkAddr; -// } -// public void setRefNetworkAddr(boolean networkAddr) { -// this.isRefNetworkAddr = networkAddr; -// } -//} diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FieldSpecInfo.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldSpecInfo.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FieldSpecInfo.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldSpecInfo.java index f682a57b..6e8425bc 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FieldSpecInfo.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FieldSpecInfo.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.binaryproto.DataSpecification; import com.jd.blockchain.binaryproto.EnumSpecification; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedArrayFieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedArrayFieldEncoder.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedArrayFieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedArrayFieldEncoder.java index 43341d2b..f61ac22e 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedArrayFieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedArrayFieldEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Array; import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedFieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedFieldEncoder.java similarity index 97% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedFieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedFieldEncoder.java index d1d8d9d6..ba9c09d1 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedFieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedFieldEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedValueConverter.java similarity index 93% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedValueConverter.java index 2a39e2f8..60e84f96 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/FixedValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/FixedValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/GenericFieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/GenericFieldEncoder.java similarity index 99% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/GenericFieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/GenericFieldEncoder.java index 1f856e65..05615305 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/GenericFieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/GenericFieldEncoder.java @@ -1,3 +1,4 @@ +package com.jd.blockchain.binaryproto.impl; //package com.jd.blockchain.binaryproto.impl2; // //import java.lang.reflect.Array; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/HeaderEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/HeaderEncoder.java similarity index 98% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/HeaderEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/HeaderEncoder.java index a1fe4c36..4c41c353 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/HeaderEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/HeaderEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.binaryproto.BinarySliceSpec; import com.jd.blockchain.utils.io.BytesInputStream; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16CharConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16CharConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16CharConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16CharConverter.java index f026ea48..386ca5b4 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16CharConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16CharConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16CharWrapperConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16CharWrapperConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16CharWrapperConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16CharWrapperConverter.java index 10707ff2..b4c35fe4 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16CharWrapperConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16CharWrapperConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16ShortConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16ShortConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16ShortConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16ShortConverter.java index e7572687..1929239a 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16ShortConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16ShortConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16ShortWrapperConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16ShortWrapperConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16ShortWrapperConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16ShortWrapperConverter.java index b7861c45..89fc7ac0 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int16ShortWrapperConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int16ShortWrapperConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int32IntConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int32IntConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int32IntConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int32IntConverter.java index 79356f2a..9c3e6fdf 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int32IntConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int32IntConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int32IntWrapperConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int32IntWrapperConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int32IntWrapperConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int32IntWrapperConverter.java index 2dbe3bb2..707cce08 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int32IntWrapperConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int32IntWrapperConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int64LongConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int64LongConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int64LongConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int64LongConverter.java index 9810ae73..481a9d97 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int64LongConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int64LongConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int64LongWrapperConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int64LongWrapperConverter.java similarity index 92% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int64LongWrapperConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int64LongWrapperConverter.java index ebf09087..80df35fb 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int64LongWrapperConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int64LongWrapperConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; import com.jd.blockchain.utils.io.BytesUtils; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int8ByteConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int8ByteConverter.java similarity index 91% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int8ByteConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int8ByteConverter.java index d38b7afc..fc9ce465 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int8ByteConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int8ByteConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int8ByteWrapperConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int8ByteWrapperConverter.java similarity index 91% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int8ByteWrapperConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int8ByteWrapperConverter.java index d8cf510b..ed088a91 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/Int8ByteWrapperConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/Int8ByteWrapperConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/RepeatableFieldEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/RepeatableFieldEncoder.java similarity index 94% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/RepeatableFieldEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/RepeatableFieldEncoder.java index fbf15a47..44a38859 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/RepeatableFieldEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/RepeatableFieldEncoder.java @@ -1,3 +1,4 @@ +package com.jd.blockchain.binaryproto.impl; //package com.jd.blockchain.binaryproto.impl2; // //import java.lang.reflect.Method; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/SliceEncoder.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/SliceEncoder.java similarity index 96% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/SliceEncoder.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/SliceEncoder.java index 1f87e0f2..1c465a71 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/SliceEncoder.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/SliceEncoder.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.binaryproto.BinarySliceSpec; import com.jd.blockchain.utils.io.BytesInputStream; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/StringValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/StringValueConverter.java similarity index 93% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/StringValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/StringValueConverter.java index eaf96a21..725e3960 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/StringValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/StringValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; import com.jd.blockchain.utils.io.BytesOutputBuffer; import com.jd.blockchain.utils.io.BytesSlice; diff --git a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/ValueConverter.java b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/ValueConverter.java similarity index 77% rename from source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/ValueConverter.java rename to source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/ValueConverter.java index 74bf0a00..6c4c8e01 100644 --- a/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl2/ValueConverter.java +++ b/source/binary-proto/src/main/java/com/jd/blockchain/binaryproto/impl/ValueConverter.java @@ -1,4 +1,4 @@ -package com.jd.blockchain.binaryproto.impl2; +package com.jd.blockchain.binaryproto.impl; public interface ValueConverter {