Deprecate Hit.getTypeString()

2 files changed, 5 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
index b49ff0f7482..f0c7b1a183f 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/DefaultRenderer.java
@@ -35,6 +35,7 @@ import java.nio.charset.CharsetEncoder;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
 
 // TODO: Rename to XmlRenderer and make this a deprecated empty subclass.
 
@@ -250,10 +251,9 @@ public final class DefaultRenderer extends AsynchronousSectionedRenderer<Result>
     }
 
     private void renderHitAttributes(XMLWriter writer, Hit hit) {
-        writer.attribute(TYPE, hit.getTypeString());
-        if (hit.getRelevance() != null) {
+        writer.attribute(TYPE, hit.types().stream().collect(Collectors.joining(" ")));
+        if (hit.getRelevance() != null)
             writer.attribute(RELEVANCY, hit.getRelevance().toString());
-}
         writer.attribute(SOURCE, hit.getSource());
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
index a4fe077fce2..dc72061e224 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/SyncDefaultRenderer.java
@@ -32,6 +32,7 @@ import java.io.Writer;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 /**
  * @author tonytv
@@ -337,7 +338,7 @@ public final class SyncDefaultRenderer extends Renderer {
     }
 
     private void renderHitAttributes(XMLWriter writer, Hit hit) {
-        writer.attribute(TYPE, hit.getTypeString());
+        writer.attribute(TYPE, hit.types().stream().collect(Collectors.joining(" ")));
         if (hit.getRelevance() != null) {
             writer.attribute(RELEVANCY, hit.getRelevance().toString());
 }