- Reduce usage of guava.

- Ensure that tests relying on order are determinsitic.

1 files changed, 2 insertions, 3 deletions

diff --git a/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java b/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java
index 2661b9c2eb2..78addf0328a 100644
--- a/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java
+++ b/model-evaluation/src/main/java/ai/vespa/models/handler/ModelsEvaluationHandler.java
@@ -102,9 +102,8 @@ public class ModelsEvaluationHandler extends ThreadedHttpRequestHandler {
     private HttpResponse listAllModels(HttpRequest request) {
         Slime slime = new Slime();
         Cursor root = slime.setObject();
-        for (String modelName: modelsEvaluator.models().keySet()) {
-            root.setString(modelName, baseUrl(request) + modelName);
-        }
+        modelsEvaluator.models().keySet().stream().sorted()
+                .forEach(name -> root.setString(name, baseUrl(request) + name));
         return new Response(200, com.yahoo.slime.JsonFormat.toJsonBytes(slime));
     }