|
14 | 14 | import org.akhq.models.ConnectPlugin; |
15 | 15 | import org.akhq.modules.KafkaModule; |
16 | 16 | import org.akhq.utils.UserGroupUtils; |
17 | | -import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPlugin; |
18 | | -import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPluginConfigDefinition; |
19 | | -import org.sourcelab.kafka.connect.apiclient.request.dto.NewConnectorDefinition; |
| 17 | +import org.sourcelab.kafka.connect.apiclient.request.dto.*; |
20 | 18 | import org.sourcelab.kafka.connect.apiclient.rest.exceptions.ConcurrentConfigModificationException; |
21 | 19 | import org.sourcelab.kafka.connect.apiclient.rest.exceptions.InvalidRequestException; |
22 | 20 | import org.sourcelab.kafka.connect.apiclient.rest.exceptions.ResourceNotFoundException; |
@@ -68,24 +66,24 @@ public ConnectDefinition getDefinition(String clusterId, String connectId, Strin |
68 | 66 | ResourceNotFoundException.class |
69 | 67 | }, delay = "3s", attempts = "5") |
70 | 68 | public List<ConnectDefinition> getDefinitions(String clusterId, String connectId) { |
71 | | - Collection<String> unfiltered = this.kafkaModule |
| 69 | + ConnectorsWithExpandedMetadata unfiltered = this.kafkaModule |
72 | 70 | .getConnectRestClient(clusterId) |
73 | 71 | .get(connectId) |
74 | | - .getConnectors(); |
75 | | - |
76 | | - ArrayList<String> filtered = new ArrayList<String>(); |
77 | | - for (String item : unfiltered) { |
78 | | - if (isMatchRegex(getConnectFilterRegex(), item)) { |
79 | | - filtered.add(item); |
| 72 | + .getConnectorsWithAllExpandedMetadata(); |
| 73 | + |
| 74 | + ArrayList<ConnectDefinition> filtered = new ArrayList<>(); |
| 75 | + for (ConnectorDefinition item : unfiltered.getAllDefinitions()) { |
| 76 | + if (isMatchRegex(getConnectFilterRegex(), item.getName())) { |
| 77 | + filtered.add(new ConnectDefinition( |
| 78 | + item, |
| 79 | + unfiltered.getStatusForConnector(item.getName()) |
| 80 | + )); |
80 | 81 | } |
81 | 82 | } |
82 | 83 |
|
83 | | - return filtered.stream() |
84 | | - .map(s -> getDefinition(clusterId, connectId, s)) |
85 | | - .collect(Collectors.toList()); |
| 84 | + return filtered; |
86 | 85 | } |
87 | 86 |
|
88 | | - |
89 | 87 | public Optional<ConnectPlugin> getPlugin(String clusterId, String connectId, String className) { |
90 | 88 | return this.kafkaModule |
91 | 89 | .getConnectRestClient(clusterId) |
|
0 commit comments