Change interface from Mirror.Entry[] to List<Mirror.Entry> as you already have a list.

Avoid having to do an array copy that is not necessary.

2 files changed, 12 insertions, 11 deletions

diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java
index 476d85f59e9..1dbb30de585 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java
@@ -11,6 +11,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.net.UnknownHostException;
+import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -67,8 +68,8 @@ public class ServiceAddressTestCase {
 
     private boolean waitSlobrok(String pattern, int num) {
         for (int i = 0; i < 1000 && !Thread.currentThread().isInterrupted(); ++i) {
-            Mirror.Entry[] res = network.getMirror().lookup(pattern);
-            if (res.length == num) {
+            List<Mirror.Entry> res = network.getMirror().lookup(pattern);
+            if (res.size() == num) {
                 return true;
             }
             try {
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java
index c6737385f4c..dd779fd84c0 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java
@@ -31,8 +31,8 @@ public class SlobrokTestCase {
             lst.add(new Mirror.Entry(fullName, spec));
             return this;
         }
-        public Mirror.Entry[] toArray() {
-            return lst.toArray(new Mirror.Entry[lst.size()]);
+        public List<Mirror.Entry> toArray() {
+            return lst;
         }
     }
 
@@ -44,18 +44,18 @@ public class SlobrokTestCase {
     int        port2;
     int        port3;
 
-    void check(RPCNetwork net, String pattern, Mirror.Entry[] expect) {
+    void check(RPCNetwork net, String pattern, List<Mirror.Entry> expect) {
         Comparator<Mirror.Entry> cmp = new Comparator<Mirror.Entry>() {
             public int compare(Mirror.Entry a, Mirror.Entry b) {
                 return a.compareTo(b);
             }
         };
-        Arrays.sort(expect, cmp);
-        Mirror.Entry[] actual = null;
+        expect.sort(cmp);
+        List<Mirror.Entry> actual = null;
         for (int i = 0; i < 1000; i++) {
             actual = net.getMirror().lookup(pattern);
-            Arrays.sort(actual, cmp);
-            if (Arrays.equals(actual, expect)) {
+            actual.sort(cmp);
+            if (actual.equals(expect)) {
                 System.out.printf("lookup successful for pattern: %s\n", pattern);
                 return;
             }
@@ -65,7 +65,7 @@ public class SlobrokTestCase {
         }
         System.out.printf("lookup failed for pattern: %s\n", pattern);
         System.out.printf("actual values:\n");
-        if (actual == null || actual.length == 0) {
+        if (actual == null || actual.isEmpty()) {
             System.out.printf("  { EMPTY }\n");
         } else {
             for (Mirror.Entry entry : actual) {
@@ -73,7 +73,7 @@ public class SlobrokTestCase {
             }
         }
         System.out.printf("expected values:\n");
-        if (expect.length == 0) {
+        if (expect.isEmpty()) {
             System.out.printf("  { EMPTY }\n");
         } else {
             for (Mirror.Entry entry : expect) {