Handle type rendering

- Always output type for consistency.
- Ignore type in input.

2 files changed, 3 insertions, 1 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 0e8fbc30bb6..8322b3b6327 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java
@@ -74,7 +74,7 @@ public class JsonFormat {
             encodeBlocks((MixedTensor) tensor, root);
         }
         else {
-            // No other short forms exist: default to standard cell address output
+            // default to standard cell address output
             encodeCells(tensor, root);
         }
 
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java
index 6a6bb3c6781..1cbf1709be1 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/JsonFormatTestCase.java
@@ -32,11 +32,13 @@ public class JsonFormatTestCase {
         assertDecoded("tensor(x{}):{cells:2, b:3}", "{'cells':2.0, 'b':3.0}");
         assertDecoded("tensor(x{}):{values:2, b:3}", "{'values':2.0, 'b':3.0}");
         assertDecoded("tensor(x{}):{block:2, b:3}", "{'block':2.0, 'b':3.0}");
+        assertDecoded("tensor(x{}):{type:2, b:3}", "{'type':2.0, 'b':3.0}");
 
         // Multi-valued
         assertDecoded("tensor(x{},y[2]):{cells:[2, 3], b:[4, 5]}", "{'cells':[2, 3], 'b':[4, 5]}");
         assertDecoded("tensor(x{},y[2]):{values:[2, 3], b:[4, 5]}", "{'values':[2, 3], 'b':[4, 5]}");
         assertDecoded("tensor(x{},y[2]):{block:[2, 3], b:[4, 5]}", "{'block':[2, 3], 'b':[4, 5]}");
+        assertDecoded("tensor(x{},y[2]):{type:[2, 3], b:[4, 5]}", "{'type':[2, 3], 'b':[4, 5]}");
     }
 
     @Test