From 81fa3b3ac33742ad783de1d9d43c51714cf3cde4 Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 6 Jul 2016 18:11:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/AbstractDataSerializable.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java index cf64f3351..9c9174cb2 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java @@ -5,15 +5,11 @@ import com.ai.cloud.skywalking.serialize.SerializedFactory; import com.ai.cloud.skywalking.util.IntegerAssist; import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; /** * Created by wusheng on 16/7/4. */ public abstract class AbstractDataSerializable implements ISerializable, NullableClass { - private static Set DATA_TYPE_SCOPE = new HashSet(); - public abstract int getDataType(); public abstract byte[] getData(); @@ -29,20 +25,20 @@ public abstract class AbstractDataSerializable implements ISerializable, Nullabl */ @Override public byte[] convert2Bytes() { - byte[] messagePackage = new byte[4 + getData().length]; - appendingDataText(messagePackage); - appendingDataLength(messagePackage); + byte[] messageByteData = getData(); + byte[] messagePackage = new byte[4 + messageByteData.length]; + packData(messageByteData, messagePackage); + setPackageLength(messagePackage); return messagePackage; } - private void appendingDataLength(byte[] dataByte) { + private void setPackageLength(byte[] messagePackage) { byte[] type = IntegerAssist.intToBytes(this.getDataType()); - System.arraycopy(type, 0, dataByte, 0, type.length); + System.arraycopy(type, 0, messagePackage, 0, type.length); } - private byte[] appendingDataText(byte[] dataByte) { - System.arraycopy(getData(), 0, dataByte, 4, dataByte.length); - return dataByte; + private void packData(byte[] messageByteData, byte[] messagePackage) { + System.arraycopy(messageByteData, 0, messagePackage, 4, messageByteData.length); } @Override