Merge branch 'master' into lesters/add-local-llms

2 files changed, 9 insertions, 10 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
index d62860afcda..74e79475ce6 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
@@ -10,7 +10,7 @@ import com.yahoo.search.Result;
 import com.yahoo.search.pagetemplates.result.PageTemplatesXmlRenderer;
 
 import java.util.Collection;
-import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.Executor;
 
 /**
@@ -34,7 +34,7 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi
      * Use MoreExecutors.directExecutor().
      */
     public RendererRegistry(Executor executor) {
-        this(Collections.emptyList(), executor);
+        this(List.of(), executor);
     }
 
     /** 
@@ -111,7 +111,7 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi
     private String rendererNames() {
         StringBuilder r = new StringBuilder();
         for (Renderer<Result> c : allComponents()) {
-            if (r.length() > 0)
+            if (!r.isEmpty())
                 r.append(", ");
             r.append(c.getId().stringValue());
         }
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java
index 6f376042f2d..7bd3ca1174f 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/SectionedRenderer.java
@@ -15,7 +15,6 @@ import java.io.IOException;
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 
@@ -156,7 +155,7 @@ abstract public class SectionedRenderer<WRITER> extends Renderer {
     }
 
     private  void renderResultContent(WRITER writer, Result result) throws IOException {
-        if (result.hits().getError() != null || result.hits().getQuery().errors().size() > 0) {
+        if (result.hits().getError() != null || !result.hits().getQuery().errors().isEmpty()) {
             error(writer, asUnmodifiableSearchErrorList(result.hits().getQuery().errors(), result.hits().getError()));
         }
 
@@ -172,14 +171,14 @@ abstract public class SectionedRenderer<WRITER> extends Renderer {
     }
 
     private Collection<ErrorMessage> asUnmodifiableSearchErrorList(List<com.yahoo.processing.request.ErrorMessage> queryErrors,ErrorMessage resultError) {
-        if (queryErrors.size() == 0)
-            return Collections.singletonList(resultError);
+        if (queryErrors.isEmpty())
+            return List.of(resultError);
         List<ErrorMessage> searchErrors = new ArrayList<>(queryErrors.size() + (resultError != null ? 1 :0) );
-        for (int i=0; i<queryErrors.size(); i++)
-            searchErrors.add(ErrorMessage.from(queryErrors.get(i)));
+        for (com.yahoo.processing.request.ErrorMessage queryError : queryErrors)
+            searchErrors.add(ErrorMessage.from(queryError));
         if (resultError != null)
             searchErrors.add(resultError);
-        return Collections.unmodifiableCollection(searchErrors);
+        return List.copyOf(searchErrors);
     }
 
     private void renderHitGroup(WRITER writer, HitGroup hitGroup) throws IOException {