Merge pull request #24506 from vespa-engine/bratseth/inputs

More input tests and better error message

4 files changed, 20 insertions, 8 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
index c4316eb334a..50809ab3ff6 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/IndexedTensor.java
@@ -219,7 +219,9 @@ public abstract class IndexedTensor implements Tensor {
     }
 
     @Override
-    public String toString() { return toString(true, true); }
+    public String toString() {
+        return toString(true, true);
+    }
 
     @Override
     public String toString(boolean withType, boolean shortForms) {
@@ -227,8 +229,8 @@ public abstract class IndexedTensor implements Tensor {
     }
 
     @Override
-    public String toAbbreviatedString() {
-        return toString(true, true, Math.max(2, 10 / (type().dimensions().stream().filter(d -> d.isMapped()).count() + 1)));
+    public String toAbbreviatedString(boolean withType, boolean shortForms) {
+        return toString(withType, shortForms, Math.max(2, 10 / (type().dimensions().stream().filter(d -> d.isMapped()).count() + 1)));
     }
 
     private String toString(boolean withType, boolean shortForms, long maxCells) {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MappedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/MappedTensor.java
index 946d8fe0f4a..3ea128ffa9f 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/MappedTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/MappedTensor.java
@@ -78,8 +78,8 @@ public class MappedTensor implements Tensor {
     public String toString(boolean withType, boolean shortForms) { return toString(withType, shortForms, Long.MAX_VALUE); }
 
     @Override
-    public String toAbbreviatedString() {
-        return toString(true, true, Math.max(2, 10 / (type().dimensions().stream().filter(d -> d.isMapped()).count() + 1)));
+    public String toAbbreviatedString(boolean withType, boolean shortForms) {
+        return toString(withType, shortForms, Math.max(2, 10 / (type().dimensions().stream().filter(d -> d.isMapped()).count() + 1)));
     }
 
     private String toString(boolean withType, boolean shortForms, long maxCells) {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java
index d2fed9b96f9..e7690876434 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/MixedTensor.java
@@ -154,8 +154,8 @@ public class MixedTensor implements Tensor {
     }
 
     @Override
-    public String toAbbreviatedString() {
-        return toString(true, true, Math.max(2, 10 / (type().dimensions().stream().filter(d -> d.isMapped()).count() + 1)));
+    public String toAbbreviatedString(boolean withType, boolean shortForms) {
+        return toString(withType, shortForms, Math.max(2, 10 / (type().dimensions().stream().filter(d -> d.isMapped()).count() + 1)));
     }
 
     private String toString(boolean withType, boolean shortForms, long maxCells) {
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
index 349214ee7f9..2ad3212c424 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
@@ -325,7 +325,17 @@ public interface Tensor {
     String toString(boolean withType, boolean shortForms);
 
     /** Returns an abbreviated string representation of this tensor suitable for human-readable messages */
-    String toAbbreviatedString();
+    default String toAbbreviatedString() {
+        return toAbbreviatedString(true, true);
+    }
+
+    /**
+     * Returns an abbreviated string representation of this tensor suitable for human-readable messages
+     *
+     * @param withType whether to prefix the value by the type of this
+     * @param shortForms whether to use short forms where applicable, or always using the verbose form
+     */
+    String toAbbreviatedString(boolean withType, boolean shortForms);
 
     /**
      * Call this from toString in implementations to return this tensor on the