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 2023/01/05 07:38:12 UTC
[incubator-eventmesh] branch master updated: [ISSUE #2831]Fix project compile error
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 e306de522 [ISSUE #2831]Fix project compile error
new 4ad2a4fa0 Merge pull request #2832 from xwm1992/fix-compile-error-2
e306de522 is described below
commit e306de52258f716923fd92ef96d019984bb328f9
Author: xwm1992 <mi...@126.com>
AuthorDate: Thu Jan 5 15:30:41 2023 +0800
[ISSUE #2831]Fix project compile error
---
eventmesh-runtime/conf/eventmesh.properties | 2 +-
.../admin/controller/EventMeshAdminController.java | 7 +++----
.../runtime/admin/handler/ConfigurationHandler.java | 21 ++++++++++-----------
.../runtime/admin/handler/HTTPClientHandler.java | 16 ++++++++--------
.../runtime/admin/handler/MetricsHandler.java | 2 +-
.../admin/response/GetConfigurationResponse.java | 3 ---
.../runtime/admin/response/GetMetricsResponse.java | 20 ++++++++++----------
7 files changed, 33 insertions(+), 38 deletions(-)
diff --git a/eventmesh-runtime/conf/eventmesh.properties b/eventmesh-runtime/conf/eventmesh.properties
index f77d4e5db..009f5cab6 100644
--- a/eventmesh-runtime/conf/eventmesh.properties
+++ b/eventmesh-runtime/conf/eventmesh.properties
@@ -72,7 +72,7 @@ eventMesh.server.blacklist.ipv4=0.0.0.0/8,127.0.0.0/8,169.254.0.0/16,255.255.255
eventMesh.server.blacklist.ipv6=::/128,::1/128,ff00::/8
#connector plugin
-eventMesh.connector.plugin.type=kafka
+eventMesh.connector.plugin.type=standalone
#security plugin
eventMesh.server.security.enabled=false
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/EventMeshAdminController.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/EventMeshAdminController.java
index a1f7c3a07..0f250e6e3 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/EventMeshAdminController.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/controller/EventMeshAdminController.java
@@ -36,8 +36,7 @@ import java.net.InetSocketAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.net.InetSocketAddress;
+import com.sun.net.httpserver.HttpServer;
public class EventMeshAdminController {
@@ -72,8 +71,8 @@ public class EventMeshAdminController {
eventMeshGrpcServer.getEventMeshGrpcConfiguration()
));
server.createContext("/metrics", new MetricsHandler(eventMeshHTTPServer, eventMeshTCPServer));
- server.createContext("/topic", new TopicHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().eventMeshConnectorPluginType));
- server.createContext("/event", new EventHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().eventMeshConnectorPluginType));
+ server.createContext("/topic", new TopicHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshConnectorPluginType()));
+ server.createContext("/event", new EventHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshConnectorPluginType()));
server.createContext("/registry", new RegistryHandler(eventMeshRegistry));
server.start();
logger.info("ClientManageController start success, port:{}", port);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
index bca0550d3..c124f76c6 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/ConfigurationHandler.java
@@ -79,20 +79,19 @@ public class ConfigurationHandler implements HttpHandler {
try {
GetConfigurationResponse getConfigurationResponse = new GetConfigurationResponse(
- eventMeshTCPConfiguration.sysID,
- eventMeshTCPConfiguration.namesrvAddr,
- eventMeshTCPConfiguration.eventMeshEnv,
- eventMeshTCPConfiguration.eventMeshIDC,
- eventMeshTCPConfiguration.eventMeshCluster,
- eventMeshTCPConfiguration.eventMeshServerIp,
- eventMeshTCPConfiguration.eventMeshName,
- eventMeshTCPConfiguration.eventMeshWebhookOrigin,
- eventMeshTCPConfiguration.eventMeshServerSecurityEnable,
- eventMeshTCPConfiguration.eventMeshServerRegistryEnable,
+ eventMeshTCPConfiguration.getSysID(),
+ eventMeshTCPConfiguration.getNamesrvAddr(),
+ eventMeshTCPConfiguration.getEventMeshEnv(),
+ eventMeshTCPConfiguration.getEventMeshIDC(),
+ eventMeshTCPConfiguration.getEventMeshCluster(),
+ eventMeshTCPConfiguration.getEventMeshServerIp(),
+ eventMeshTCPConfiguration.getEventMeshName(),
+ eventMeshTCPConfiguration.getEventMeshWebhookOrigin(),
+ eventMeshTCPConfiguration.isEventMeshServerSecurityEnable(),
+ eventMeshTCPConfiguration.isEventMeshServerRegistryEnable(),
// TCP Configuration
eventMeshTCPConfiguration.eventMeshTcpServerPort,
- eventMeshTCPConfiguration.eventMeshTcpServerEnabled,
// HTTP Configuration
eventMeshHTTPConfiguration.httpServerPort,
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java
index 60c0a5ff8..e80107a7f 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/HTTPClientHandler.java
@@ -78,7 +78,7 @@ public class HTTPClientHandler implements HttpHandler {
String url = deleteHTTPClientRequest.url;
for (List<Client> clientList : eventMeshHTTPServer.localClientInfoMapping.values()) {
- clientList.removeIf(client -> Objects.equals(client.url, url));
+ clientList.removeIf(client -> Objects.equals(client.getUrl(), url));
}
httpExchange.getResponseHeaders().add("Access-Control-Allow-Origin", "*");
@@ -121,15 +121,15 @@ public class HTTPClientHandler implements HttpHandler {
for (List<Client> clientList : eventMeshHTTPServer.localClientInfoMapping.values()) {
for (Client client : clientList) {
GetClientResponse getClientResponse = new GetClientResponse(
- Optional.ofNullable(client.env).orElse(""),
- Optional.ofNullable(client.sys).orElse(""),
- Optional.ofNullable(client.url).orElse(""),
+ Optional.ofNullable(client.getEnv()).orElse(""),
+ Optional.ofNullable(client.getSys()).orElse(""),
+ Optional.ofNullable(client.getUrl()).orElse(""),
"0",
- Optional.ofNullable(client.hostname).orElse(""),
+ Optional.ofNullable(client.getHostname()).orElse(""),
0,
- Optional.ofNullable(client.apiVersion).orElse(""),
- Optional.ofNullable(client.idc).orElse(""),
- Optional.ofNullable(client.consumerGroup).orElse(""),
+ Optional.ofNullable(client.getApiVersion()).orElse(""),
+ Optional.ofNullable(client.getIdc()).orElse(""),
+ Optional.ofNullable(client.getConsumerGroup()).orElse(""),
"",
"HTTP"
);
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java
index 57e445967..984b4d8b1 100755
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/MetricsHandler.java
@@ -43,7 +43,7 @@ public class MetricsHandler implements HttpHandler {
private final TcpSummaryMetrics tcpSummaryMetrics;
public MetricsHandler(EventMeshHTTPServer eventMeshHTTPServer, EventMeshTCPServer eventMeshTcpServer) {
- this.httpSummaryMetrics = eventMeshHTTPServer.metrics.getSummaryMetrics();
+ this.httpSummaryMetrics = eventMeshHTTPServer.getMetrics().getSummaryMetrics();
this.tcpSummaryMetrics = eventMeshTcpServer.getEventMeshTcpMonitor().getTcpSummaryMetrics();
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetConfigurationResponse.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetConfigurationResponse.java
index f5e28912a..df28b00fd 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetConfigurationResponse.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetConfigurationResponse.java
@@ -35,7 +35,6 @@ public class GetConfigurationResponse {
public String namesrvAddr;
public int eventMeshTcpServerPort;
- public boolean eventMeshTcpServerEnabled;
public int eventMeshHttpServerPort;
public boolean eventMeshHttpServerUseTls;
@@ -70,7 +69,6 @@ public class GetConfigurationResponse {
// TCP Configuration
@JsonProperty("eventMeshTcpServerPort") int eventMeshTcpServerPort,
- @JsonProperty("eventMeshTcpServerEnabled") boolean eventMeshTcpServerEnabled,
// HTTP Configuration
@JsonProperty("eventMeshHttpServerPort") int eventMeshHttpServerPort,
@@ -93,7 +91,6 @@ public class GetConfigurationResponse {
this.eventMeshServerRegistryEnable = eventMeshServerRegistryEnable;
this.eventMeshTcpServerPort = eventMeshTcpServerPort;
- this.eventMeshTcpServerEnabled = eventMeshTcpServerEnabled;
this.eventMeshHttpServerPort = eventMeshHttpServerPort;
this.eventMeshHttpServerUseTls = eventMeshHttpServerUseTls;
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetMetricsResponse.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetMetricsResponse.java
index a293cf482..357249304 100755
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetMetricsResponse.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/response/GetMetricsResponse.java
@@ -59,11 +59,11 @@ public class GetMetricsResponse {
// TCP Metrics
public int retryTCPQueueSize;
- public int client2eventMeshTCPTPS;
- public int eventMesh2mqTCPTPS;
- public int mq2eventMeshTCPTPS;
- public int eventMesh2clientTCPTPS;
- public int allTCPTPS;
+ public double client2eventMeshTCPTPS;
+ public double eventMesh2mqTCPTPS;
+ public double mq2eventMeshTCPTPS;
+ public double eventMesh2clientTCPTPS;
+ public double allTCPTPS;
public int allTCPConnections;
public int subTopicTCPNum;
@@ -106,11 +106,11 @@ public class GetMetricsResponse {
@JsonProperty("avgReplyMsgCost") float avgReplyMsgCost,
// TCP Metrics
@JsonProperty("retryTCPQueueSize") int retryTCPQueueSize,
- @JsonProperty("client2eventMeshTCPTPS") int client2eventMeshTCPTPS,
- @JsonProperty("eventMesh2mqTCPTPS") int eventMesh2mqTCPTPS,
- @JsonProperty("mq2eventMeshTCPTPS") int mq2eventMeshTCPTPS,
- @JsonProperty("eventMesh2clientTCPTPS") int eventMesh2clientTCPTPS,
- @JsonProperty("allTCPTPS") int allTCPTPS,
+ @JsonProperty("client2eventMeshTCPTPS") double client2eventMeshTCPTPS,
+ @JsonProperty("eventMesh2mqTCPTPS") double eventMesh2mqTCPTPS,
+ @JsonProperty("mq2eventMeshTCPTPS") double mq2eventMeshTCPTPS,
+ @JsonProperty("eventMesh2clientTCPTPS") double eventMesh2clientTCPTPS,
+ @JsonProperty("allTCPTPS") double allTCPTPS,
@JsonProperty("allTCPConnections") int allTCPConnections,
@JsonProperty("subTopicTCPNum") int subTopicTCPNum
) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org