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/09/01 06:28:02 UTC
[incubator-eventmesh] branch master updated: update Constants
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 d9a9a6d6 update Constants
new 766fffde Merge pull request #1201 from weihubeats/feature_constants
d9a9a6d6 is described below
commit d9a9a6d6ccebbaabfb089d2d69b8f05ef3be59df
Author: weihu <we...@163.com>
AuthorDate: Thu Sep 1 11:01:32 2022 +0800
update Constants
---
.../apache/eventmesh/admin/rocketmq/Constants.java | 6 +++++
.../admin/rocketmq/handler/TopicsHandler.java | 28 +++++++++++-----------
.../handler/QueryWebHookConfigByIdHandler.java | 15 ++++++------
3 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/Constants.java b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/Constants.java
index 6547f9e3..9a61dee9 100644
--- a/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/Constants.java
+++ b/eventmesh-admin/eventmesh-admin-rocketmq/src/main/java/org/apache/eventmesh/admin/rocketmq/Constants.java
@@ -20,4 +20,10 @@ package org.apache.eventmesh.admin.rocketmq;
public class Constants {
public static final String TOPIC_MANAGE_PATH = "/topicManage";
+
+ public static final String CONTENT_TYPE = "Content-Type";
+
+ public static final String APPLICATION_JSON = "application/json";
+
+ public static final String TOPIC_ERROR = "create topic failed! Server side error";
}
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 f28209b6..9971c679 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
@@ -17,25 +17,25 @@
package org.apache.eventmesh.admin.rocketmq.handler;
-import static org.apache.eventmesh.admin.rocketmq.Constants.TOPIC_MANAGE_PATH;
+import java.io.IOException;
+import java.io.OutputStream;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import org.apache.commons.lang3.StringUtils;
import org.apache.eventmesh.admin.rocketmq.request.TopicCreateRequest;
import org.apache.eventmesh.admin.rocketmq.response.TopicResponse;
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;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
+import static org.apache.eventmesh.admin.rocketmq.Constants.APPLICATION_JSON;
+import static org.apache.eventmesh.admin.rocketmq.Constants.CONTENT_TYPE;
+import static org.apache.eventmesh.admin.rocketmq.Constants.TOPIC_ERROR;
+import static org.apache.eventmesh.admin.rocketmq.Constants.TOPIC_MANAGE_PATH;
public class TopicsHandler implements HttpHandler {
private static final Logger logger = LoggerFactory.getLogger(TopicsHandler.class);
@@ -57,7 +57,7 @@ public class TopicsHandler implements HttpHandler {
}
public void createTopicHandler(HttpExchange httpExchange) throws IOException {
- String result = "";
+ String result;
OutputStream out = httpExchange.getResponseBody();
try {
String params = NetUtils.parsePostBody(httpExchange);
@@ -76,21 +76,21 @@ public class TopicsHandler implements HttpHandler {
TopicResponse topicResponse = null;
if (topicResponse != null) {
logger.info("create a new topic: {}", topic);
- httpExchange.getResponseHeaders().add("Content-Type", "application/json");
+ httpExchange.getResponseHeaders().add(CONTENT_TYPE, APPLICATION_JSON);
httpExchange.sendResponseHeaders(200, 0);
result = JsonUtils.toJson(topicResponse);
logger.info(result);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} else {
httpExchange.sendResponseHeaders(500, 0);
- result = "create topic failed! Server side error";
+ result = TOPIC_ERROR;
logger.error(result);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
}
} catch (Exception e) {
- httpExchange.getResponseHeaders().add("Content-Type", "application/json");
+ httpExchange.getResponseHeaders().add(CONTENT_TYPE, APPLICATION_JSON);
httpExchange.sendResponseHeaders(500, 0);
- result = "create topic failed! Server side error";
+ result = TOPIC_ERROR;
logger.error(result);
out.write(result.getBytes(Constants.DEFAULT_CHARSET));
} 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 29328ff9..f4c46738 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
@@ -17,20 +17,21 @@
package org.apache.eventmesh.runtime.admin.handler;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
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;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
+import static org.apache.eventmesh.admin.rocketmq.Constants.CONTENT_TYPE;
+import static org.apache.eventmesh.admin.rocketmq.Constants.APPLICATION_JSON;
@SuppressWarnings("restriction")
public class QueryWebHookConfigByIdHandler implements HttpHandler {
@@ -47,7 +48,7 @@ public class QueryWebHookConfigByIdHandler implements HttpHandler {
@Override
public void handle(HttpExchange httpExchange) throws IOException {
httpExchange.sendResponseHeaders(200, 0);
- httpExchange.getResponseHeaders().add("Content-Type", "application/json");
+ httpExchange.getResponseHeaders().add(CONTENT_TYPE, APPLICATION_JSON);
// get requestBody and resolve to WebHookConfig
String requestBody = NetUtils.parsePostBody(httpExchange);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org