This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 022c0519d [ISSUE #4245] Fix start eventmesh failed.
022c0519d is described below
commit 022c0519d363098398300d0cb81917d22e609499
Author: Alonexc <[email protected]>
AuthorDate: Fri Jul 21 17:52:04 2023 +0800
[ISSUE #4245] Fix start eventmesh failed.
---
.../java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java | 6 +++---
.../runtime/core/protocol/http/processor/CreateTopicProcessor.java | 4 +++-
.../runtime/core/protocol/http/processor/DeleteTopicProcessor.java | 6 ++++--
.../core/protocol/http/processor/QuerySubscriptionProcessor.java | 4 +++-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
index 9d407b3cf..4dd774981 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java
@@ -366,13 +366,13 @@ public class EventMeshHTTPServer extends
AbstractHTTPServer {
final ReplyMessageProcessor replyMessageProcessor = new
ReplyMessageProcessor(this);
registerProcessor(RequestCode.REPLY_MESSAGE.getRequestCode(),
replyMessageProcessor, replyMsgExecutor);
- CreateTopicProcessor createTopicProcessor = new
CreateTopicProcessor(this);
+ final CreateTopicProcessor createTopicProcessor = new
CreateTopicProcessor(this);
this.getHandlerService().register(createTopicProcessor,
clientManageExecutor);
- DeleteTopicProcessor deleteTopicProcessor = new
DeleteTopicProcessor(this);
+ final DeleteTopicProcessor deleteTopicProcessor = new
DeleteTopicProcessor(this);
this.getHandlerService().register(deleteTopicProcessor,
clientManageExecutor);
- QuerySubscriptionProcessor querySubscriptionProcessor = new
QuerySubscriptionProcessor(this);
+ final QuerySubscriptionProcessor querySubscriptionProcessor = new
QuerySubscriptionProcessor(this);
this.getHandlerService().register(querySubscriptionProcessor,
clientManageExecutor);
}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/CreateTopicProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/CreateTopicProcessor.java
index 35adc3f30..24fc763b2 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/CreateTopicProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/CreateTopicProcessor.java
@@ -24,6 +24,7 @@ import
org.apache.eventmesh.common.protocol.http.common.RequestURI;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
+import org.apache.eventmesh.runtime.common.EventMeshTrace;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.http.async.AsyncContext;
import org.apache.eventmesh.runtime.core.protocol.http.async.CompleteHandler;
@@ -45,9 +46,10 @@ import io.netty.handler.codec.http.HttpResponseStatus;
import com.fasterxml.jackson.core.type.TypeReference;
+@EventMeshTrace
public class CreateTopicProcessor implements AsyncHttpProcessor {
- public Logger httpLogger = LoggerFactory.getLogger("http");
+ private final Logger httpLogger = LoggerFactory.getLogger("http");
private final transient EventMeshHTTPServer eventMeshHTTPServer;
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/DeleteTopicProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/DeleteTopicProcessor.java
index 5b6dbd13d..fb145073b 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/DeleteTopicProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/DeleteTopicProcessor.java
@@ -25,6 +25,7 @@ import
org.apache.eventmesh.common.protocol.http.common.RequestURI;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
+import org.apache.eventmesh.runtime.common.EventMeshTrace;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.http.async.AsyncContext;
import org.apache.eventmesh.runtime.core.protocol.http.async.CompleteHandler;
@@ -48,9 +49,10 @@ import io.netty.handler.codec.http.HttpResponseStatus;
import com.fasterxml.jackson.core.type.TypeReference;
+@EventMeshTrace
public class DeleteTopicProcessor implements AsyncHttpProcessor {
- public Logger httpLogger = LoggerFactory.getLogger("http");
+ private final Logger httpLogger = LoggerFactory.getLogger("http");
private final transient EventMeshHTTPServer eventMeshHTTPServer;
@@ -117,7 +119,7 @@ public class DeleteTopicProcessor implements
AsyncHttpProcessor {
faildTopic.add(deleteTopic);
}
}
- if (faildTopic.size() > 0) {
+ if (!faildTopic.isEmpty()) {
Map<String, Object> responseBodyMap = new HashMap<>();
StringBuilder sb = new StringBuilder();
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/QuerySubscriptionProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/QuerySubscriptionProcessor.java
index 8d06c2a8d..ac8488b12 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/QuerySubscriptionProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/QuerySubscriptionProcessor.java
@@ -23,6 +23,7 @@ import
org.apache.eventmesh.common.protocol.http.common.ProtocolKey;
import org.apache.eventmesh.common.protocol.http.common.RequestURI;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
+import org.apache.eventmesh.runtime.common.EventMeshTrace;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.eventmesh.runtime.core.protocol.http.async.AsyncContext;
import org.apache.eventmesh.runtime.core.protocol.http.async.CompleteHandler;
@@ -40,9 +41,10 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
+@EventMeshTrace
public class QuerySubscriptionProcessor implements AsyncHttpProcessor {
- public Logger httpLogger = LoggerFactory.getLogger("http");
+ private final Logger httpLogger = LoggerFactory.getLogger("http");
private final transient EventMeshHTTPServer eventMeshHTTPServer;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
