Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(connect): optimize fetch connect details & status #587

Merged
merged 1 commit into from
Feb 3, 2021
Merged

feat(connect): optimize fetch connect details & status #587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions src/main/java/org/akhq/repositories/ConnectRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
import org.akhq.models.ConnectPlugin;
import org.akhq.modules.KafkaModule;
import org.akhq.utils.UserGroupUtils;
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPlugin;
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPluginConfigDefinition;
import org.sourcelab.kafka.connect.apiclient.request.dto.NewConnectorDefinition;
import org.sourcelab.kafka.connect.apiclient.request.dto.*;
import org.sourcelab.kafka.connect.apiclient.rest.exceptions.ConcurrentConfigModificationException;
import org.sourcelab.kafka.connect.apiclient.rest.exceptions.InvalidRequestException;
import org.sourcelab.kafka.connect.apiclient.rest.exceptions.ResourceNotFoundException;
Expand Down Expand Up @@ -68,24 +66,24 @@ public ConnectDefinition getDefinition(String clusterId, String connectId, Strin
ResourceNotFoundException.class
}, delay = "3s", attempts = "5")
public List<ConnectDefinition> getDefinitions(String clusterId, String connectId) {
Collection<String> unfiltered = this.kafkaModule
ConnectorsWithExpandedMetadata unfiltered = this.kafkaModule
.getConnectRestClient(clusterId)
.get(connectId)
.getConnectors();

ArrayList<String> filtered = new ArrayList<String>();
for (String item : unfiltered) {
if (isMatchRegex(getConnectFilterRegex(), item)) {
filtered.add(item);
.getConnectorsWithAllExpandedMetadata();

ArrayList<ConnectDefinition> filtered = new ArrayList<>();
for (ConnectorDefinition item : unfiltered.getAllDefinitions()) {
if (isMatchRegex(getConnectFilterRegex(), item.getName())) {
filtered.add(new ConnectDefinition(
item,
unfiltered.getStatusForConnector(item.getName())
));
}
}

return filtered.stream()
.map(s -> getDefinition(clusterId, connectId, s))
.collect(Collectors.toList());
return filtered;
}


public Optional<ConnectPlugin> getPlugin(String clusterId, String connectId, String className) {
return this.kafkaModule
.getConnectRestClient(clusterId)
Expand Down