Merge pull request #9155 from vespa-engine/balder/update-lookup-interface

Change interface from Mirror.Entry[] to List<Mirror.Entry> as you alr…

2 files changed, 6 insertions, 3 deletions

diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/IMirror.java b/jrt/src/com/yahoo/jrt/slobrok/api/IMirror.java
index 9b3bd81fc3c..0079e2c9d67 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/IMirror.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/IMirror.java
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt.slobrok.api;
 
+import java.util.List;
+
 /**
  * Defines an interface for the name server lookup.
  *
@@ -21,7 +23,7 @@ public interface IMirror {
      * @return a list of all matching services, with corresponding connect specs
      * @param pattern The pattern used for matching
      **/
-    Mirror.Entry[] lookup(String pattern);
+    List<Mirror.Entry> lookup(String pattern);
 
     /**
      * Obtain the number of updates seen by this mirror. The value may wrap, but will never become 0 again. This can be
diff --git a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
index 127aa3d0d4f..c632191e31d 100644
--- a/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
+++ b/jrt/src/com/yahoo/jrt/slobrok/api/Mirror.java
@@ -14,6 +14,7 @@ import com.yahoo.jrt.Values;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 import java.util.logging.Level;
@@ -86,7 +87,7 @@ public class Mirror implements IMirror {
     }
 
     @Override
-    public Entry[] lookup(String pattern) {
+    public List<Entry> lookup(String pattern) {
         ArrayList<Entry> found = new ArrayList<>();
         char[] p = pattern.toCharArray();
         for (Entry specEntry : specs) {
@@ -94,7 +95,7 @@ public class Mirror implements IMirror {
                 found.add(specEntry);
             }
         }
-        return found.toArray(new Entry[found.size()]);
+        return found;
     }
 
     @Override