commit fd45d5e929a444aa5003af0caccefa8a6ef87135
author Madan Jampani <madan@onlab.us> Mon Apr 20 13:33:21 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 20 23:54:22 2015 +0000
tree e07e076aa55e1a50745a0bd906aade411296a40e
parent e97083c38802ba509d239a77e68ba6c3fec9eb35

Use similar return types for LeadershipService.getCandidates() and LeadershipService.getCandidates(topic)

Change-Id: I9aaea9dfa14e4e9916103a61c8e59290ad656aa7

cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java b/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
index a4b0d3a..7fe8381 100644
--- a/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
@@ -16,8 +16,8 @@
 package org.onosproject.cli.net;
 
 import java.util.Comparator;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 import org.apache.karaf.shell.commands.Argument;
@@ -94,7 +94,7 @@
     }
 
     private void displayCandidates(Map<String, Leadership> leaderBoard,
-            Map<String, Leadership> candidates) {
+            Map<String, List<NodeId>> candidates) {
         print("--------------------------------------------------------------");
         print(FMT_C, "Topic", "Leader", "Candidates");
         print("--------------------------------------------------------------");
@@ -104,7 +104,7 @@
                 .filter(l -> allTopics || pattern.matcher(l.topic()).matches())
                 .sorted(leadershipComparator)
                 .forEach(l -> {
-                        List<NodeId> list = candidates.get(l.topic()).candidates();
+                        List<NodeId> list = candidates.get(l.topic());
                         print(FMT_C,
                             l.topic(),
                             l.leader(),
@@ -156,7 +156,7 @@
             print("%s", json(leaderBoard));
         } else {
             if (showCandidates) {
-                Map<String, Leadership> candidates = leaderService.getCandidates();
+                Map<String, List<NodeId>> candidates = leaderService.getCandidates();
                 displayCandidates(leaderBoard, candidates);
             } else {
                 displayLeaders(leaderBoard);