This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new dca3e351e [improve] code according to code specifications (#2809)
dca3e351e is described below
commit dca3e351ed28888522bec83104ff1356b8797cda
Author: po-168 <[email protected]>
AuthorDate: Fri Nov 8 19:16:19 2024 +0800
[improve] code according to code specifications (#2809)
Co-authored-by: shown <[email protected]>
Co-authored-by: aias00 <[email protected]>
---
.../apache/hertzbeat/alert/service/impl/AlertServiceImpl.java | 3 +--
.../collector/collect/ipmi2/protocol/common/IpmiCode.java | 6 ++++--
.../collect/ipmi2/protocol/common/IpmiEncapsulation.java | 6 ++++--
.../ipmi2/protocol/ipmi/AbstractIpmiSessionWrapper.java | 3 ++-
.../ipmi2/protocol/ipmi/command/AbstractIpmiCommand.java | 1 +
.../protocol/ipmi/security/confidentiality/AesCbc128.java | 10 +++++++---
.../collector/collect/ipmi2/protocol/rmcp/RmcpPacket.java | 3 ++-
.../apache/hertzbeat/collector/collect/kafka/KafkaConnect.java | 6 +++---
8 files changed, 24 insertions(+), 14 deletions(-)
diff --git
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
index b411ecdd8..646f669e1 100644
---
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
+++
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertServiceImpl.java
@@ -25,7 +25,6 @@ import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -190,7 +189,7 @@ public class AlertServiceImpl implements AlertService {
alert = AlertReport.builder()
.content("error do not has cloud service api")
.alertName("/api/alerts/report/" + cloudServiceName)
- .alertTime(new Date().getTime())
+ .alertTime(Instant.now().getEpochSecond())
.priority(1)
.reportType(1)
.build();
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiCode.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiCode.java
index 1f6625f49..042c6c118 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiCode.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiCode.java
@@ -38,9 +38,11 @@ public class IpmiCode {
}
public static <T extends Enum<T> & IpmiCode.Code> T fromByte(Class<T>
type, byte code) {
- for (T value : type.getEnumConstants())
- if (value.getCode() == code)
+ for (T value : type.getEnumConstants()) {
+ if (value.getCode() == code) {
return value;
+ }
+ }
throw new IllegalArgumentException("Unknown " + type.getSimpleName() +
" code 0x" + UnsignedBytes.toString(code, 16));
}
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiEncapsulation.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiEncapsulation.java
index 4eb74842e..6c0835f24 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiEncapsulation.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/common/IpmiEncapsulation.java
@@ -30,10 +30,12 @@ public class IpmiEncapsulation {
}
public static <T> T getEncapsulated(Class<T> type, Object value) {
- if (type.isInstance(value))
+ if (type.isInstance(value)) {
return type.cast(value);
- if (value instanceof Encapsulation)
+ }
+ if (value instanceof Encapsulation) {
return ((Encapsulation) value).getEncapsulated(type);
+ }
return null;
}
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/AbstractIpmiSessionWrapper.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/AbstractIpmiSessionWrapper.java
index 9bf2ed9ae..e9f106d85 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/AbstractIpmiSessionWrapper.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/AbstractIpmiSessionWrapper.java
@@ -71,8 +71,9 @@ public abstract class AbstractIpmiSessionWrapper extends
AbstractWireable implem
@Override
public <T> T getEncapsulated(Class<T> type) {
- if (type.isInstance(this))
+ if (type.isInstance(this)) {
return type.cast(this);
+ }
return IpmiEncapsulation.getEncapsulated(type, getIpmiPayload());
}
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/command/AbstractIpmiCommand.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/command/AbstractIpmiCommand.java
index e56e6d98c..7c59be27c 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/command/AbstractIpmiCommand.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/command/AbstractIpmiCommand.java
@@ -61,6 +61,7 @@ public abstract class AbstractIpmiCommand extends
AbstractIpmiPayload implements
return rqLun;
}
+ @Override
public void setRqLun(IpmiLun rqLun) {
this.rqLun = rqLun;
}
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/security/confidentiality/AesCbc128.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/security/confidentiality/AesCbc128.java
index da4bc2584..3bb421a79 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/security/confidentiality/AesCbc128.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/ipmi/security/confidentiality/AesCbc128.java
@@ -75,9 +75,11 @@ public class AesCbc128 extends AbstractIpmiConfidentiality{
this.init(Cipher.DECRYPT_MODE, secretKey, iv);
this.update(in, buffer);
int padLength =
ByteConvertUtils.byteToInt(buffer.get(buffer.position() - 1));
- for (int i = 1; i <= padLength; i++)
- if (ByteConvertUtils.byteToInt(buffer.get(buffer.position() - i -
1)) != padLength - i + 1)
+ for (int i = 1; i <= padLength; i++) {
+ if (ByteConvertUtils.byteToInt(buffer.get(buffer.position() - i -
1)) != padLength - i + 1) {
throw new IllegalArgumentException("Bad pad byte " + i);
+ }
+ }
buffer.limit(buffer.position() - padLength - 1);
buffer.flip();
return buffer;
@@ -86,8 +88,9 @@ public class AesCbc128 extends AbstractIpmiConfidentiality{
@Override
public int pad(int length) {
int t = length % 16;
- if (t == 0)
+ if (t == 0) {
return 0;
+ }
return 16 - t;
}
@@ -96,6 +99,7 @@ public class AesCbc128 extends AbstractIpmiConfidentiality{
return 16 + length + pad(length);
}
+ @Override
public void update(ByteBuffer input, ByteBuffer output) throws
ShortBufferException {
super.update(input, output);
}
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/rmcp/RmcpPacket.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/rmcp/RmcpPacket.java
index f879979a5..cffb2b6a2 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/rmcp/RmcpPacket.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ipmi2/protocol/rmcp/RmcpPacket.java
@@ -78,8 +78,9 @@ public class RmcpPacket extends AbstractWireable implements
Packet{
@Override
public <T> T getEncapsulated(Class<T> type) {
- if (type.isInstance(this))
+ if (type.isInstance(this)) {
return type.cast(this);
+ }
return IpmiEncapsulation.getEncapsulated(type, getData());
}
diff --git
a/hertzbeat-collector/hertzbeat-collector-kafka/src/main/java/org/apache/hertzbeat/collector/collect/kafka/KafkaConnect.java
b/hertzbeat-collector/hertzbeat-collector-kafka/src/main/java/org/apache/hertzbeat/collector/collect/kafka/KafkaConnect.java
index 2d0bbb11b..a898c6824 100644
---
a/hertzbeat-collector/hertzbeat-collector-kafka/src/main/java/org/apache/hertzbeat/collector/collect/kafka/KafkaConnect.java
+++
b/hertzbeat-collector/hertzbeat-collector-kafka/src/main/java/org/apache/hertzbeat/collector/collect/kafka/KafkaConnect.java
@@ -46,9 +46,9 @@ public class KafkaConnect extends
AbstractConnection<AdminClient> {
}
@Override
- public void closeConnection() throws Exception {
- if (this.adminClient != null) {
- this.adminClient.close();
+ public void closeConnection() {
+ if (adminClient != null) {
+ adminClient.close();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
