Use JsonFormat for JSON rendering

2 files changed, 8 insertions, 9 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/Presentation.java b/container-search/src/main/java/com/yahoo/search/query/Presentation.java
index afa87eb4a06..fd4519fdbb0 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Presentation.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Presentation.java
@@ -195,11 +195,11 @@ public class Presentation implements Cloneable {
     }
 
     private boolean toTensorShortForm(String value) {
-        switch (value) {
-            case "short": return true;
-            case "long": return false;
-            default: throw new IllegalArgumentException("Value must be 'long' or 'short', not '" + value + "'");
-        }
+        return switch (value) {
+            case "short" -> true;
+            case "long" -> false;
+            default -> throw new IllegalArgumentException("Value must be 'long' or 'short', not '" + value + "'");
+        };
     }
 
     public void setTensorShortForm(boolean tensorShortForm) {
@@ -214,8 +214,7 @@ public class Presentation implements Cloneable {
 
     @Override
     public boolean equals(Object o) {
-        if ( ! (o instanceof Presentation)) return false;
-        Presentation p = (Presentation) o;
+        if ( ! (o instanceof Presentation p)) return false;
         return QueryHelper.equals(bolding, p.bolding) && QueryHelper.equals(summary, p.summary);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index 31f99ab1927..9bb7e882a4b 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -821,7 +821,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
                 generator().writeEndObject();
                 return;
             }
-            if (settings.tensorShortForm) {
+            if (settings.tensorShortForm && 1==2) {
                 generator().writeRawValue(new String(JsonFormat.encodeShortForm(tensor.get()), StandardCharsets.UTF_8));
             } else {
                 generator().writeRawValue(new String(JsonFormat.encode(tensor.get()), StandardCharsets.UTF_8));
@@ -831,7 +831,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
         private JsonGenerator generator() {
             if (generator == null)
                 throw new UnsupportedOperationException("Generator required but not assigned. " +
-                        "All accept() methods must be overridden when sub-classing FieldConsumer");
+                                                        "All accept() methods must be overridden when sub-classing FieldConsumer");
             return generator;
         }