This is an automated email from the ASF dual-hosted git repository.
gongchao 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 6509b8bfc6 [MINOR UPDATE] always specify the char encoding in getBytes
(#3011)
6509b8bfc6 is described below
commit 6509b8bfc6a32aeb7db869ed001081e3a69f52d8
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Jan 23 11:40:59 2025 +0100
[MINOR UPDATE] always specify the char encoding in getBytes (#3011)
Co-authored-by: aias00 <[email protected]>
---
.../service/AlertDefineJsonImExportServiceTest.java | 3 ++-
.../collector/collect/telnet/TelnetCollectImpl.java | 3 ++-
.../collect/websocket/WebsocketCollectImpl.java | 19 ++++++++++---------
.../hertzbeat/common/entity/message/CollectRep.java | 3 ++-
.../serialize/KafkaMetricsDataDeserializerTest.java | 3 ++-
.../apache/hertzbeat/common/util/FileUtilTest.java | 11 ++++++++---
.../collect/basic/http/DockerMonitorE2eTest.java | 6 ++++--
.../manager/controller/PluginControllerTest.java | 4 +++-
.../manager/service/JsonImExportServiceTest.java | 3 ++-
.../hertzbeat/manager/service/PluginServiceTest.java | 6 +++++-
.../service/impl/LocalFileStorageServiceImpl.java | 2 +-
.../templatehub/controller/VersionControllerTest.java | 2 +-
.../controller/VersionDOControllerTest.java | 2 +-
13 files changed, 43 insertions(+), 24 deletions(-)
diff --git
a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java
b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java
index 34824e6215..d41f79c29b 100644
---
a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java
+++
b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java
@@ -33,6 +33,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.hertzbeat.alert.dto.AlertDefineDTO;
import org.apache.hertzbeat.alert.dto.ExportAlertDefineDTO;
@@ -68,7 +69,7 @@ class AlertDefineJsonImExportServiceTest {
@BeforeEach
public void setup() {
- inputStream = new ByteArrayInputStream(JSON_DATA.getBytes());
+ inputStream = new
ByteArrayInputStream(JSON_DATA.getBytes(StandardCharsets.UTF_8));
AlertDefineDTO alertDefine = new AlertDefineDTO();
alertDefine.setName("App1");
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java
index 1961ada9cc..20602caced 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/telnet/TelnetCollectImpl.java
@@ -20,6 +20,7 @@ package org.apache.hertzbeat.collector.collect.telnet;
import java.io.IOException;
import java.io.OutputStream;
import java.net.ConnectException;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -122,7 +123,7 @@ public class TelnetCollectImpl extends AbstractCollect {
return new HashMap<>(16);
}
OutputStream outputStream = telnetClient.getOutputStream();
- outputStream.write(cmd.getBytes());
+ outputStream.write(cmd.getBytes(StandardCharsets.UTF_8));
outputStream.flush();
String result = new
String(telnetClient.getInputStream().readAllBytes());
String[] lines = result.split("\n");
diff --git
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java
index cd1c24ec90..1ff8c1aa4d 100644
---
a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java
+++
b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/websocket/WebsocketCollectImpl.java
@@ -28,6 +28,7 @@ import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
import java.security.SecureRandom;
import java.util.Base64;
import java.util.HashMap;
@@ -128,16 +129,16 @@ public class WebsocketCollectImpl extends AbstractCollect
{
byte[] key = generateRandomKey();
String base64Key = base64Encode(key);
String requestLine = "GET " + websocketProtocol.getPath() + "
HTTP/1.1\r\n";
- out.write(requestLine.getBytes());
+ out.write(requestLine.getBytes(StandardCharsets.UTF_8));
String hostName = InetAddress.getLocalHost().getHostAddress();
- out.write(("Host:" + hostName + "\r\n").getBytes());
- out.write("Upgrade: websocket\r\n".getBytes());
- out.write("Connection: Upgrade\r\n".getBytes());
- out.write("Sec-WebSocket-Version: 13\r\n".getBytes());
- out.write("Sec-WebSocket-Extensions: chat, superchat\r\n".getBytes());
- out.write(("Sec-WebSocket-Key: " + base64Key + "\r\n").getBytes());
- out.write("Content-Length: 0\r\n".getBytes());
- out.write("\r\n".getBytes());
+ out.write(("Host:" + hostName +
"\r\n").getBytes(StandardCharsets.UTF_8));
+ out.write("Upgrade: websocket\r\n".getBytes(StandardCharsets.UTF_8));
+ out.write("Connection: Upgrade\r\n".getBytes(StandardCharsets.UTF_8));
+ out.write("Sec-WebSocket-Version:
13\r\n".getBytes(StandardCharsets.UTF_8));
+ out.write("Sec-WebSocket-Extensions: chat,
superchat\r\n".getBytes(StandardCharsets.UTF_8));
+ out.write(("Sec-WebSocket-Key: " + base64Key +
"\r\n").getBytes(StandardCharsets.UTF_8));
+ out.write("Content-Length: 0\r\n".getBytes(StandardCharsets.UTF_8));
+ out.write("\r\n".getBytes(StandardCharsets.UTF_8));
out.flush();
}
diff --git
a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
b/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
index 0ff00a1801..f6ecb6ab3a 100644
---
a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
+++
b/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java
@@ -22,6 +22,7 @@ package org.apache.hertzbeat.common.entity.message;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.channels.Channels;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -406,7 +407,7 @@ public final class CollectRep {
fieldIndex <
row.getColumnsList().size()) {
String value = row.getColumns(fieldIndex);
if (value != null) {
- vector.set(rowIndex, value.getBytes());
+ vector.set(rowIndex,
value.getBytes(StandardCharsets.UTF_8));
}
}
}
diff --git
a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java
b/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java
index 06f013f8c8..a5fa00b355 100644
---
a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java
+++
b/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/serialize/KafkaMetricsDataDeserializerTest.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.channels.Channels;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.arrow.vector.VectorSchemaRoot;
import org.apache.arrow.vector.ipc.ArrowStreamWriter;
@@ -86,7 +87,7 @@ class KafkaMetricsDataDeserializerTest {
@Test
void testDeserializeWithInvalidBytes() {
- byte[] invalidBytes = "invalid data".getBytes();
+ byte[] invalidBytes = "invalid data".getBytes(StandardCharsets.UTF_8);
assertThrows(RuntimeException.class, () ->
deserializer.deserialize("", invalidBytes));
}
diff --git
a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java
b/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java
index b177216be7..d19d7c21e2 100644
---
a/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java
+++
b/hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/FileUtilTest.java
@@ -24,6 +24,8 @@ import org.junit.jupiter.api.Test;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockMultipartFile;
+import java.nio.charset.StandardCharsets;
+
/**
* test case for {@link FileUtil}.
*/
@@ -41,9 +43,12 @@ class FileUtilTest {
@BeforeEach
void setUp() {
- jsonFile = new MockMultipartFile("file", "test.json",
MediaType.APPLICATION_JSON_VALUE, "test content".getBytes());
- excelFile = new MockMultipartFile("file", "test.xlsx", EXCEL_TYPE,
"test content".getBytes());
- yamlFile = new MockMultipartFile("file", "test.yaml", YAML_TYPE, "test
content".getBytes());
+ jsonFile = new MockMultipartFile("file", "test.json",
MediaType.APPLICATION_JSON_VALUE,
+ "test content".getBytes(StandardCharsets.UTF_8));
+ excelFile = new MockMultipartFile("file", "test.xlsx", EXCEL_TYPE,
+ "test content".getBytes(StandardCharsets.UTF_8));
+ yamlFile = new MockMultipartFile("file", "test.yaml", YAML_TYPE,
+ "test content".getBytes(StandardCharsets.UTF_8));
emptyFile = new MockMultipartFile("file", "", null, (byte[]) null);
}
diff --git
a/hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/http/DockerMonitorE2eTest.java
b/hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/http/DockerMonitorE2eTest.java
index 12cb606d25..ca74b7bb7a 100644
---
a/hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/http/DockerMonitorE2eTest.java
+++
b/hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/http/DockerMonitorE2eTest.java
@@ -40,6 +40,7 @@ import org.springframework.util.ResourceUtils;
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.HashMap;
import java.util.LinkedList;
@@ -103,9 +104,10 @@ public class DockerMonitorE2eTest extends
AbstractCollectE2eTest {
private void sendJsonResponse(HttpExchange exchange, String response)
throws IOException {
exchange.getResponseHeaders().set("Content-Type", "application/json");
- exchange.sendResponseHeaders(200, response.getBytes().length);
+ final byte[] array = response.getBytes(StandardCharsets.UTF_8);
+ exchange.sendResponseHeaders(200, array.length);
try (OutputStream os = exchange.getResponseBody()) {
- os.write(response.getBytes());
+ os.write(array);
}
}
diff --git
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/PluginControllerTest.java
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/PluginControllerTest.java
index d2de12ae7d..a1991e2c23 100644
---
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/PluginControllerTest.java
+++
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/PluginControllerTest.java
@@ -19,6 +19,8 @@ package org.apache.hertzbeat.manager.controller;
import static
org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static
org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -62,7 +64,7 @@ class PluginControllerTest {
"jarFile",
"plugin-test.jar",
"application/java-archive",
- "This is the file content".getBytes()
+ "This is the file content".getBytes(StandardCharsets.UTF_8)
);
this.mockMvc.perform(MockMvcRequestBuilders.multipart("/api/plugin")
diff --git
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java
index aed7febab8..601acac7a9 100644
---
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java
+++
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java
@@ -32,6 +32,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.hertzbeat.manager.service.impl.AbstractImExportServiceImpl;
import org.apache.hertzbeat.manager.service.impl.JsonImExportServiceImpl;
@@ -66,7 +67,7 @@ class JsonImExportServiceTest {
void testParseImport() throws IOException {
String json = "[{}]";
- ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes());
+ ByteArrayInputStream bis = new
ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8));
AbstractImExportServiceImpl.MonitorDTO monitorDTO = new
AbstractImExportServiceImpl.MonitorDTO();
diff --git
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/PluginServiceTest.java
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/PluginServiceTest.java
index 3576ea4837..5effc78ebe 100644
---
a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/PluginServiceTest.java
+++
b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/PluginServiceTest.java
@@ -28,6 +28,8 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -87,7 +89,9 @@ class PluginServiceTest {
PluginServiceImpl service = spy(pluginService);
doReturn(metadata).when(service).validateJarFile(any());
- MockMultipartFile mockFile = new MockMultipartFile("file",
"test-plugin.jar", "application/java-archive", "plugin-content".getBytes());
+ MockMultipartFile mockFile = new MockMultipartFile(
+ "file", "test-plugin.jar", "application/java-archive",
+ "plugin-content".getBytes(StandardCharsets.UTF_8));
PluginUpload pluginUpload = new PluginUpload(mockFile, "Test Plugin",
true);
when(metadataDao.save(any(PluginMetadata.class))).thenReturn(new
PluginMetadata());
diff --git
a/template-marketplace/hertzbeat-template-hub/src/main/java/org/apache/hertzbeat/templatehub/service/impl/LocalFileStorageServiceImpl.java
b/template-marketplace/hertzbeat-template-hub/src/main/java/org/apache/hertzbeat/templatehub/service/impl/LocalFileStorageServiceImpl.java
index 82f0f076ec..0a37535acb 100644
---
a/template-marketplace/hertzbeat-template-hub/src/main/java/org/apache/hertzbeat/templatehub/service/impl/LocalFileStorageServiceImpl.java
+++
b/template-marketplace/hertzbeat-template-hub/src/main/java/org/apache/hertzbeat/templatehub/service/impl/LocalFileStorageServiceImpl.java
@@ -49,7 +49,7 @@ public class LocalFileStorageServiceImpl implements
FileStorageService {
// Define the file path
File localFile = new File(directory,fileName);
try (FileOutputStream outputStream = new
FileOutputStream(localFile)) {
- outputStream.write(file.getBytes());
+ outputStream.write(file.getBytes(StandardCharsets.UTF_8));
}
// Return the file URL (local file path in this case)
diff --git
a/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionControllerTest.java
b/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionControllerTest.java
index 7a1a5c7c8b..5b1d500dd5 100644
---
a/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionControllerTest.java
+++
b/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionControllerTest.java
@@ -132,7 +132,7 @@ class VersionControllerTest {
when(versionService.upload(any(), any())).thenReturn(true);
mockMvc.perform(multipart("/version/upload")
- .file("file", "dummy content".getBytes())
+ .file("file", "dummy
content".getBytes(StandardCharsets.UTF_8))
.param("templateDto", templateDtoJson))
.andExpect(status().isOk())
.andExpect(jsonPath("$.code").value(0));
diff --git
a/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionDOControllerTest.java
b/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionDOControllerTest.java
index c61829e90e..b15e3f25e9 100644
---
a/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionDOControllerTest.java
+++
b/template-marketplace/hertzbeat-template-hub/src/test/java/org/apache/hertzbeat/templatehub/controller/VersionDOControllerTest.java
@@ -132,7 +132,7 @@ class VersionDOControllerTest {
when(versionService.upload(any(), any())).thenReturn(true);
mockMvc.perform(multipart("/version/upload")
- .file("file", "dummy content".getBytes())
+ .file("file", "dummy
content".getBytes(StandardCharsets.UTF_8))
.param("templateDto", templateDtoJson))
.andExpect(status().isOk())
.andExpect(jsonPath("$.msg").value("upload success"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
