Merge pull request #1192 from LIU-WEI-git/grpc_upgrade
diff --git a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java
index ed9fbca..f28209b 100644
--- a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java
+++ b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/handler/TopicsHandler.java
@@ -24,6 +24,7 @@
import org.apache.eventmesh.admin.rocketmq.util.JsonUtils;
import org.apache.eventmesh.admin.rocketmq.util.NetUtils;
import org.apache.eventmesh.admin.rocketmq.util.RequestMapping;
+import org.apache.eventmesh.common.Constants;
import org.apache.commons.lang3.StringUtils;
@@ -50,10 +51,9 @@
OutputStream out = httpExchange.getResponseBody();
httpExchange.sendResponseHeaders(500, 0);
- String result = String.format("Please check your request url");
+ String result = String.format("Please check your request url: %s", httpExchange.getRequestURI());
logger.error(result);
- out.write(result.getBytes());
- return;
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
}
public void createTopicHandler(HttpExchange httpExchange) throws IOException {
@@ -68,7 +68,7 @@
if (StringUtils.isBlank(topic)) {
result = "Create topic failed. Parameter topic not found.";
logger.error(result);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
@@ -80,22 +80,19 @@
httpExchange.sendResponseHeaders(200, 0);
result = JsonUtils.toJson(topicResponse);
logger.info(result);
- out.write(result.getBytes());
- return;
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} else {
httpExchange.sendResponseHeaders(500, 0);
- result = String.format("create topic failed! Server side error");
+ result = "create topic failed! Server side error";
logger.error(result);
- out.write(result.getBytes());
- return;
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
}
} catch (Exception e) {
httpExchange.getResponseHeaders().add("Content-Type", "application/json");
httpExchange.sendResponseHeaders(500, 0);
- result = String.format("create topic failed! Server side error");
+ result = "create topic failed! Server side error";
logger.error(result);
- out.write(result.getBytes());
- return;
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} finally {
if (out != null) {
try {
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
index 9c13e75..938f6db 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/Constants.java
@@ -17,9 +17,12 @@
package org.apache.eventmesh.common;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
public class Constants {
- public static final String DEFAULT_CHARSET = "UTF-8";
+ public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
index c13e681..296d6c5 100644
--- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
+++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java
@@ -52,7 +52,6 @@
public class Codec {
private static final int FRAME_MAX_LENGTH = 1024 * 1024 * 4;
- private static final Charset DEFAULT_CHARSET = Charset.forName(Constants.DEFAULT_CHARSET);
private static final byte[] CONSTANT_MAGIC_FLAG = serializeBytes("EventMesh");
private static final byte[] VERSION = serializeBytes("0000");
@@ -225,7 +224,7 @@
* @return
*/
private static String deserializeBytes(byte[] bytes) {
- return new String(bytes, DEFAULT_CHARSET);
+ return new String(bytes, Constants.DEFAULT_CHARSET);
}
/**
@@ -238,7 +237,7 @@
if (str == null) {
return null;
}
- return str.getBytes(DEFAULT_CHARSET);
+ return str.getBytes(Constants.DEFAULT_CHARSET);
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
index d144bd2..04d3a29 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-rocketmq/src/test/java/org/apache/rocketmq/producer/ProducerImplTest.java
@@ -22,6 +22,7 @@
import static org.mockito.ArgumentMatchers.any;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.connector.rocketmq.producer.AbstractProducer;
import org.apache.eventmesh.connector.rocketmq.producer.ProducerImpl;
@@ -98,7 +99,7 @@
.withSource(URI.create("https://github.com/cloudevents/*****"))
.withType("producer.example")
.withSubject("HELLO_TOPIC")
- .withData("hello world".getBytes())
+ .withData("hello world".getBytes(Constants.DEFAULT_CHARSET))
.build();
org.apache.eventmesh.api.SendResult result =
producer.send(cloudEvent);
diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolAdaptor.java b/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolAdaptor.java
index 1a72ed0..7a76585 100644
--- a/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolAdaptor.java
+++ b/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolAdaptor.java
@@ -90,7 +90,7 @@
}
httpEventWrapper.setSysHeaderMap(sysHeaderMap);
// ce data
- Map<String, Object> dataContentMap = JsonUtils.deserialize(new String(cloudEvent.getData().toBytes()),
+ Map<String, Object> dataContentMap = JsonUtils.deserialize(new String(cloudEvent.getData().toBytes(), Constants.DEFAULT_CHARSET),
new TypeReference<Map<String, Object>>() {});
String requestHeader = JsonUtils.serialize(dataContentMap.get("headers"));
diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/resolver/HttpRequestProtocolResolver.java b/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/resolver/HttpRequestProtocolResolver.java
index d3b5b54..e5f3ee0 100644
--- a/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/resolver/HttpRequestProtocolResolver.java
+++ b/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/resolver/HttpRequestProtocolResolver.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.protocol.http.resolver;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.protocol.api.exception.ProtocolHandleException;
@@ -77,8 +78,8 @@
byte[] requestBody = httpEventWrapper.getBody();
- Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody), new TypeReference<HashMap<String, Object>>() {
- });
+ Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody, Constants.DEFAULT_CHARSET),
+ new TypeReference<HashMap<String, Object>>() {});
String requestURI = httpEventWrapper.getRequestURI();
diff --git a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
index f69bdb5..38a297d 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
@@ -66,10 +66,10 @@
etcdLeaseId.setUrl(serverAddr);
etcdLeaseId.setClientBuilder(clientBuilder.endpoints(httpAddress));
if (StringUtils.isNoneBlank(username)) {
- etcdLeaseId.getClientBuilder().user(ByteSequence.from(username.getBytes()));
+ etcdLeaseId.getClientBuilder().user(ByteSequence.from(username.getBytes(Constants.DEFAULT_CHARSET)));
}
if (StringUtils.isNoneBlank(password)) {
- etcdLeaseId.getClientBuilder().password(ByteSequence.from(password.getBytes()));
+ etcdLeaseId.getClientBuilder().password(ByteSequence.from(password.getBytes(Constants.DEFAULT_CHARSET)));
}
etcdLeaseId.setClientWrapper(new EtcdClientWrapper(etcdLeaseId.getClientBuilder().build()));
EtcdClientWrapper client = etcdLeaseId.getClientWrapper();
diff --git a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java
index 58c78f3..6a97128 100644
--- a/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java
+++ b/eventmesh-registry-plugin/eventmesh-registry-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdRegistryService.java
@@ -22,6 +22,7 @@
import org.apache.eventmesh.api.registry.dto.EventMeshDataInfo;
import org.apache.eventmesh.api.registry.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.registry.dto.EventMeshUnRegisterInfo;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
@@ -144,13 +145,14 @@
try {
String keyPrefix = clusterName == null ? KEY_PREFIX : KEY_PREFIX + EtcdConstant.KEY_SEPARATOR + clusterName;
- ByteSequence keyByteSequence = ByteSequence.from(keyPrefix.getBytes());
+ ByteSequence keyByteSequence = ByteSequence.from(keyPrefix.getBytes(Constants.DEFAULT_CHARSET));
GetOption getOption = GetOption.newBuilder().withPrefix(keyByteSequence).build();
List<KeyValue> keyValues = etcdClient.getKVClient().get(keyByteSequence, getOption).get().getKvs();
if (CollectionUtils.isNotEmpty(keyValues)) {
for (KeyValue kv : keyValues) {
- EventMeshDataInfo eventMeshDataInfo = JsonUtils.deserialize(new String(kv.getValue().getBytes()), EventMeshDataInfo.class);
+ EventMeshDataInfo eventMeshDataInfo =
+ JsonUtils.deserialize(new String(kv.getValue().getBytes(), Constants.DEFAULT_CHARSET), EventMeshDataInfo.class);
eventMeshDataInfoList.add(eventMeshDataInfo);
}
}
@@ -197,7 +199,7 @@
EventMeshDataInfo eventMeshDataInfo =
new EventMeshDataInfo(eventMeshClusterName, eventMeshName,
endPoint, System.currentTimeMillis(), eventMeshRegisterInfo.getMetadata());
- ByteSequence etcdValue = ByteSequence.from(JsonUtils.serialize(eventMeshDataInfo).getBytes());
+ ByteSequence etcdValue = ByteSequence.from(JsonUtils.serialize(eventMeshDataInfo).getBytes(Constants.DEFAULT_CHARSET));
etcdClient.getKVClient().put(etcdKey, etcdValue, PutOption.newBuilder().withLeaseId(getLeaseId()).build());
eventMeshRegisterInfoMap.put(eventMeshName, eventMeshRegisterInfo);
@@ -246,7 +248,7 @@
if (StringUtils.isNoneBlank(endPoint)) {
etcdKey.append(EtcdConstant.KEY_SEPARATOR).append(endPoint);
}
- return ByteSequence.from(etcdKey.toString().getBytes());
+ return ByteSequence.from(etcdKey.toString().getBytes(Constants.DEFAULT_CHARSET));
}
/**
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java
index bad9da5..37af0c8 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java
@@ -19,6 +19,7 @@
import org.apache.eventmesh.admin.rocketmq.util.JsonUtils;
import org.apache.eventmesh.admin.rocketmq.util.NetUtils;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.webhook.api.WebHookConfig;
import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
@@ -55,7 +56,7 @@
Integer code = operation.deleteWebHookConfig(webHookConfig); // operating result
String result = 1 == code ? "deleteWebHookConfig Succeed!" : "deleteWebHookConfig Failed!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("get WebHookConfigOperation implementation Failed.", e);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java
index 1434b16..5f5188e 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java
@@ -19,6 +19,7 @@
import org.apache.eventmesh.admin.rocketmq.util.JsonUtils;
import org.apache.eventmesh.admin.rocketmq.util.NetUtils;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.webhook.api.WebHookConfig;
import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
@@ -54,7 +55,7 @@
try (OutputStream out = httpExchange.getResponseBody()) {
Integer code = operation.insertWebHookConfig(webHookConfig); // operating result
String result = 1 == code ? "insertWebHookConfig Succeed!" : "insertWebHookConfig Failed!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("get WebHookConfigOperation implementation Failed.", e);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java
index 51ebf9e..6ea034e 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.recommend.EventMeshRecommendImpl;
@@ -63,7 +64,7 @@
if (StringUtils.isBlank(group) || StringUtils.isBlank(purpose)) {
httpExchange.sendResponseHeaders(200, 0);
result = "params illegal!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
@@ -72,7 +73,7 @@
result = (recommendEventMeshResult == null) ? "null" : recommendEventMeshResult;
logger.info("recommend eventmesh:{},group:{},purpose:{}", result, group, purpose);
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("QueryRecommendEventMeshHandler fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java
index 6e1345c..29328ff 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java
@@ -19,6 +19,7 @@
import org.apache.eventmesh.admin.rocketmq.util.JsonUtils;
import org.apache.eventmesh.admin.rocketmq.util.NetUtils;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.webhook.api.WebHookConfig;
import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
@@ -54,7 +55,7 @@
try (OutputStream out = httpExchange.getResponseBody()) {
WebHookConfig result = operation.queryWebHookConfigById(webHookConfig); // operating result
- out.write(JsonUtils.toJson(result).getBytes());
+ out.write(JsonUtils.toJson(result).getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("get WebHookConfigOperation implementation Failed.", e);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java
index 81f5d80..9fc3437 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java
@@ -19,6 +19,7 @@
import org.apache.eventmesh.admin.rocketmq.util.JsonUtils;
import org.apache.eventmesh.admin.rocketmq.util.NetUtils;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.webhook.api.WebHookConfig;
import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
@@ -59,7 +60,7 @@
try (OutputStream out = httpExchange.getResponseBody()) {
List<WebHookConfig> result = operation.queryWebHookConfigByManufacturer(webHookConfig, pageNum, pageSize); // operating result
- out.write(JsonUtils.toJson(result).getBytes());
+ out.write(JsonUtils.toJson(result).getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("get WebHookConfigOperation implementation Failed.", e);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java
index 2039c22..df04558 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
@@ -65,7 +66,7 @@
|| !StringUtils.isNumeric(destEventMeshPort)) {
httpExchange.sendResponseHeaders(200, 0);
result = "params illegal!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
logger.info("redirectClientByIpPort in admin,ip:{},port:{},destIp:{},destPort:{}====================", ip,
@@ -95,7 +96,7 @@
sessionMap.size(), ip, port, destEventMeshIp, destEventMeshPort, redirectResult, e
.getMessage());
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
result = String.format("redirectClientByIpPort success! sessionMap size {%d}, {ip=%s port=%s "
@@ -103,7 +104,7 @@
"destEventMeshIp=%s destEventMeshPort=%s}, result {%s} ",
sessionMap.size(), ip, port, destEventMeshIp, destEventMeshPort, redirectResult);
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("redirectClientByIpPort fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java
index b5f83ac..a2b0936 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
@@ -67,7 +68,7 @@
|| !StringUtils.isNumeric(destEventMeshPort)) {
httpExchange.sendResponseHeaders(200, 0);
result = "params illegal!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
logger.info("redirectClientByPath in admin,path:{},destIp:{},destPort:{}====================", path,
@@ -96,7 +97,7 @@
sessionMap.size(), path, destEventMeshIp, destEventMeshPort, redirectResult, e
.getMessage());
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
result = String.format("redirectClientByPath success! sessionMap size {%d}, {path=%s "
@@ -104,7 +105,7 @@
"destEventMeshIp=%s destEventMeshPort=%s}, result {%s} ",
sessionMap.size(), path, destEventMeshIp, destEventMeshPort, redirectResult);
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("redirectClientByPath fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java
index 6fae83c..1e88d14 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
@@ -67,7 +68,7 @@
|| !StringUtils.isNumeric(destEventMeshPort)) {
httpExchange.sendResponseHeaders(200, 0);
result = "params illegal!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
logger.info("redirectClientBySubSystem in admin,subsys:{},destIp:{},destPort:{}====================",
@@ -96,7 +97,7 @@
sessionMap.size(), subSystem, destEventMeshIp, destEventMeshPort, redirectResult, e
.getMessage());
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
result = String.format("redirectClientBySubSystem success! sessionMap size {%d}, {subSystem=%s "
@@ -104,7 +105,7 @@
"destEventMeshIp=%s destEventMeshPort=%s}, result {%s} ",
sessionMap.size(), subSystem, destEventMeshIp, destEventMeshPort, redirectResult);
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("redirectClientBySubSystem fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
index ca445a3..1977ef5 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
@@ -77,13 +78,13 @@
result = String.format("rejectAllClient fail! sessionMap size {%d}, had reject {%s}, errorMsg : %s",
sessionMap.size(), NetUtils.addressToString(successRemoteAddrs), e.getMessage());
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
result = String.format("rejectAllClient success! sessionMap size {%d}, had reject {%s}", sessionMap.size(),
NetUtils.addressToString(successRemoteAddrs));
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("rejectAllClient fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java
index 00533f5..57a3ab6 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
@@ -63,7 +64,7 @@
if (StringUtils.isBlank(ip) || StringUtils.isBlank(port)) {
httpExchange.sendResponseHeaders(200, 0);
result = "params illegal!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
logger.info("rejectClientByIpPort in admin,ip:{},port:{}====================", ip, port);
@@ -87,14 +88,14 @@
result = String.format("rejectClientByIpPort fail! {ip=%s port=%s}, had reject {%s}, errorMsg : %s", ip,
port, NetUtils.addressToString(successRemoteAddrs), e.getMessage());
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
result = String.format("rejectClientByIpPort success! {ip=%s port=%s}, had reject {%s}", ip, port,
NetUtils.addressToString(successRemoteAddrs));
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("rejectClientByIpPort fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientBySubSystemHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientBySubSystemHandler.java
index 90cca19..ae073a0 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientBySubSystemHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientBySubSystemHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcp2Client;
@@ -79,7 +80,7 @@
if (StringUtils.isBlank(subSystem)) {
httpExchange.sendResponseHeaders(200, 0);
result = "params illegal!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
@@ -104,14 +105,14 @@
+
"subSystemId=%s}, errorMsg : %s", sessionMap.size(), printClients(successRemoteAddrs), subSystem, e.getMessage());
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
return;
}
result = String.format("rejectClientBySubSystem success! sessionMap size {%d}, had reject {%s} , {"
+
"subSystemId=%s}", sessionMap.size(), printClients(successRemoteAddrs), subSystem);
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("rejectClientBySubSystem fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java
index 29d4cd5..f2d13e2 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientBySystemHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.protocol.tcp.UserAgent;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
@@ -75,7 +76,7 @@
}
}
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("ShowClientBySystemAndHandler fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java
index 9c28f53..e302684 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowClientHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
import org.apache.eventmesh.runtime.core.protocol.tcp.client.session.Session;
@@ -77,7 +78,7 @@
}
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("ShowClientHandler fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
index a7b11be..7b2bb14 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ShowListenClientByTopicHandler.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.admin.handler;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.protocol.tcp.UserAgent;
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
@@ -77,7 +78,7 @@
}
}
httpExchange.sendResponseHeaders(200, 0);
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("ShowListenClientByTopicHandler fail...", e);
} finally {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java
index c9f77e2..11392f3 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java
@@ -19,6 +19,7 @@
import org.apache.eventmesh.admin.rocketmq.util.JsonUtils;
import org.apache.eventmesh.admin.rocketmq.util.NetUtils;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.webhook.api.WebHookConfig;
import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
@@ -54,7 +55,7 @@
try (OutputStream out = httpExchange.getResponseBody()) {
Integer code = operation.updateWebHookConfig(webHookConfig); // operating result
String result = 1 == code ? "updateWebHookConfig Succeed!" : "updateWebHookConfig Failed!";
- out.write(result.getBytes());
+ out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} catch (Exception e) {
logger.error("get WebHookConfigOperation implementation Failed.", e);
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
index 165e673..008c62c 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.boot;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.protocol.http.HttpCommand;
import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
@@ -578,7 +579,7 @@
if (length > 0) {
byte[] body = new byte[length];
fullHttpRequest.content().readBytes(body);
- JsonUtils.deserialize(new String(body), new TypeReference<Map<String, Object>>() {
+ JsonUtils.deserialize(new String(body, Constants.DEFAULT_CHARSET), new TypeReference<Map<String, Object>>() {
}).forEach(bodyMap::put);
}
} else {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java
index 1237724..4222035 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.core.protocol.http.processor;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
import org.apache.eventmesh.common.protocol.http.common.EventMeshRetCode;
import org.apache.eventmesh.common.utils.JsonUtils;
@@ -186,7 +187,7 @@
if (length > 0) {
byte[] body = new byte[length];
fullHttpRequest.content().readBytes(body);
- JsonUtils.deserialize(new String(body), new TypeReference<Map<String, Object>>() {
+ JsonUtils.deserialize(new String(body, Constants.DEFAULT_CHARSET), new TypeReference<Map<String, Object>>() {
}).forEach(bodyMap::put);
}
} else {
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalSubscribeEventProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalSubscribeEventProcessor.java
index 899946d..9ff7f96 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalSubscribeEventProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalSubscribeEventProcessor.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.core.protocol.http.processor;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.protocol.SubscriptionItem;
import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
import org.apache.eventmesh.common.protocol.http.common.EventMeshRetCode;
@@ -117,8 +118,8 @@
//validate body
byte[] requestBody = requestWrapper.getBody();
- Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody), new TypeReference<HashMap<String, Object>>() {
- });
+ Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody, Constants.DEFAULT_CHARSET),
+ new TypeReference<HashMap<String, Object>>() {});
if (requestBodyMap.get("url") == null || requestBodyMap.get("topic") == null || requestBodyMap.get("consumerGroup") == null) {
handlerSpecific.sendErrorResponse(EventMeshRetCode.EVENTMESH_PROTOCOL_BODY_ERR, responseHeaderMap,
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalUnSubscribeEventProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalUnSubscribeEventProcessor.java
index d951b69..352aedd 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalUnSubscribeEventProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/LocalUnSubscribeEventProcessor.java
@@ -17,6 +17,7 @@
package org.apache.eventmesh.runtime.core.protocol.http.processor;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
import org.apache.eventmesh.common.protocol.http.common.EventMeshRetCode;
import org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
@@ -111,8 +112,8 @@
//validate body
byte[] requestBody = requestWrapper.getBody();
- Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody), new TypeReference<HashMap<String, Object>>() {
- });
+ Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody, Constants.DEFAULT_CHARSET),
+ new TypeReference<HashMap<String, Object>>() {});
if (requestBodyMap.get("url") == null || requestBodyMap.get("topic") == null || requestBodyMap.get("consumerGroup") == null) {
handlerSpecific.sendErrorResponse(EventMeshRetCode.EVENTMESH_PROTOCOL_BODY_ERR, responseHeaderMap,
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteSubscribeEventProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteSubscribeEventProcessor.java
index c47b8b6..8c6fa64 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteSubscribeEventProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteSubscribeEventProcessor.java
@@ -120,8 +120,8 @@
//validate body
byte[] requestBody = requestWrapper.getBody();
- Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody), new TypeReference<HashMap<String, Object>>() {
- });
+ Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody, Constants.DEFAULT_CHARSET),
+ new TypeReference<HashMap<String, Object>>() {});
if (requestBodyMap.get("url") == null || requestBodyMap.get("topic") == null || requestBodyMap.get("consumerGroup") == null) {
@@ -229,7 +229,7 @@
CloseableHttpClient closeableHttpClient = eventMeshHTTPServer.httpClientPool.getClient();
String remoteResult = post(closeableHttpClient, targetMesh, remoteHeaderMap, remoteBodyMap,
- response -> EntityUtils.toString(response.getEntity(), Charset.forName(Constants.DEFAULT_CHARSET)));
+ response -> EntityUtils.toString(response.getEntity(), Constants.DEFAULT_CHARSET));
Map<String, String> remoteResultMap = JsonUtils.deserialize(remoteResult, new TypeReference<Map<String, String>>() {
});
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteUnSubscribeEventProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteUnSubscribeEventProcessor.java
index 70ca69b..d54bad5 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteUnSubscribeEventProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/RemoteUnSubscribeEventProcessor.java
@@ -117,8 +117,8 @@
//validate body
byte[] requestBody = requestWrapper.getBody();
- Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody), new TypeReference<HashMap<String, Object>>() {
- });
+ Map<String, Object> requestBodyMap = JsonUtils.deserialize(new String(requestBody, Constants.DEFAULT_CHARSET),
+ new TypeReference<HashMap<String, Object>>() {});
if (requestBodyMap.get("url") == null || requestBodyMap.get("topic") == null || requestBodyMap.get("consumerGroup") == null) {
@@ -181,7 +181,7 @@
CloseableHttpClient closeableHttpClient = eventMeshHTTPServer.httpClientPool.getClient();
String remoteResult = post(closeableHttpClient, targetMesh, remoteHeaderMap, remoteBodyMap,
- response -> EntityUtils.toString(response.getEntity(), Charset.forName(Constants.DEFAULT_CHARSET)));
+ response -> EntityUtils.toString(response.getEntity(), Constants.DEFAULT_CHARSET));
Map<String, String> remoteResultMap = JsonUtils.deserialize(remoteResult, new TypeReference<Map<String, String>>() {
});
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncRemoteEventProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncRemoteEventProcessor.java
index 149c657..38e36e4 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncRemoteEventProcessor.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SendAsyncRemoteEventProcessor.java
@@ -111,8 +111,8 @@
requestWrapper.buildSysHeaderForCE();
// process remote event body
- Map<String, Object> bodyMap = JsonUtils.deserialize(new String(requestWrapper.getBody()), new TypeReference<Map<String, Object>>() {
- });
+ Map<String, Object> bodyMap = JsonUtils.deserialize(new String(requestWrapper.getBody(), Constants.DEFAULT_CHARSET),
+ new TypeReference<Map<String, Object>>() {});
byte[] convertedBody = bodyMap.get("content").toString().getBytes(StandardCharsets.UTF_8);
requestWrapper.setBody(convertedBody);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpResponseUtils.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpResponseUtils.java
index 6c49c67..41c9782 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpResponseUtils.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpResponseUtils.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.runtime.util;
+import org.apache.eventmesh.common.Constants;
+
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.DefaultFullHttpResponse;
@@ -43,7 +45,7 @@
}
private static final ByteBuf crateByteBuf(ChannelHandlerContext ctx, String body) {
- byte[] bytes = body.getBytes();
+ byte[] bytes = body.getBytes(Constants.DEFAULT_CHARSET);
ByteBuf byteBuf = ctx.alloc().buffer(bytes.length);
byteBuf.writeBytes(bytes);
return byteBuf;
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/RRCallbackResponseHandlerAdapter.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/RRCallbackResponseHandlerAdapter.java
index e3c2229..da72d2b 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/RRCallbackResponseHandlerAdapter.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/RRCallbackResponseHandlerAdapter.java
@@ -82,7 +82,7 @@
return err;
}
- String res = EntityUtils.toString(response.getEntity(), Charset.forName(Constants.DEFAULT_CHARSET));
+ String res = EntityUtils.toString(response.getEntity(), Constants.DEFAULT_CHARSET);
EventMeshRetObj ret = JsonUtils.deserialize(res, EventMeshRetObj.class);
if (ret.getRetCode() != EventMeshRetCode.SUCCESS.getRetCode()) {
rrCallback.onException(new EventMeshException(ret.getRetCode(), ret.getRetMsg()));
diff --git a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/util/HttpUtils.java b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/util/HttpUtils.java
index 23e1546..cf56ca7 100644
--- a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/util/HttpUtils.java
+++ b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/util/HttpUtils.java
@@ -58,7 +58,7 @@
final CountDownLatch countDownLatch = new CountDownLatch(1);
post(client, null, uri, requestParam, response -> {
responseHolder.response =
- EntityUtils.toString(response.getEntity(), Charset.forName(Constants.DEFAULT_CHARSET));
+ EntityUtils.toString(response.getEntity(), Constants.DEFAULT_CHARSET);
countDownLatch.countDown();
if (log.isDebugEnabled()) {
log.debug("{}", responseHolder);
@@ -83,7 +83,7 @@
final CountDownLatch countDownLatch = new CountDownLatch(1);
post(client, forwardAgent, uri, requestParam, response -> {
responseHolder.response =
- EntityUtils.toString(response.getEntity(), Charset.forName(Constants.DEFAULT_CHARSET));
+ EntityUtils.toString(response.getEntity(), Constants.DEFAULT_CHARSET);
countDownLatch.countDown();
if (log.isDebugEnabled()) {
log.debug("{}", responseHolder);
@@ -198,7 +198,7 @@
final CountDownLatch countDownLatch = new CountDownLatch(1);
get(client, null, url, requestParam, response -> {
responseHolder.response =
- EntityUtils.toString(response.getEntity(), Charset.forName(Constants.DEFAULT_CHARSET));
+ EntityUtils.toString(response.getEntity(), Constants.DEFAULT_CHARSET);
countDownLatch.countDown();
if (log.isDebugEnabled()) {
log.debug("{}", responseHolder);
@@ -223,7 +223,7 @@
final CountDownLatch countDownLatch = new CountDownLatch(1);
get(client, forwardAgent, url, requestParam, response -> {
responseHolder.response =
- EntityUtils.toString(response.getEntity(), Charset.forName(Constants.DEFAULT_CHARSET));
+ EntityUtils.toString(response.getEntity(), Constants.DEFAULT_CHARSET);
countDownLatch.countDown();
if (log.isDebugEnabled()) {
log.debug("{}", responseHolder);
diff --git a/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java b/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
index 421b651..33b3ccd 100644
--- a/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
+++ b/eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
@@ -60,7 +60,8 @@
String manufacturers = configService.getConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK, TIMEOUT_MS);
if (manufacturers == null) {
- configService.publishConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK, JsonUtils.serialize(new ManufacturerObject()), ConfigType.JSON.getType());
+ configService.publishConfig(MANUFACTURERS_DATA_ID, CONSTANTS_WEBHOOK,
+ JsonUtils.serialize(new ManufacturerObject()), ConfigType.JSON.getType());
}
}
diff --git a/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/protocol/GithubProtocol.java b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/protocol/GithubProtocol.java
index 6f20db9..3e12689 100644
--- a/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/protocol/GithubProtocol.java
+++ b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/protocol/GithubProtocol.java
@@ -18,6 +18,7 @@
package org.apache.eventmesh.webhook.receive.protocol;
+import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.webhook.api.WebHookConfig;
import org.apache.eventmesh.webhook.receive.ManufacturerProtocol;
import org.apache.eventmesh.webhook.receive.WebHookRequest;
@@ -68,7 +69,7 @@
String hash = "sha256=";
try {
Mac sha = Mac.getInstance("HmacSHA256");
- SecretKeySpec secretKey = new SecretKeySpec(secret.getBytes(), "HmacSHA256");
+ SecretKeySpec secretKey = new SecretKeySpec(secret.getBytes(Constants.DEFAULT_CHARSET), "HmacSHA256");
sha.init(secretKey);
byte[] bytes = sha.doFinal(data);
hash += byteArrayToHexString(bytes);
