Add TODO on removing the 'uri' field. Correct streaming hit source.

3 files changed, 5 insertions, 7 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index ee3f9ac0583..29dcd5c1b30 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -68,7 +68,7 @@ public class FastHit extends Hit {
 
     public FastHit(String uri, double relevance, String source) {
         setId(uri);
-        super.setField("uri", uri);
+        super.setField("uri", uri); // TODO: Remove on Vespa 7
         setRelevance(new Relevance(relevance));
         setSource(source);
         types().add(SUMMARY);
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
index 3917d353630..3ead2541a84 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
@@ -219,12 +219,10 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
     private FastHit buildSummaryHit(Query query, SearchResult.Hit hit) {
         FastHit fastHit = new FastHit();
         fastHit.setQuery(query);
-        fastHit.setSource("VdsStreamingSearcher");
+        fastHit.setSource(getName());
         fastHit.setId(hit.getDocId());
-        // TODO: remove seField("uri", ...), just a helper for Velocity templates
-        fastHit.setField("uri", hit.getDocId());
-        fastHit.types().add("summary");
-
+        fastHit.setField("uri", hit.getDocId()); // TODO: Remove on Vespa 7
+        fastHit.types().add(FastHit.SUMMARY);
         fastHit.setRelevance(new Relevance(hit.getRank()));
 
         fastHit.setFillable();
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
index 1931dd2179e..e3797b1f63e 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
@@ -175,7 +175,7 @@ public class VdsStreamingSearcherTestCase {
             for (int i=0; i<result.hits().size(); ++i) {
                 Hit hit = result.hits().get(i);
                 if (idPrefix != null) {
-                    assertEquals("VdsStreamingSearcher", hit.getSource());
+                    assertEquals("clusterName", hit.getSource());
                     assertEquals(idPrefix + i, hit.getId().toString());
                 } else {
                     assertNull(hit.getSource());