You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by ch...@apache.org on 2022/08/08 01:46:29 UTC
[incubator-eventmesh] branch master updated: Extract constants of protocol-http module
This is an automated email from the ASF dual-hosted git repository.
chenguangsheng 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 9f37387a Extract constants of protocol-http module
new 0809605d Merge pull request #1100 from Karen-W-2002/extraction_protocol_http
9f37387a is described below
commit 9f37387a417af17daa2f67a838d8fe3cd28d47af
Author: Karen-W-2002 <ka...@gmail.com>
AuthorDate: Fri Aug 5 18:49:14 2022 +0800
Extract constants of protocol-http module
---
.../protocol/http/HttpProtocolConstant.java | 15 +++++++++++++
.../http/resolver/HttpRequestProtocolResolver.java | 25 +++++++++++-----------
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolConstant.java b/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolConstant.java
index f8b76180..0e70bd7d 100644
--- a/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolConstant.java
+++ b/eventmesh-protocol-plugin/eventmesh-protocol-http/src/main/java/org/apache/eventmesh/protocol/http/HttpProtocolConstant.java
@@ -20,4 +20,19 @@ package org.apache.eventmesh.protocol.http;
public enum HttpProtocolConstant {
;
public static final String PROTOCOL_NAME = "http";
+
+ public static final String DATA_CONTENT_TYPE = "application/json";
+
+ public static final String CONSTANTS_DEFAULT_SOURCE = "/";
+ public static final String CONSTANTS_DEFAULT_TYPE = "http_request";
+ public static final String CONSTANTS_DEFAULT_SUBJECT = "TOPIC-HTTP-REQUEST";
+
+ public static final String CONSTANTS_KEY_ID = "id";
+ public static final String CONSTANTS_KEY_SOURCE = "source";
+ public static final String CONSTANTS_KEY_TYPE = "type";
+ public static final String CONSTANTS_KEY_SUBJECT = "subject";
+ public static final String CONSTANTS_KEY_HEADERS = "headers";
+ public static final String CONSTANTS_KEY_BODY = "body";
+ public static final String CONSTANTS_KEY_PATH = "path";
+ public static final String CONSTANTS_KEY_METHOD = "method";
}
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 e162db1f..eba64b36 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
@@ -20,6 +20,7 @@ package org.apache.eventmesh.protocol.http.resolver;
import org.apache.eventmesh.common.protocol.http.HttpEventWrapper;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.protocol.api.exception.ProtocolHandleException;
+import org.apache.eventmesh.protocol.http.HttpProtocolConstant;
import org.apache.commons.lang3.StringUtils;
@@ -45,25 +46,25 @@ public class HttpRequestProtocolResolver {
Map<String, Object> sysHeaderMap = httpEventWrapper.getSysHeaderMap();
- String id = sysHeaderMap.getOrDefault("id", UUID.randomUUID()).toString();
+ String id = sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_ID, UUID.randomUUID()).toString();
- String source = sysHeaderMap.getOrDefault("source", "/").toString();
+ String source = sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_SOURCE, HttpProtocolConstant.CONSTANTS_DEFAULT_SOURCE).toString();
- String type = sysHeaderMap.getOrDefault("type", "http_request").toString();
+ String type = sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_TYPE, HttpProtocolConstant.CONSTANTS_DEFAULT_TYPE).toString();
- String subject = sysHeaderMap.getOrDefault("subject", "TOPIC-HTTP-REQUEST").toString();
+ String subject = sysHeaderMap.getOrDefault(HttpProtocolConstant.CONSTANTS_KEY_SUBJECT, HttpProtocolConstant.CONSTANTS_DEFAULT_SUBJECT).toString();
// with attributes
builder.withId(id)
.withType(type)
- .withSource(URI.create("source:" + source))
+ .withSource(URI.create(HttpProtocolConstant.CONSTANTS_KEY_SOURCE + ":" + source))
.withSubject(subject)
- .withDataContentType("application/json");
+ .withDataContentType(HttpProtocolConstant.DATA_CONTENT_TYPE);
// with extensions
for (String extensionKey : sysHeaderMap.keySet()) {
- if (StringUtils.equals("id", extensionKey) || StringUtils.equals("source", extensionKey) || StringUtils.equals("type", extensionKey)
- || StringUtils.equals("subject", extensionKey)) {
+ if (StringUtils.equals(HttpProtocolConstant.CONSTANTS_KEY_ID, extensionKey) || StringUtils.equals(HttpProtocolConstant.CONSTANTS_KEY_SOURCE, extensionKey) || StringUtils.equals(HttpProtocolConstant.CONSTANTS_KEY_TYPE, extensionKey)
+ || StringUtils.equals(HttpProtocolConstant.CONSTANTS_KEY_SUBJECT, extensionKey)) {
continue;
}
String lowerExtensionKey = extensionKey.toLowerCase();
@@ -78,10 +79,10 @@ public class HttpRequestProtocolResolver {
String requestURI = httpEventWrapper.getRequestURI();
Map<String, Object> data = new HashMap<>();
- data.put("headers", requestHeaderMap);
- data.put("body", requestBodyMap);
- data.put("path", requestURI);
- data.put("method", httpEventWrapper.getHttpMethod());
+ data.put(HttpProtocolConstant.CONSTANTS_KEY_HEADERS, requestHeaderMap);
+ data.put(HttpProtocolConstant.CONSTANTS_KEY_BODY, requestBodyMap);
+ 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();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org