1 files changed, 5 insertions, 8 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
index 444ce02b14a..771b74633d9 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
@@ -21,10 +21,8 @@ import com.yahoo.tensor.functions.ConstantTensor;
 import com.yahoo.tensor.functions.Slice;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Writes tensors on the JSON format used in Vespa tensor document fields:
@@ -60,8 +58,7 @@ public class JsonFormat {
                 // Short form for a single mapped dimension
                 Cursor parent = root == null ? slime.setObject() : root.setObject("cells");
                 encodeSingleDimensionCells((MappedTensor) tensor, parent);
-            } else if (tensor instanceof MixedTensor &&
-                       tensor.type().dimensions().stream().anyMatch(TensorType.Dimension::isMapped)) {
+            } else if (tensor instanceof MixedTensor && tensor.type().hasMappedDimensions()) {
                 // Short form for a mixed tensor
                 boolean singleMapped = tensor.type().dimensions().stream().filter(TensorType.Dimension::isMapped).count() == 1;
                 Cursor parent = root == null ? ( singleMapped ? slime.setObject() : slime.setArray() )
@@ -204,7 +201,7 @@ public class JsonFormat {
 
         if (root.field("cells").valid() && ! primitiveContent(root.field("cells")))
             decodeCells(root.field("cells"), builder);
-        else if (root.field("values").valid() && builder.type().dimensions().stream().allMatch(d -> d.isIndexed()))
+        else if (root.field("values").valid() && ! builder.type().hasMappedDimensions())
             decodeValuesAtTop(root.field("values"), builder);
         else if (root.field("blocks").valid())
             decodeBlocks(root.field("blocks"), builder);
@@ -298,14 +295,14 @@ public class JsonFormat {
 
     /** Decodes a tensor value directly at the root, where the format is decided by the tensor type. */
     private static void decodeDirectValue(Inspector root, Tensor.Builder builder) {
-        boolean hasIndexed = builder.type().dimensions().stream().anyMatch(TensorType.Dimension::isIndexed);
-        boolean hasMapped = builder.type().dimensions().stream().anyMatch(TensorType.Dimension::isMapped);
+        boolean hasIndexed = builder.type().hasIndexedDimensions();
+        boolean hasMapped = builder.type().hasMappedDimensions();
 
         if (isArrayOfObjects(root))
             decodeCells(root, builder);
         else if ( ! hasMapped)
             decodeValuesAtTop(root, builder);
-        else if (hasMapped && hasIndexed)
+        else if (hasIndexed)
             decodeBlocks(root, builder);
         else
             decodeCells(root, builder);