[rocketmq-connect] branch master updated: [ISSUE #362] Fix allocated connectors rest api return no data (#363)

[zhoubo]

This is an automated email from the ASF dual-hosted git repository.

zhoubo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-connect.git


The following commit(s) were added to refs/heads/master by this push:
     new 970050fb [ISSUE #362] Fix allocated connectors rest api return no data 
(#363)
970050fb is described below

commit 970050fb9264d29139ba64d345f70bd7a96bcf5c
Author: Slideee <yec...@corp.netease.com>
AuthorDate: Mon Dec 26 19:28:48 2022 +0800

    [ISSUE #362] Fix allocated connectors rest api return no data (#363)
---
 .../apache/rocketmq/connect/runtime/connectorwrapper/Worker.java   | 4 ++++
 .../java/org/apache/rocketmq/connect/runtime/rest/RestHandler.java | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git 
a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/connectorwrapper/Worker.java
 
b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/connectorwrapper/Worker.java
index b9c5a01d..097a0fdd 100644
--- 
a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/connectorwrapper/Worker.java
+++ 
b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/connectorwrapper/Worker.java
@@ -489,6 +489,10 @@ public class Worker {
         return new HashSet<>(connectors.keySet());
     }
 
+    public ConcurrentMap<String, WorkerConnector> getConnectors() {
+        return connectors;
+    }
+
     /**
      * get connectors
      *
diff --git 
a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/RestHandler.java
 
b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/RestHandler.java
index 352c1ef7..5e75d845 100644
--- 
a/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/RestHandler.java
+++ 
b/rocketmq-connect-runtime/src/main/java/org/apache/rocketmq/connect/runtime/rest/RestHandler.java
@@ -39,6 +39,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  * A rest handler to process http request.
@@ -299,10 +300,10 @@ public class RestHandler {
 
     private void getAllocatedConnectors(Context context) {
         try {
-            Set<WorkerConnector> workerConnectors = 
connectController.getWorker().getWorkingConnectors();
+            ConcurrentMap<String, WorkerConnector> workerConnectors = 
connectController.getWorker().getConnectors();
             Map<String, Map<String, String>> connectors = new HashMap<>();
-            for (WorkerConnector workerConnector : workerConnectors) {
-                connectors.put(workerConnector.getConnectorName(), 
workerConnector.getKeyValue().getProperties());
+            for (Map.Entry<String,WorkerConnector> entry : 
workerConnectors.entrySet()) {
+                connectors.put(entry.getKey(), 
entry.getValue().getKeyValue().getProperties());
             }
             context.json(new HttpResponse<>(context.status(), connectors));
         } catch (Exception ex) {