This is an automated email from the ASF dual-hosted git repository.
walterzywei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 73ee3d2eb fix issue2629
new 8412783b8 Merge pull request #2630 from jonyangx/issue2629
73ee3d2eb is described below
commit 73ee3d2ebda62b2bb130893b3634c3bfac83ee48
Author: jonyangx <[email protected]>
AuthorDate: Tue Dec 20 15:27:38 2022 +0800
fix issue2629
---
.../http/resolver/HttpRequestProtocolResolver.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
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 c9889e684..a45695d60 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
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.UUID;
@@ -49,13 +50,14 @@ public class HttpRequestProtocolResolver {
String id =
sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_ID,
UUID.randomUUID()).toString();
- String source =
-
sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_SOURCE,
HttpProtocolConstant.CONSTANTS_DEFAULT_SOURCE).toString();
+ String source =
sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_SOURCE,
+ HttpProtocolConstant.CONSTANTS_DEFAULT_SOURCE).toString();
- String type =
sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_TYPE,
HttpProtocolConstant.CONSTANTS_DEFAULT_TYPE).toString();
+ String type =
sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_TYPE,
+ HttpProtocolConstant.CONSTANTS_DEFAULT_TYPE).toString();
- String subject =
-
sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_SUBJECT,
HttpProtocolConstant.CONSTANTS_DEFAULT_SUBJECT).toString();
+ String subject =
sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_SUBJECT,
+ HttpProtocolConstant.CONSTANTS_DEFAULT_SUBJECT).toString();
// with attributes
builder.withId(id)
@@ -72,7 +74,7 @@ public class HttpRequestProtocolResolver {
||
StringUtils.equals(HttpProtocolConstant.CONSTANTS_KEY_SUBJECT,
extension.getKey())) {
continue;
}
- String lowerExtensionKey = extension.getKey().toLowerCase();
+ String lowerExtensionKey =
extension.getKey().toLowerCase(Locale.getDefault());
builder.withExtension(lowerExtensionKey,
sysHeaderMap.get(extension.getKey()).toString());
}
@@ -90,10 +92,9 @@ public class HttpRequestProtocolResolver {
data.put(HttpProtocolConstant.CONSTANTS_KEY_PATH, requestURI);
data.put(HttpProtocolConstant.CONSTANTS_KEY_METHOD,
httpEventWrapper.getHttpMethod());
// with data
- builder =
builder.withData(JsonUtils.serialize(data).getBytes(StandardCharsets.UTF_8));
- return builder.build();
+ return
builder.withData(JsonUtils.serialize(data).getBytes(StandardCharsets.UTF_8)).build();
} catch (Exception e) {
- throw new ProtocolHandleException(e.getMessage(), e.getCause());
+ throw new ProtocolHandleException(e.getMessage(), e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
