Non-functional changes only

3 files changed, 67 insertions, 62 deletions

diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
index 8e2380f72c2..0ebfb9cf669 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java
@@ -18,13 +18,14 @@ import static org.junit.jupiter.api.Assertions.*;
  */
 public class MetricsSearcherTestCase {
 
-    private MetricsSearcher metricsSearcher = new MetricsSearcher();
-    private MockBackend backend = new MockBackend();
-    private Chain<Searcher> chain = new Chain<>(metricsSearcher, backend);
-    private Execution.Context context = Execution.Context.createContextStub();
-    private MetricsSearcher.Stats expStatsLt1 = new MetricsSearcher.Stats();
+    private final MetricsSearcher metricsSearcher = new MetricsSearcher();
+    private final MockBackend backend = new MockBackend();
+    private final Chain<Searcher> chain = new Chain<>(metricsSearcher, backend);
+    private final Execution.Context context = Execution.Context.createContextStub();
+    private final MetricsSearcher.Stats expStatsLt1 = new MetricsSearcher.Stats();
+    private final MetricsSearcher.Stats expStatsLt2 = new MetricsSearcher.Stats();
+
     private static final String LOADTYPE1 = "lt1";
-    private MetricsSearcher.Stats expStatsLt2 = new MetricsSearcher.Stats();
     private static final String LOADTYPE2 = "lt2";
 
     private void verifySearch(String metricParam, String message, String detailedMessage) {
@@ -97,8 +98,9 @@ public class MetricsSearcherTestCase {
     }
 
     private static class MockBackend extends Searcher {
+
         private int sequenceNumber = 0;
-        private VisitorStatistics visitorStats = new VisitorStatistics();
+        private final VisitorStatistics visitorStats = new VisitorStatistics();
         private boolean implicitlyCreateContext = true;
 
         private MockBackend() {
@@ -132,9 +134,9 @@ public class MetricsSearcherTestCase {
 
         private void assignContextProperties(Query query, String loadType) {
             if (loadType != null && loadType.equals(LOADTYPE1)) {
-                query.getContext(true).setProperty(VdsStreamingSearcher.STREAMING_STATISTICS, visitorStats);
+                query.getContext(true).setProperty(StreamingSearcher.STREAMING_STATISTICS, visitorStats);
             } else {
-                query.getContext(true).setProperty(VdsStreamingSearcher.STREAMING_STATISTICS, null);
+                query.getContext(true).setProperty(StreamingSearcher.STREAMING_STATISTICS, null);
             }
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
index 19c03faae66..7b64976cba6 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingSearcherTestCase.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
 /**
  * @author Ulf Carlin
  */
-public class VdsStreamingSearcherTestCase {
+public class StreamingSearcherTestCase {
 
     public static final String USERDOC_ID_PREFIX = "id:namespace:mytype:n=1:userspecific";
     public static final String GROUPDOC_ID_PREFIX = "id:namespace:mytype:g=group1:userspecific";
@@ -98,7 +98,7 @@ public class VdsStreamingSearcherTestCase {
                 groupings.add(new Grouping());
             } else if (queryString.compareTo("match_features") == 0) {
                 addResults(USERDOC_ID_PREFIX, 1, false);
-                var matchFeatures = new MatchFeatureData(Arrays.asList("my_feature")).addHit();
+                var matchFeatures = new MatchFeatureData(List.of("my_feature")).addHit();
                 matchFeatures.set(0, 7.0);
                 hits.get(0).setMatchFeatures(matchFeatures);
             }
@@ -161,7 +161,7 @@ public class VdsStreamingSearcherTestCase {
         }
     }
 
-    private static Result executeQuery(VdsStreamingSearcher searcher, Query query) {
+    private static Result executeQuery(StreamingSearcher searcher, Query query) {
         Execution execution = new Execution(Execution.Context.createContextStub());
         return searcher.doSearch2(query, execution);
     }
@@ -184,7 +184,7 @@ public class VdsStreamingSearcherTestCase {
         return queries;
     }
 
-    private static void checkError(VdsStreamingSearcher searcher, String queryString, String message, String detailedMessage) {
+    private static void checkError(StreamingSearcher searcher, String queryString, String message, String detailedMessage) {
         for (Query query : generateTestQueries(queryString)) {
             Result result = executeQuery(searcher, query);
             assertNotNull(result.hits().getError());
@@ -197,7 +197,7 @@ public class VdsStreamingSearcherTestCase {
         }
     }
 
-    private static void checkSearch(VdsStreamingSearcher searcher, String queryString, int hitCount, String idPrefix) {
+    private static void checkSearch(StreamingSearcher searcher, String queryString, int hitCount, String idPrefix) {
         for (Query query : generateTestQueries(queryString)) {
             Result result = executeQuery(searcher, query);
             assertNull(result.hits().getError());
@@ -215,11 +215,11 @@ public class VdsStreamingSearcherTestCase {
         }
     }
 
-    private static void checkGrouping(VdsStreamingSearcher searcher, String queryString, int hitCount) {
+    private static void checkGrouping(StreamingSearcher searcher, String queryString, int hitCount) {
         checkSearch(searcher, queryString, hitCount, null);
     }
 
-    private static void checkMatchFeatures(VdsStreamingSearcher searcher) {
+    private static void checkMatchFeatures(StreamingSearcher searcher) {
         String queryString = "/?streaming.selection=true&query=match_features";
         Result result = executeQuery(searcher, new Query(queryString));
         assertNull(result.hits().getError());
@@ -232,7 +232,7 @@ public class VdsStreamingSearcherTestCase {
     @Test
     void testBasics() {
         MockVisitorFactory factory = new MockVisitorFactory();
-        VdsStreamingSearcher searcher = new VdsStreamingSearcher(factory);
+        StreamingSearcher searcher = new StreamingSearcher(factory);
 
         var schema = new Schema.Builder("test");
         schema.add(new com.yahoo.search.schema.DocumentSummary.Builder("default").build());
@@ -281,25 +281,25 @@ public class VdsStreamingSearcherTestCase {
         String groupId2 = "id:namespace:mytype:g=group2:userspecific";
         String badId = "unknowscheme:namespace:something";
 
-        assertTrue(VdsStreamingSearcher.verifyDocId(userId1, generalQuery, true));
-
-        assertTrue(VdsStreamingSearcher.verifyDocId(userId1, generalQuery, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(userId2, generalQuery, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(groupId1, generalQuery, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(groupId2, generalQuery, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(badId, generalQuery, false));
-
-        assertTrue(VdsStreamingSearcher.verifyDocId(userId1, user1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(userId2, user1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(groupId1, user1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(groupId2, user1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(badId, user1Query, false));
-
-        assertFalse(VdsStreamingSearcher.verifyDocId(userId1, group1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(userId2, group1Query, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(groupId1, group1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(groupId2, group1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(badId, group1Query, false));
+        assertTrue(StreamingSearcher.verifyDocId(userId1, generalQuery, true));
+
+        assertTrue(StreamingSearcher.verifyDocId(userId1, generalQuery, false));
+        assertTrue(StreamingSearcher.verifyDocId(userId2, generalQuery, false));
+        assertTrue(StreamingSearcher.verifyDocId(groupId1, generalQuery, false));
+        assertTrue(StreamingSearcher.verifyDocId(groupId2, generalQuery, false));
+        assertFalse(StreamingSearcher.verifyDocId(badId, generalQuery, false));
+
+        assertTrue(StreamingSearcher.verifyDocId(userId1, user1Query, false));
+        assertFalse(StreamingSearcher.verifyDocId(userId2, user1Query, false));
+        assertFalse(StreamingSearcher.verifyDocId(groupId1, user1Query, false));
+        assertFalse(StreamingSearcher.verifyDocId(groupId2, user1Query, false));
+        assertFalse(StreamingSearcher.verifyDocId(badId, user1Query, false));
+
+        assertFalse(StreamingSearcher.verifyDocId(userId1, group1Query, false));
+        assertFalse(StreamingSearcher.verifyDocId(userId2, group1Query, false));
+        assertTrue(StreamingSearcher.verifyDocId(groupId1, group1Query, false));
+        assertFalse(StreamingSearcher.verifyDocId(groupId2, group1Query, false));
+        assertFalse(StreamingSearcher.verifyDocId(badId, group1Query, false));
     }
 
     private static class TraceFixture {
@@ -309,13 +309,13 @@ public class VdsStreamingSearcherTestCase {
         TracingOptions options;
 
         MockVisitorFactory factory;
-        VdsStreamingSearcher searcher;
+        StreamingSearcher searcher;
 
         private TraceFixture(Long firstTimestamp, Long... additionalTimestamps) {
             clock = MockUtils.mockedClockReturning(firstTimestamp, additionalTimestamps);
             options = new TracingOptions(sampler, exporter, clock, 8, 2.0);
             factory = new MockVisitorFactory();
-            searcher = new VdsStreamingSearcher(factory, options);
+            searcher = new StreamingSearcher(factory, options);
         }
 
         private TraceFixture() {
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingVisitorTest.java
index 28a34ff2f6d..556d1174ed1 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/StreamingVisitorTest.java
@@ -20,15 +20,16 @@ import com.yahoo.vespa.objects.BufferSerializer;
 import org.junit.jupiter.api.Test;
 
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
- * @author <a href="mailto:ulf@yahoo-inc.com">Ulf Carlin</a>
+ * @author Ulf Carlin<
  */
-public class VdsVisitorTestCase {
+public class StreamingVisitorTest {
 
     private SearchResult createSR(String docId, double rank) {
         BufferSerializer serializer = new BufferSerializer();
@@ -149,7 +150,7 @@ public class VdsVisitorTestCase {
             queryString.append("&location=").append(qa.location);
         }
         if (qa.sortSpec != null) {
-            queryString.append("&sorting=").append(URLEncoder.encode(qa.sortSpec, "UTF-8"));
+            queryString.append("&sorting=").append(URLEncoder.encode(qa.sortSpec, StandardCharsets.UTF_8));
         }
         if (qa.rankProperties != null) {
             queryString.append("&").append(qa.rankProperties);
@@ -162,7 +163,7 @@ public class VdsVisitorTestCase {
             queryString.append("&streaming.groupname=").append(qa.groupName);
         }
         if (qa.selection != null) {
-            queryString.append("&streaming.selection=").append(URLEncoder.encode(qa.selection, "UTF-8"));
+            queryString.append("&streaming.selection=").append(URLEncoder.encode(qa.selection, StandardCharsets.UTF_8));
         }
         if (qa.from != 0) {
             queryString.append("&streaming.fromtimestamp=").append(qa.from);
@@ -209,7 +210,7 @@ public class VdsVisitorTestCase {
         if (qa.maxBucketsPerVisitor != 0) {
             assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor());
         } else {
-            assertEquals(VdsVisitor.MAX_BUCKETS_PER_VISITOR, params.getMaxBucketsPerVisitor());
+            assertEquals(StreamingVisitor.MAX_BUCKETS_PER_VISITOR, params.getMaxBucketsPerVisitor());
         }
 
         // Verify parameters based only on query
@@ -267,17 +268,17 @@ public class VdsVisitorTestCase {
 
     @Test
     void testGetQueryFlags() {
-        assertEquals(0x00028000, VdsVisitor.getQueryFlags(new Query("/?query=test")));
-        assertEquals(0x00028080, VdsVisitor.getQueryFlags(new Query("/?query=test&hitcountestimate=true")));
-        assertEquals(0x00068000, VdsVisitor.getQueryFlags(new Query("/?query=test&rankfeatures=true")));
-        assertEquals(0x00068080, VdsVisitor.getQueryFlags(new Query("/?query=test&hitcountestimate=true&rankfeatures=true")));
+        assertEquals(0x00028000, StreamingVisitor.getQueryFlags(new Query("/?query=test")));
+        assertEquals(0x00028080, StreamingVisitor.getQueryFlags(new Query("/?query=test&hitcountestimate=true")));
+        assertEquals(0x00068000, StreamingVisitor.getQueryFlags(new Query("/?query=test&rankfeatures=true")));
+        assertEquals(0x00068080, StreamingVisitor.getQueryFlags(new Query("/?query=test&hitcountestimate=true&rankfeatures=true")));
 
         Query query = new Query("/?query=test");
-        assertEquals(0x00028000, VdsVisitor.getQueryFlags(query));
+        assertEquals(0x00028000, StreamingVisitor.getQueryFlags(query));
         query.setNoCache(true);
-        assertEquals(0x00038000, VdsVisitor.getQueryFlags(query));
+        assertEquals(0x00038000, StreamingVisitor.getQueryFlags(query));
         query.getRanking().setFreshness("now");
-        assertEquals(0x0003a000, VdsVisitor.getQueryFlags(query));
+        assertEquals(0x0003a000, StreamingVisitor.getQueryFlags(query));
     }
 
     @Test
@@ -321,7 +322,7 @@ public class VdsVisitorTestCase {
     }
 
     private void verifyVisitorOk(MockVisitorSessionFactory factory, QueryArguments qa, Route route, String searchCluster) throws Exception {
-        VdsVisitor visitor = new VdsVisitor(buildQuery(qa), searchCluster, route, "mytype", factory, 0);
+        StreamingVisitor visitor = new StreamingVisitor(buildQuery(qa), searchCluster, route, "mytype", factory, 0);
         visitor.doSearch();
         verifyVisitorParameters(factory.getParams(), qa, searchCluster, "mytype", route);
         supplyResults(visitor);
@@ -329,10 +330,10 @@ public class VdsVisitorTestCase {
     }
 
     private void verifyVisitorFails(MockVisitorSessionFactory factory, QueryArguments qa, Route route, String searchCluster) throws Exception {
-        VdsVisitor visitor = new VdsVisitor(buildQuery(qa), searchCluster, route, "mytype", factory, 0);
+        StreamingVisitor visitor = new StreamingVisitor(buildQuery(qa), searchCluster, route, "mytype", factory, 0);
         try {
             visitor.doSearch();
-            assertTrue(false, "Visitor did not fail");
+            fail("Visitor did not fail");
         } catch (TimeoutException te) {
             assertTrue(factory.timeoutQuery, "Got TimeoutException unexpectedly");
         } catch (IllegalArgumentException iae) {
@@ -340,20 +341,20 @@ public class VdsVisitorTestCase {
         }
     }
 
-    private void supplyResults(VdsVisitor visitor) {
+    private void supplyResults(StreamingVisitor visitor) {
         AckToken ackToken = null;
         visitor.onMessage(createQRM("id:ns:type::0", 0.3), ackToken);
         visitor.onMessage(createQRM("id:ns:type::1", 1.0), ackToken);
         visitor.onMessage(createQRM("id:ns:type::2", 0.5), ackToken);
         try {
             visitor.onMessage(createM(), ackToken);
-            assertTrue(false, "Unsupported message did not cause exception");
+            fail("Unsupported message did not cause exception");
         } catch (UnsupportedOperationException uoe) {
-            assertTrue(uoe.getMessage().contains("VdsVisitor can only accept query result messages"));
+            assertTrue(uoe.getMessage().contains("StreamingVisitor can only accept query result messages"));
         }
     }
 
-    private void verifyResults(QueryArguments qa, VdsVisitor visitor) {
+    private void verifyResults(QueryArguments qa, StreamingVisitor visitor) {
         assertEquals(6, visitor.getTotalHitCount());
         assertEquals(Math.min(3 - qa.offset, qa.hits), visitor.getHits().size());
         assertEquals(3, visitor.getSummaryMap().size());
@@ -373,7 +374,7 @@ public class VdsVisitorTestCase {
                 assertEquals("id:ns:type::0", hit.getDocId());
                 assertEquals(0.3, hit.getRank(), 0.01);
             } else {
-                assertTrue(false, "Got too many hits");
+                fail("Got too many hits");
             }
             DocumentSummary.Summary summary = visitor.getSummaryMap().get(hit.getDocId());
             assertNotNull(summary, "Did not find summary for " + hit.getDocId());
@@ -381,9 +382,10 @@ public class VdsVisitorTestCase {
     }
 
     private static class MockVisitorSession implements VisitorSession {
-        private VisitorParameters params;
-        private boolean timeoutQuery = false;
-        private boolean failQuery = false;
+
+        private final VisitorParameters params;
+        private final boolean timeoutQuery;
+        private final boolean failQuery;
 
         public MockVisitorSession(VisitorParameters params, boolean timeoutQuery, boolean failQuery) {
             this.params = params;
@@ -444,7 +446,8 @@ public class VdsVisitorTestCase {
         }
     }
 
-    private static class MockVisitorSessionFactory implements VdsVisitor.VisitorSessionFactory {
+    private static class MockVisitorSessionFactory implements StreamingVisitor.VisitorSessionFactory {
+
         private VisitorParameters params;
         private boolean timeoutQuery = false;
         private boolean failQuery = false;