This is an automated email from the ASF dual-hosted git repository.
weihu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new bfd6e6f59 code optimization.
new a6ecea0c3 Merge pull request #3801 from pandaapo/master-issue3465
bfd6e6f59 is described below
commit bfd6e6f598f4c1cd8210a89d5a0794f724dab5af
Author: pandaapo <[email protected]>
AuthorDate: Sun Apr 23 01:36:41 2023 +0800
code optimization.
---
.../eventmesh/runtime/util/EventMeshUtil.java | 30 ++++++++--------------
.../org/apache/eventmesh/runtime/util/Utils.java | 6 ++---
.../client/grpc/util/EventMeshClientUtil.java | 4 +--
3 files changed, 15 insertions(+), 25 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
index dfe42d3a6..57a82be19 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java
@@ -84,16 +84,8 @@ public class EventMeshUtil {
public static String buildMeshTcpClientID(final String clientSysId, final
String purpose,
final String meshCluster) {
- return new StringBuilder().append(StringUtils.trim(clientSysId))
- .append('-')
- .append(StringUtils.trim(purpose))
- .append('-')
- .append(StringUtils.trim(meshCluster))
- .append('-')
- .append(EventMeshVersion.getCurrentVersionDesc())
- .append('-')
- .append(ThreadUtils.getPID())
- .toString();
+ return StringUtils.joinWith("-", StringUtils.trim(clientSysId),
StringUtils.trim(purpose),
+ StringUtils.trim(meshCluster),
EventMeshVersion.getCurrentVersionDesc(), ThreadUtils.getPID());
}
public static String buildClientGroup(final String systemId) {
@@ -169,10 +161,10 @@ public class EventMeshUtil {
public static Map<String, String> getEventProp(final CloudEvent event) {
final Map<String, String> propMap = new HashMap<>();
- for (final String extensionKey : event.getExtensionNames()) {
+ event.getExtensionNames().forEach((extensionKey) -> {
propMap.put(extensionKey, event.getExtension(extensionKey) == null
? ""
- : event.getExtension(extensionKey).toString());
- }
+ : event.getExtension(extensionKey).toString());
+ });
return propMap;
}
@@ -184,7 +176,7 @@ public class EventMeshUtil {
}
final List<String> preferList = new ArrayList<>();
- Arrays.stream(priority.split("<")).forEach(preferList::add);
+ preferList.addAll(Arrays.asList(priority.split("<")));
NetworkInterface preferNetworkInterface = null;
@@ -194,11 +186,9 @@ public class EventMeshUtil {
final NetworkInterface networkInterface =
enumeration1.nextElement();
if (!preferList.contains(networkInterface.getName())) {
continue;
- } else if (preferNetworkInterface == null) {
- preferNetworkInterface = networkInterface;
- } else if (preferList.indexOf(networkInterface.getName())
- > preferList.indexOf(preferNetworkInterface.getName())) {
- //get the networkInterface that has higher priority
+ } else if (preferNetworkInterface == null
+ || preferList.indexOf(networkInterface.getName())
+ >
preferList.indexOf(preferNetworkInterface.getName())) {
preferNetworkInterface = networkInterface;
}
}
@@ -228,7 +218,7 @@ public class EventMeshUtil {
// prefer ipv4
if (!ipv4Result.isEmpty()) {
for (final String ip : ipv4Result) {
- if (!ip.startsWith("127.0") && !ip.startsWith("192.168")) {
+ if (!StringUtils.startsWithAny(ip, "127.0", "192.168")) {
return ip;
}
}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java
index ebe98ef38..1bea18d08 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java
@@ -152,9 +152,9 @@ public class Utils {
public static Map<String, Object> parseHttpHeader(HttpRequest fullReq) {
Map<String, Object> headerParam = new HashMap<>();
for (String key : fullReq.headers().names()) {
- if
(StringUtils.equalsIgnoreCase(HttpHeaderNames.CONTENT_TYPE.toString(), key)
- ||
StringUtils.equalsIgnoreCase(HttpHeaderNames.ACCEPT_ENCODING.toString(), key)
- ||
StringUtils.equalsIgnoreCase(HttpHeaderNames.CONTENT_LENGTH.toString(), key)) {
+ if (StringUtils.equalsAnyIgnoreCase(key,
HttpHeaderNames.CONTENT_TYPE.toString(),
+ HttpHeaderNames.ACCEPT_ENCODING.toString(),
+ HttpHeaderNames.CONTENT_LENGTH.toString())) {
continue;
}
headerParam.put(key, fullReq.headers().get(key));
diff --git
a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
index ba46523b7..f39fcb3e8 100644
---
a/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
+++
b/eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/util/EventMeshClientUtil.java
@@ -77,7 +77,7 @@ public class EventMeshClientUtil {
final String content = message.getContent();
// This is GRPC response message
- if (StringUtils.isEmpty(message.getSeqNum()) &&
StringUtils.isEmpty(message.getUniqueId())) {
+ if (StringUtils.isAllEmpty(message.getSeqNum(),
message.getUniqueId())) {
return (T) JsonUtils.parseTypeReferenceObject(content,
new TypeReference<HashMap<String, String>>() {
});
@@ -110,7 +110,7 @@ public class EventMeshClientUtil {
private static CloudEvent switchSimpleMessage2CloudEvent(SimpleMessage
message, String content) {
final String contentType =
message.getPropertiesOrDefault(ProtocolKey.CONTENT_TYPE,
JsonFormat.CONTENT_TYPE);
final CloudEvent cloudEvent =
Objects.requireNonNull(EventFormatProvider.getInstance().resolveFormat(contentType))
- .deserialize(content.getBytes(StandardCharsets.UTF_8));
+ .deserialize(content.getBytes(Constants.DEFAULT_CHARSET));
final CloudEventBuilder cloudEventBuilder =
CloudEventBuilder.from(cloudEvent)
.withSubject(message.getTopic())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
