Skip to content

Commit f90458a

Browse files
karsontokarsonto
committed
some enhancement
1 parent 3f2e952 commit f90458a

14 files changed

+29
-41
lines changed

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/AbstractHttpHandler.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.netty.channel.ChannelHandlerContext;
3232
import io.netty.handler.codec.http.DefaultFullHttpResponse;
3333
import io.netty.handler.codec.http.DefaultHttpHeaders;
34+
import io.netty.handler.codec.http.HttpHeaderValues;
3435
import io.netty.handler.codec.http.HttpHeaders;
3536
import io.netty.handler.codec.http.HttpRequest;
3637
import io.netty.handler.codec.http.HttpResponse;
@@ -43,8 +44,8 @@
4344
@Data
4445
public abstract class AbstractHttpHandler implements HttpHandler {
4546

46-
protected void write(ChannelHandlerContext ctx, byte[] result, AsciiString headerValue) {
47-
ctx.writeAndFlush(HttpResponseUtils.getHttpResponse(result, ctx, headerValue)).addListener(ChannelFutureListener.CLOSE);
47+
protected void write(ChannelHandlerContext ctx, byte[] result) {
48+
ctx.writeAndFlush(HttpResponseUtils.getHttpResponse(result, ctx, HttpHeaderValues.TEXT_HTML)).addListener(ChannelFutureListener.CLOSE);
4849
}
4950

5051
protected void write(ChannelHandlerContext ctx, HttpResponse response) {
@@ -142,7 +143,7 @@ protected void get(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
142143
}
143144

144145
protected Map<String, Object> parseHttpRequestBody(final HttpRequest httpRequest) throws IOException {
145-
return HttpRequestUtil.parseHttpRequestBody(httpRequest, null, null);
146+
return HttpRequestUtil.parseHttpRequestBody(httpRequest, null, null);
146147
}
147148
}
148149

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.Objects;
2828

2929
import io.netty.channel.ChannelHandlerContext;
30-
import io.netty.handler.codec.http.HttpHeaderValues;
3130
import io.netty.handler.codec.http.HttpRequest;
3231

3332
import lombok.extern.slf4j.Slf4j;
@@ -77,7 +76,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
7776
// Delete the existing WebHookConfig
7877
Integer code = operation.deleteWebHookConfig(webHookConfig); // operating result
7978
String result = 1 == code ? "deleteWebHookConfig Succeed!" : "deleteWebHookConfig Failed!";
80-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
79+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
8180

8281
}
8382
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import java.util.Objects;
2828

2929
import io.netty.channel.ChannelHandlerContext;
30-
import io.netty.handler.codec.http.HttpHeaderValues;
3130
import io.netty.handler.codec.http.HttpRequest;
3231

3332
import lombok.extern.slf4j.Slf4j;
@@ -85,7 +84,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8584
// Add the WebHookConfig if no existing duplicate configuration is found
8685
Integer code = operation.insertWebHookConfig(webHookConfig); // operating result
8786
String result = 1 == code ? "insertWebHookConfig Succeed!" : "insertWebHookConfig Failed!";
88-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
87+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
8988

9089
}
9190
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryRecommendEventMeshHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.util.Map;
3232

3333
import io.netty.channel.ChannelHandlerContext;
34-
import io.netty.handler.codec.http.HttpHeaderValues;
3534
import io.netty.handler.codec.http.HttpRequest;
3635

3736
import lombok.extern.slf4j.Slf4j;
@@ -80,7 +79,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8079
// Check the validity of the parameters
8180
if (StringUtils.isBlank(group) || StringUtils.isBlank(purpose)) {
8281
result = "params illegal!";
83-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
82+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
8483
return;
8584
}
8685

@@ -89,6 +88,6 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8988
String recommendEventMeshResult = eventMeshRecommendStrategy.calculateRecommendEventMesh(group, purpose);
9089
result = (recommendEventMeshResult == null) ? "null" : recommendEventMeshResult;
9190
log.info("recommend eventmesh:{},group:{},purpose:{}", result, group, purpose);
92-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
91+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
9392
}
9493
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByIpPortHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.concurrent.ConcurrentHashMap;
3535

3636
import io.netty.channel.ChannelHandlerContext;
37-
import io.netty.handler.codec.http.HttpHeaderValues;
3837
import io.netty.handler.codec.http.HttpRequest;
3938

4039
import lombok.extern.slf4j.Slf4j;
@@ -89,7 +88,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8988
|| StringUtils.isBlank(destEventMeshIp) || StringUtils.isBlank(destEventMeshPort)
9089
|| !StringUtils.isNumeric(destEventMeshPort)) {
9190
result = "params illegal!";
92-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
91+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
9392
return;
9493
}
9594
log.info("redirectClientByIpPort in admin,ip:{},port:{},destIp:{},destPort:{}====================", ip,
@@ -121,14 +120,14 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
121120
+
122121
"destEventMeshIp=%s destEventMeshPort=%s}, result {%s}, errorMsg : %s",
123122
sessionMap.size(), ip, port, destEventMeshIp, destEventMeshPort, redirectResult, e.getMessage());
124-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
123+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
125124
return;
126125
}
127126
// Serialize the result of redirection into output stream
128127
result = String.format("redirectClientByIpPort success! sessionMap size {%d}, {ip=%s port=%s "
129128
+
130129
"destEventMeshIp=%s destEventMeshPort=%s}, result {%s} ",
131130
sessionMap.size(), ip, port, destEventMeshIp, destEventMeshPort, redirectResult);
132-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
131+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
133132
}
134133
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientByPathHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.concurrent.ConcurrentHashMap;
3535

3636
import io.netty.channel.ChannelHandlerContext;
37-
import io.netty.handler.codec.http.HttpHeaderValues;
3837
import io.netty.handler.codec.http.HttpRequest;
3938

4039
import lombok.extern.slf4j.Slf4j;
@@ -87,7 +86,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8786
|| StringUtils.isBlank(destEventMeshPort)
8887
|| !StringUtils.isNumeric(destEventMeshPort)) {
8988
result = "params illegal!";
90-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
89+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
9190
return;
9291
}
9392
log.info("redirectClientByPath in admin,path:{},destIp:{},destPort:{}====================", path,
@@ -118,14 +117,14 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
118117
+
119118
"destEventMeshIp=%s destEventMeshPort=%s}, result {%s}, errorMsg : %s",
120119
sessionMap.size(), path, destEventMeshIp, destEventMeshPort, redirectResult, e.getMessage());
121-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
120+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
122121
return;
123122
}
124123
result = String.format("redirectClientByPath success! sessionMap size {%d}, {path=%s "
125124
+
126125
"destEventMeshIp=%s destEventMeshPort=%s}, result {%s} ",
127126
sessionMap.size(), path, destEventMeshIp, destEventMeshPort, redirectResult);
128-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
127+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
129128

130129
}
131130
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RedirectClientBySubSystemHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.concurrent.ConcurrentHashMap;
3535

3636
import io.netty.channel.ChannelHandlerContext;
37-
import io.netty.handler.codec.http.HttpHeaderValues;
3837
import io.netty.handler.codec.http.HttpRequest;
3938

4039
import lombok.extern.slf4j.Slf4j;
@@ -84,7 +83,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8483
if (!StringUtils.isNumeric(subSystem)
8584
|| StringUtils.isBlank(destEventMeshIp) || StringUtils.isBlank(destEventMeshPort)
8685
|| !StringUtils.isNumeric(destEventMeshPort)) {
87-
write(ctx, "params illegal!".getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
86+
write(ctx, "params illegal!".getBytes(Constants.DEFAULT_CHARSET));
8887
return;
8988
}
9089
log.info("redirectClientBySubSystem in admin,subsys:{},destIp:{},destPort:{}====================",
@@ -115,12 +114,12 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
115114
write(ctx, String.format("redirectClientBySubSystem fail! sessionMap size {%d}, {subSystem=%s "
116115
+ "destEventMeshIp=%s destEventMeshPort=%s}, result {%s}, errorMsg : %s",
117116
sessionMap.size(), subSystem, destEventMeshIp, destEventMeshPort, redirectResult, e.getMessage())
118-
.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
117+
.getBytes(Constants.DEFAULT_CHARSET));
119118
return;
120119
}
121120
write(ctx, String.format("redirectClientBySubSystem success! sessionMap size {%d}, {subSystem=%s "
122121
+ "destEventMeshIp=%s destEventMeshPort=%s}, result {%s} ",
123122
sessionMap.size(), subSystem, destEventMeshIp, destEventMeshPort, redirectResult)
124-
.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
123+
.getBytes(Constants.DEFAULT_CHARSET));
125124
}
126125
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectAllClientHandler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.util.concurrent.ConcurrentHashMap;
3333

3434
import io.netty.channel.ChannelHandlerContext;
35-
import io.netty.handler.codec.http.HttpHeaderValues;
3635
import io.netty.handler.codec.http.HttpRequest;
3736

3837
import lombok.extern.slf4j.Slf4j;
@@ -87,11 +86,11 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8786
log.error("clientManage rejectAllClient fail", e);
8887
write(ctx, String.format("rejectAllClient fail! sessionMap size {%d}, had reject {%s}, errorMsg : %s",
8988
sessionMap.size(), NetUtils.addressToString(successRemoteAddrs), e.getMessage())
90-
.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
89+
.getBytes(Constants.DEFAULT_CHARSET));
9190
return;
9291
}
9392
write(ctx, String.format("rejectAllClient success! sessionMap size {%d}, had reject {%s}", sessionMap.size(),
9493
NetUtils.addressToString(successRemoteAddrs))
95-
.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
94+
.getBytes(Constants.DEFAULT_CHARSET));
9695
}
9796
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientByIpPortHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import java.util.concurrent.ConcurrentHashMap;
3737

3838
import io.netty.channel.ChannelHandlerContext;
39-
import io.netty.handler.codec.http.HttpHeaderValues;
4039
import io.netty.handler.codec.http.HttpRequest;
4140

4241
import lombok.extern.slf4j.Slf4j;
@@ -87,7 +86,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
8786
// Check the validity of the parameters
8887
if (StringUtils.isBlank(ip) || StringUtils.isBlank(port)) {
8988
result = "params illegal!";
90-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
89+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
9190
return;
9291
}
9392
log.info("rejectClientByIpPort in admin,ip:{},port:{}====================", ip, port);
@@ -114,12 +113,12 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
114113
log.error("clientManage|rejectClientByIpPort|fail|ip={}|port={}", ip, port, e);
115114
result = String.format("rejectClientByIpPort fail! {ip=%s port=%s}, had reject {%s}, errorMsg : %s", ip,
116115
port, NetUtils.addressToString(successRemoteAddrs), e.getMessage());
117-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
116+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
118117
return;
119118
}
120119
result = String.format("rejectClientByIpPort success! {ip=%s port=%s}, had reject {%s}", ip, port,
121120
NetUtils.addressToString(successRemoteAddrs));
122-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
121+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
123122

124123
}
125124
}

‎eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/RejectClientBySubSystemHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import java.util.concurrent.ConcurrentHashMap;
3838

3939
import io.netty.channel.ChannelHandlerContext;
40-
import io.netty.handler.codec.http.HttpHeaderValues;
4140
import io.netty.handler.codec.http.HttpRequest;
4241

4342
import lombok.extern.slf4j.Slf4j;
@@ -95,7 +94,7 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
9594
// Check the validity of the parameters
9695
if (StringUtils.isBlank(subSystem)) {
9796
result = "params illegal!";
98-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
97+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
9998
return;
10099
}
101100

@@ -125,14 +124,14 @@ public void handle(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
125124
+
126125
"subSystemId=%s}, errorMsg : %s", sessionMap.size(), printClients(successRemoteAddrs),
127126
subSystem, e.getMessage());
128-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
127+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
129128
return;
130129
}
131130
// Serialize the successfully rejected client addresses into output stream
132131
result = String.format("rejectClientBySubSystem success! sessionMap size {%d}, had reject {%s} , {"
133132
+
134133
"subSystemId=%s}", sessionMap.size(), printClients(successRemoteAddrs), subSystem);
135-
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET), HttpHeaderValues.TEXT_HTML);
134+
write(ctx, result.getBytes(Constants.DEFAULT_CHARSET));
136135

137136

138137
}

0 commit comments

Comments
 (0)