From d34d955c5ce100d5f0ed31ed0fc1cb1038cbffed Mon Sep 17 00:00:00 2001 From: jackyluo <1576123082@qq.com> Date: Sat, 1 Oct 2022 08:36:38 +0800 Subject: [PATCH 1/3] Revert "1. extract constant into MeshMessageProtocolConstant" This reverts commit 8cb23db2514c4596a28cabcdbf1816824e581353. --- .../protocol/meshmessage/MeshMessageProtocolAdaptor.java | 9 ++++----- .../meshmessage/MeshMessageProtocolConstant.java | 8 -------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java index 61b7d118d1..26a390d27f 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java +++ b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java @@ -17,7 +17,6 @@ package org.apache.eventmesh.protocol.meshmessage; -import javafx.scene.shape.Mesh; import org.apache.eventmesh.common.Constants; import org.apache.eventmesh.common.protocol.ProtocolTransportObject; import org.apache.eventmesh.common.protocol.grpc.common.BatchMessageWrapper; @@ -114,23 +113,23 @@ public List toBatchCloudEvent(ProtocolTransportObject protocol) thro public ProtocolTransportObject fromCloudEvent(CloudEvent cloudEvent) throws ProtocolHandleException { String protocolDesc = cloudEvent.getExtension(Constants.PROTOCOL_DESC).toString(); - if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_HTTP, protocolDesc)) { + if (StringUtils.equals("http", protocolDesc)) { HttpCommand httpCommand = new HttpCommand(); Body body = new Body() { final Map map = new HashMap<>(); @Override public Map toMap() { - map.put(MeshMessageProtocolConstant.PROTOCOL_KEY_CONTENT, new String(cloudEvent.getData().toBytes(), StandardCharsets.UTF_8)); + map.put("content", new String(cloudEvent.getData().toBytes(), StandardCharsets.UTF_8)); return map; } }; body.toMap(); httpCommand.setBody(body); return httpCommand; - } else if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_GRPC, protocolDesc)) { + } else if (StringUtils.equals(Constants.PROTOCOL_GRPC, protocolDesc)) { return GrpcMessageProtocolResolver.buildSimpleMessage(cloudEvent); - } else if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_TCP, protocolDesc)) { + } else if (StringUtils.equals("tcp", protocolDesc)) { return TcpMessageProtocolResolver.buildEventMeshMessage(cloudEvent); } else { throw new ProtocolHandleException(String.format("Unsupported protocolDesc: %s", protocolDesc)); diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java index d11468b3af..0a667f63f0 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java +++ b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java @@ -20,12 +20,4 @@ public enum MeshMessageProtocolConstant { ; public static final String PROTOCOL_NAME = "eventmeshmessage"; - - public static final String PROTOCOL_DESC_HTTP = "http"; - - public static final String PROTOCOL_DESC_GRPC = "grpc"; - - public static final String PROTOCOL_DESC_TCP = "tcp"; - - public static final String PROTOCOL_KEY_CONTENT = "content"; } From f15fd7360feeccacbe5a5ac16699a0a514d404d8 Mon Sep 17 00:00:00 2001 From: jackyluo <1576123082@qq.com> Date: Sat, 1 Oct 2022 08:42:53 +0800 Subject: [PATCH 2/3] 1. replace Strings with constants in MeshMessageProtocolConstant --- .../protocol/meshmessage/MeshMessageProtocolAdaptor.java | 8 ++++---- .../protocol/meshmessage/MeshMessageProtocolConstant.java | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java index 26a390d27f..ed59983435 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java +++ b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java @@ -111,16 +111,16 @@ public List toBatchCloudEvent(ProtocolTransportObject protocol) thro @Override public ProtocolTransportObject fromCloudEvent(CloudEvent cloudEvent) throws ProtocolHandleException { - String protocolDesc = cloudEvent.getExtension(Constants.PROTOCOL_DESC).toString(); + String protocolDesc = cloudEvent.getExtension(MeshMessageProtocolConstant.PROTOCOL_DESC_GRPC).toString(); - if (StringUtils.equals("http", protocolDesc)) { + if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_HTTP, protocolDesc)) { HttpCommand httpCommand = new HttpCommand(); Body body = new Body() { final Map map = new HashMap<>(); @Override public Map toMap() { - map.put("content", new String(cloudEvent.getData().toBytes(), StandardCharsets.UTF_8)); + map.put(MeshMessageProtocolConstant.PROTOCOL_KEY_CONTENT, new String(cloudEvent.getData().toBytes(), StandardCharsets.UTF_8)); return map; } }; @@ -129,7 +129,7 @@ public Map toMap() { return httpCommand; } else if (StringUtils.equals(Constants.PROTOCOL_GRPC, protocolDesc)) { return GrpcMessageProtocolResolver.buildSimpleMessage(cloudEvent); - } else if (StringUtils.equals("tcp", protocolDesc)) { + } else if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_TCP, protocolDesc)) { return TcpMessageProtocolResolver.buildEventMeshMessage(cloudEvent); } else { throw new ProtocolHandleException(String.format("Unsupported protocolDesc: %s", protocolDesc)); diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java index 0a667f63f0..d11468b3af 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java +++ b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolConstant.java @@ -20,4 +20,12 @@ public enum MeshMessageProtocolConstant { ; public static final String PROTOCOL_NAME = "eventmeshmessage"; + + public static final String PROTOCOL_DESC_HTTP = "http"; + + public static final String PROTOCOL_DESC_GRPC = "grpc"; + + public static final String PROTOCOL_DESC_TCP = "tcp"; + + public static final String PROTOCOL_KEY_CONTENT = "content"; } From 2087acb9d282351004824db3bf7303d45bfde212 Mon Sep 17 00:00:00 2001 From: jackyluo <1576123082@qq.com> Date: Sat, 1 Oct 2022 09:03:08 +0800 Subject: [PATCH 3/3] 1. replace Strings with constants in MeshMessageProtocolConstant --- .../protocol/meshmessage/MeshMessageProtocolAdaptor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java index ed59983435..4b6a274c9f 100644 --- a/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java +++ b/eventmesh-protocol-plugin/eventmesh-protocol-meshmessage/src/main/java/org/apache/eventmesh/protocol/meshmessage/MeshMessageProtocolAdaptor.java @@ -111,7 +111,7 @@ public List toBatchCloudEvent(ProtocolTransportObject protocol) thro @Override public ProtocolTransportObject fromCloudEvent(CloudEvent cloudEvent) throws ProtocolHandleException { - String protocolDesc = cloudEvent.getExtension(MeshMessageProtocolConstant.PROTOCOL_DESC_GRPC).toString(); + String protocolDesc = cloudEvent.getExtension(Constants.PROTOCOL_DESC).toString(); if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_HTTP, protocolDesc)) { HttpCommand httpCommand = new HttpCommand(); @@ -127,7 +127,7 @@ public Map toMap() { body.toMap(); httpCommand.setBody(body); return httpCommand; - } else if (StringUtils.equals(Constants.PROTOCOL_GRPC, protocolDesc)) { + } else if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_GRPC, protocolDesc)) { return GrpcMessageProtocolResolver.buildSimpleMessage(cloudEvent); } else if (StringUtils.equals(MeshMessageProtocolConstant.PROTOCOL_DESC_TCP, protocolDesc)) { return TcpMessageProtocolResolver.buildEventMeshMessage(cloudEvent);