Skip to content

Commit e4bb2d2

Browse files
authored
Apply sorting to configuration items (#94)
1 parent ea44b9a commit e4bb2d2

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/cluster/ClusterController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public String clusterIndex(final Model model, final RedirectAttributes redirectA
6565
manager.addCrumb("Cluster Explorer", null);
6666

6767
// Retrieve all clusters
68-
final Iterable<Cluster> clusterList = clusterRepository.findAll();
68+
final Iterable<Cluster> clusterList = clusterRepository.findAllByOrderByNameAsc();
6969
model.addAttribute("clusterList", clusterList);
7070

7171
// Retrieve how many views for each cluster

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/manager/kafka/dto/BrokerConfig.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
package org.sourcelab.kafka.webview.ui.manager.kafka.dto;
2626

27+
import java.util.ArrayList;
2728
import java.util.Collections;
29+
import java.util.Comparator;
2830
import java.util.List;
2931

3032
/**
@@ -34,7 +36,14 @@ public class BrokerConfig {
3436
private final List<ConfigItem> configEntries;
3537

3638
public BrokerConfig(final List<ConfigItem> configEntries) {
37-
this.configEntries = Collections.unmodifiableList(configEntries);
39+
// Create new list from source.
40+
final List<ConfigItem> sorted = new ArrayList<>(configEntries);
41+
42+
// Sort the list by name
43+
sorted.sort(Comparator.comparing(ConfigItem::getName));
44+
45+
// Make immutable.
46+
this.configEntries = Collections.unmodifiableList(sorted);
3847
}
3948

4049
public List<ConfigItem> getConfigEntries() {

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/manager/kafka/dto/TopicConfig.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
package org.sourcelab.kafka.webview.ui.manager.kafka.dto;
2626

27+
import java.util.ArrayList;
2728
import java.util.Collections;
29+
import java.util.Comparator;
2830
import java.util.List;
2931

3032
/**
@@ -37,7 +39,14 @@ public class TopicConfig {
3739
* Constructor.
3840
*/
3941
public TopicConfig(final List<ConfigItem> configEntries) {
40-
this.configEntries = Collections.unmodifiableList(configEntries);
42+
// Create new list from source.
43+
final List<ConfigItem> sorted = new ArrayList<>(configEntries);
44+
45+
// Sort the list by name
46+
sorted.sort(Comparator.comparing(ConfigItem::getName));
47+
48+
// Make immutable.
49+
this.configEntries = Collections.unmodifiableList(sorted);
4150
}
4251

4352
public List<ConfigItem> getConfigEntries() {

0 commit comments

Comments
 (0)