You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/07/26 11:51:25 UTC
[incubator-inlong] branch master updated: [INLONG-800] Fix
codestyle of some comments and methods names. (#593)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new eb77a15 [INLONG-800] Fix codestyle of some comments and methods names. (#593)
eb77a15 is described below
commit eb77a159a22b9a589b6d90776dbc20eaf7993b22
Author: Roc Marshal <64...@users.noreply.github.com>
AuthorDate: Mon Jul 26 19:51:20 2021 +0800
[INLONG-800] Fix codestyle of some comments and methods names. (#593)
---
.../apache/inlong/commons/msg/DataInputBuffer.java | 2 +-
.../inlong/commons/msg/DataOutputBuffer.java | 2 +-
.../inlong/commons/msg/TDMsgAttrBuilder.java | 48 +++++++++++-----------
.../inlong/dataproxy/codec/EncodeObject.java | 2 +-
.../inlong/dataproxy/codec/ProtocolDecoder.java | 2 +-
.../inlong/dataproxy/codec/ProtocolEncoder.java | 3 +-
.../dataproxy/config/EncryptConfigEntry.java | 2 +-
7 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataInputBuffer.java b/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataInputBuffer.java
index 352b8a8..aaf3405 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataInputBuffer.java
+++ b/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataInputBuffer.java
@@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
/**
- * A reusable {@link DataInput} implementation that reads from an in-memory
+ * A reusable {@link java.io.DataInput} implementation that reads from an in-memory
* buffer.
*
* <p>This saves memory over creating a new DataInputStream and
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataOutputBuffer.java b/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataOutputBuffer.java
index 207800f..4dab1ff 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataOutputBuffer.java
+++ b/inlong-common/src/main/java/org/apache/inlong/commons/msg/DataOutputBuffer.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.io.OutputStream;
/**
- * A reusable {@link DataOutput} implementation that writes to an in-memory
+ * A reusable {@link java.io.DataOutput} implementation that writes to an in-memory
* buffer.
*
* <p>This saves memory over creating a new DataOutputStream and
diff --git a/inlong-common/src/main/java/org/apache/inlong/commons/msg/TDMsgAttrBuilder.java b/inlong-common/src/main/java/org/apache/inlong/commons/msg/TDMsgAttrBuilder.java
index df90de0..7207f2a 100644
--- a/inlong-common/src/main/java/org/apache/inlong/commons/msg/TDMsgAttrBuilder.java
+++ b/inlong-common/src/main/java/org/apache/inlong/commons/msg/TDMsgAttrBuilder.java
@@ -290,7 +290,7 @@ public class TDMsgAttrBuilder {
attrBuffer.append("&tt=").append(tt);
}
if (this.p != null) {
- attrBuffer.append("&p=").append(p.toString());
+ attrBuffer.append("&p=").append(p);
}
}
return attrBuffer.toString();
@@ -304,11 +304,11 @@ public class TDMsgAttrBuilder {
}
- public static MsgAttrProtocolM0 getProtololM0() {
+ public static MsgAttrProtocolM0 getProtocolM0() {
return new MsgAttrProtocolM0();
}
- public static MsgAttrProtocolM100 getProtololM100() {
+ public static MsgAttrProtocolM100 getProtocolM100() {
return new MsgAttrProtocolM100();
}
@@ -319,93 +319,93 @@ public class TDMsgAttrBuilder {
SimpleDateFormat f1 =
new SimpleDateFormat("yyyyMMddHH");
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid").setTimeType(TimeType.S)
.setTime(String.valueOf(System.currentTimeMillis() / 1000))
.buildAttr());
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid").setTime(System.currentTimeMillis())
.setTimeType(TimeType.MS).buildAttr());
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid")
.setTime(f1.format(new Date(System.currentTimeMillis())))
.buildAttr());
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid")
.setTime(f.format(new Date(System.currentTimeMillis())))
.setTimeType(TimeType.STANDARD).buildAttr());
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid")
.setTime(f1.format(new Date(System.currentTimeMillis())))
.setTimeType(TimeType.NORMAL).buildAttr());
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid").setTimeType(TimeType.S)
.setTime(String.valueOf(System.currentTimeMillis() / 1000))
.setPartitionUnit(PartitionUnit.DAY).buildAttr());
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid").setTimeType(TimeType.S)
.setTime(String.valueOf(System.currentTimeMillis() / 1000))
.setPartitionUnit(PartitionUnit.HOUR).buildAttr());
- System.out.println(TDMsgAttrBuilder.getProtololM0()
+ System.out.println(TDMsgAttrBuilder.getProtocolM0()
.setId("interfaceid").setTimeType(TimeType.S)
.setTime(String.valueOf(System.currentTimeMillis() / 1000))
.setPartitionUnit(PartitionUnit.QUARTER).buildAttr());
System.out.println();
- System.out.print(TDMsgAttrBuilder.getProtololM100().buildAttr());
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().buildAttr());
System.out.println("\t\t\t\t\t\t// ---- all the param is "
+ "default : s=\\t, idp=0, tp=1, tt=#ms, p=h ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.buildAttr());
System.out.println("\t\t\t\t\t// ---- : idp=0, tp=1, tt=#ms, p=h ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setIdPos(0).buildAttr());
System.out.println("\t\t\t\t\t// ---- : tp=1, tt=#ms, p=h ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setTimePos(1).buildAttr());
System.out.println("\t\t\t\t\t// ---- : idp=0, tt=#ms, p=h ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setIdPos(0).setTimePos(1).buildAttr());
System.out.println("\t\t\t\t// ---- : tt=#ms, p=h ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setIdPos(0).setTimePos(1).setTimeType(TimeType.S).buildAttr());
System.out.println("\t\t\t// ---- : p=h ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setIdPos(0).setTimePos(1)
.setPartitionUnit(PartitionUnit.QUARTER).buildAttr());
System.out.println("\t\t\t// ---- : tt=#s ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setIdPos(0).setTimePos(1).setTimeType(TimeType.MS)
.setPartitionUnit(PartitionUnit.QUARTER).buildAttr());
System.out.println("\t\t\t// ---- : all ");
- System.out.print(TDMsgAttrBuilder.getProtololM100()
+ System.out.print(TDMsgAttrBuilder.getProtocolM100()
.setId("interfaceid").setSpliter(",").setIdPos(0).setTimePos(1)
.setTimeType(TimeType.MS)
.setPartitionUnit(PartitionUnit.QUARTER).buildAttr());
System.out.println("\t// ---- : id is set so idp is ignored ");
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setIdPos(0).setTimePos(1).setTime(System.currentTimeMillis())
.setTimeType(TimeType.MS)
.setPartitionUnit(PartitionUnit.QUARTER).buildAttr());
System.out.println("\t\t\t// ---- : t is set so tp is ignored ");
- System.out.print(TDMsgAttrBuilder.getProtololM100()
+ System.out.print(TDMsgAttrBuilder.getProtocolM100()
.setId("interfaceid").setSpliter(",").setIdPos(0).setTimePos(1)
.setTime(System.currentTimeMillis()).setTimeType(TimeType.MS)
.setPartitionUnit(PartitionUnit.QUARTER).buildAttr());
System.out
.println("\t\t// ---- : id and t are all set so idpos and tp are all ignored ");
- System.out.print(TDMsgAttrBuilder.getProtololM100()
+ System.out.print(TDMsgAttrBuilder.getProtocolM100()
.setId("interfaceid").setSpliter(",").setIdPos(0).setTimePos(1)
.setTime(f1.format(new Date(System.currentTimeMillis())))
.setTimeType(TimeType.NORMAL)
@@ -431,7 +431,7 @@ public class TDMsgAttrBuilder {
// tdmsg.addMsg(attr, data0);
// result = tdmsg.buildArray();
// System.out.println(new String(result));
- System.out.print(TDMsgAttrBuilder.getProtololM100().setSpliter(",")
+ System.out.print(TDMsgAttrBuilder.getProtocolM100().setSpliter(",")
.setIdPos(0).setTimePos(1)
.setTimeType(TimeType.STANDARD)
diff --git a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/EncodeObject.java b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/EncodeObject.java
index d8d72d9..483b8ae 100644
--- a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/EncodeObject.java
+++ b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/EncodeObject.java
@@ -76,7 +76,7 @@ public class EncodeObject {
}
/* Used by serialization.But never used */
-// old version:we need add message id by attr
+ // old version:we need add message id by attr
public EncodeObject(byte[] bodyBytes, String attributes, String messageId) {
this.bodyBytes = bodyBytes;
this.messageId = messageId;
diff --git a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolDecoder.java b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolDecoder.java
index 4b43787..fa3fbb9 100644
--- a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolDecoder.java
+++ b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolDecoder.java
@@ -34,7 +34,7 @@ public class ProtocolDecoder extends FrameDecoder {
@Override
protected Object decode(ChannelHandlerContext ctx, Channel channel,
ChannelBuffer buffer) throws Exception {
-// if(!channel.isConnected()||channel.isReadable()){return null;}
+ // if(!channel.isConnected()||channel.isReadable()){return null;}
buffer.markReaderIndex();
diff --git a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolEncoder.java b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolEncoder.java
index b3f033a..652b0dd 100644
--- a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolEncoder.java
+++ b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/codec/ProtocolEncoder.java
@@ -334,7 +334,8 @@ public class ProtocolEncoder extends OneToOneEncoder {
}
return buf;
}
-*/
+ */
+
private ChannelBuffer writeToBuf3(EncodeObject object) {
ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
try {
diff --git a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/config/EncryptConfigEntry.java b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/config/EncryptConfigEntry.java
index a045ba7..5c935a9 100644
--- a/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/config/EncryptConfigEntry.java
+++ b/inlong-dataproxy-sdk/src/main/java/org/apache/inlong/dataproxy/config/EncryptConfigEntry.java
@@ -45,7 +45,7 @@ public class EncryptConfigEntry implements java.io.Serializable {
this.pubKey = pubKey;
this.desKey = null;
this.rsaEncryptedKey = null;
-// this.rsaKey = EncryptUtil.loadPublicKeyByText(pubKey);
+ // this.rsaKey = EncryptUtil.loadPublicKeyByText(pubKey);
}
public String getVersion() {