Parse input default values

3 files changed, 23 insertions, 2 deletions

diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json
index 6044666ebf8..aea1c84fa76 100644
--- a/vespajlib/abi-spec.json
+++ b/vespajlib/abi-spec.json
@@ -1092,6 +1092,7 @@
     ],
     "methods": [
       "public com.yahoo.tensor.Tensor$Builder$CellBuilder label(java.lang.String, java.lang.String)",
+      "public com.yahoo.tensor.TensorType type()",
       "public com.yahoo.tensor.Tensor$Builder$CellBuilder label(java.lang.String, long)",
       "public com.yahoo.tensor.Tensor$Builder value(double)",
       "public com.yahoo.tensor.Tensor$Builder value(float)"
@@ -1256,8 +1257,10 @@
     ],
     "methods": [
       "public void <init>(com.yahoo.tensor.TensorType)",
+      "public com.yahoo.tensor.TensorAddress$Builder add(java.lang.String)",
       "public com.yahoo.tensor.TensorAddress$Builder add(java.lang.String, java.lang.String)",
       "public com.yahoo.tensor.TensorAddress$Builder copy()",
+      "public com.yahoo.tensor.TensorType type()",
       "public com.yahoo.tensor.TensorAddress build()"
     ],
     "fields": []
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
index 06e7b010a7a..94b00e7e277 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/Tensor.java
@@ -533,7 +533,7 @@ public interface Tensor {
                 return IndexedTensor.Builder.of(type, dimensionSizes);
         }
 
-        /** Returns the type this is building */
+        /** Returns the type of the tensor this is building */
         TensorType type();
 
         /** Return a cell builder */
@@ -578,6 +578,9 @@ public interface Tensor {
                 return this;
             }
 
+            /** Returns the type of the tensor this cell is build for. */
+            public TensorType type() { return tensorBuilder.type(); }
+
             public CellBuilder label(String dimension, long label) {
                 return label(dimension, String.valueOf(label));
             }
diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
index 27e752f1180..d9ab67d6c5f 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorAddress.java
@@ -168,7 +168,7 @@ public abstract class TensorAddress implements Comparable<TensorAddress> {
 
     }
 
-    /** Supports building of a tensor address */
+    /** Builder of a tensor address */
     public static class Builder {
 
         private final TensorType type;
@@ -184,6 +184,18 @@ public abstract class TensorAddress implements Comparable<TensorAddress> {
         }
 
         /**
+         * Adds the label to the only dimension of this.
+         *
+         * @throws IllegalArgumentException if this does not have exactly one dimension
+         */
+        public Builder add(String label) {
+            if (type.rank() != 1)
+                throw new IllegalArgumentException("Cannot add a label without explicit dimension to a tensor of type " + type);
+            add(type.dimensions().get(0).name(), label);
+            return this;
+        }
+
+        /**
          * Adds a label in a dimension to this.
          *
          * @return this for convenience
@@ -203,6 +215,9 @@ public abstract class TensorAddress implements Comparable<TensorAddress> {
             return new Builder(type, Arrays.copyOf(labels, labels.length));
         }
 
+        /** Returns the type of the tensor this address is being built for. */
+        public TensorType type() { return type; }
+
         public TensorAddress build() {
             for (int i = 0; i < labels.length; i++)
                 if (labels[i] == null)