Revert "Revert "Bratseth/tensorflow models""

6 files changed, 20 insertions, 20 deletions

diff --git a/document/src/main/java/com/yahoo/document/DataType.java b/document/src/main/java/com/yahoo/document/DataType.java
index c8a04866aa9..abdbf394591 100644
--- a/document/src/main/java/com/yahoo/document/DataType.java
+++ b/document/src/main/java/com/yahoo/document/DataType.java
@@ -51,7 +51,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com
     public final static PrimitiveDataType URI = new PrimitiveDataType("uri", 10, UriFieldValue.class, new UriFieldValue.Factory());
     public final static NumericDataType BYTE = new NumericDataType("byte", 16, ByteFieldValue.class, ByteFieldValue.getFactory());
     public final static PrimitiveDataType PREDICATE = new PrimitiveDataType("predicate", 20, PredicateFieldValue.class, PredicateFieldValue.getFactory());
-    public final static int tensorDataTypeCode = 21; // All TensorDataType instances have id=21 but carries additional type information serialized separately 
+    public final static int tensorDataTypeCode = 21; // All TensorDataType instances have id=21 but carries additional type information serialized separately
     // ADDITIONAL parametrized types added at runtime: map, struct, array, weighted set, annotation reference, tensor
 
     // Tags are converted to weightedset<string> when reading the search definition TODO: Remove it
@@ -99,7 +99,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com
 
     /**
      * Creates a field value by reflection
-     * 
+     *
      * @param arg the value of the newly created field value
      * @return a fully constructed value
      */
@@ -201,7 +201,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com
     public static TensorDataType getTensor(TensorType type) {
         return new TensorDataType(type);
     }
-    
+
     public String getName() {
         return name;
     }
@@ -267,7 +267,7 @@ public abstract class DataType extends Identifiable implements Serializable, Com
      */
     public FieldPath buildFieldPath(String fieldPathString) {
         if (fieldPathString.length() > 0) {
-            throw new IllegalArgumentException("Datatype " + toString() + 
+            throw new IllegalArgumentException("Datatype " + toString() +
                                                " does not support further recursive structure: " + fieldPathString);
         }
         return new FieldPath();
diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java
index 8c9318199d8..5fad35a2287 100644
--- a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java
+++ b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java
@@ -38,7 +38,7 @@ public class DocumentTypeManager {
     // *Configured data types* (not built-in/primitive) indexed by their id
     //
     // *Primitive* data types are always available and have a single id.
-    // 
+    //
     // *Built-in dynamic* types: The tensor type.
     // Any tensor type has the same id and is always available just like primitive types.
     // However, unlike primitive types, each tensor type is a separate DataType instance
@@ -112,7 +112,7 @@ public class DocumentTypeManager {
     public DataType getDataType(String name) {
         if (name.startsWith("tensor(")) // built-in dynamic
             return new TensorDataType(TensorType.fromSpec(name));
-        
+
         List<DataType> foundTypes = new ArrayList<>();
         for (DataType type : dataTypes.values()) {
             if (type.getName().equalsIgnoreCase(name)) {
@@ -141,10 +141,10 @@ public class DocumentTypeManager {
     }
 
     public DataType getDataType(int code) { return getDataType(code, ""); }
-    
+
     /**
      * Return a data type instance
-     * 
+     *
      * @param code the code of the data type to return, which must be either built in or present in this manager
      * @param detailedType detailed type information, or the empty string if none
      * @return the appropriate DataType instance
@@ -183,7 +183,7 @@ public class DocumentTypeManager {
 
     /**
      * Register a single datatype. Re-registering an existing, but equal, datatype is ok.
-     * 
+     *
      * @param type The datatype to register
      */
     void registerSingleType(DataType type) {
@@ -280,7 +280,7 @@ public class DocumentTypeManager {
 
     /**
      * Returns a read only view of the registered data types
-     * 
+     *
      * @return collection of types
      */
     public Collection<DataType> getDataTypes() {
diff --git a/document/src/main/java/com/yahoo/document/TensorDataType.java b/document/src/main/java/com/yahoo/document/TensorDataType.java
index aefdc030a12..50e9cf0f60f 100644
--- a/document/src/main/java/com/yahoo/document/TensorDataType.java
+++ b/document/src/main/java/com/yahoo/document/TensorDataType.java
@@ -8,13 +8,13 @@ import com.yahoo.vespa.objects.Ids;
 
 /**
  * A DataType containing a tensor type
- * 
+ *
  * @author bratseth
  */
 public class TensorDataType extends DataType {
 
     private final TensorType tensorType;
-    
+
     // The global class identifier shared with C++.
     public static int classId = registerClass(Ids.document + 59, TensorDataType.class);
 
@@ -47,5 +47,5 @@ public class TensorDataType extends DataType {
 
     /** Returns the type of the tensor this field can hold */
     public TensorType getTensorType() { return tensorType; }
-    
+
 }
diff --git a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
index ae8d5cf596a..1808396986e 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/TensorFieldValue.java
@@ -19,7 +19,7 @@ import java.util.Optional;
 public class TensorFieldValue extends FieldValue {
 
     private Optional<Tensor> tensor;
-    
+
     private final TensorDataType dataType;
 
     /** Create an empty tensor field value */
@@ -66,7 +66,7 @@ public class TensorFieldValue extends FieldValue {
                                                o.getClass().getName() + "'.");
         }
     }
-    
+
     public void assignTensor(Optional<Tensor> tensor) {
         if (tensor.isPresent() && ! tensor.get().type().isAssignableTo(dataType.getTensorType()))
             throw new IllegalArgumentException("Type mismatch: Cannot assign tensor of type " + tensor.get().type() +
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
index f37fa5ea675..29ba244a9f1 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
@@ -146,9 +146,9 @@ public class JsonReaderTestCase {
         }
         {
             DocumentType x = new DocumentType("testtensor");
-            x.addField(new Field("mappedtensorfield", 
+            x.addField(new Field("mappedtensorfield",
                                  new TensorDataType(new TensorType.Builder().mapped("x").mapped("y").build())));
-            x.addField(new Field("indexedtensorfield", 
+            x.addField(new Field("indexedtensorfield",
                                  new TensorDataType(new TensorType.Builder().indexed("x").indexed("y").build())));
             types.registerDocumentType(x);
         }
@@ -1280,8 +1280,8 @@ public class JsonReaderTestCase {
         return (DocumentPut) reader.next();
     }
 
-    private DocumentPut createPutWithMappedTensor(String inputTensor) { 
-        return createPutWithTensor(inputTensor, "mappedtensorfield"); 
+    private DocumentPut createPutWithMappedTensor(String inputTensor) {
+        return createPutWithTensor(inputTensor, "mappedtensorfield");
     }
     private DocumentPut createPutWithTensor(String inputTensor, String tensorFieldName) {
         InputStream rawDoc = new ByteArrayInputStream(
diff --git a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
index 7104c1686f8..5c65b11a0c4 100644
--- a/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/TensorFieldValueSerializationTestCase.java
@@ -24,7 +24,7 @@ public class TensorFieldValueSerializationTestCase {
     private final static TensorType tensorType = new TensorType.Builder().mapped("dimX").mapped("dimY").build();
     private final static String TENSOR_FIELD = "my_tensor";
     private final static String TENSOR_FILES = "src/test/resources/tensor/";
-    private final static TestDocumentFactory docFactory = new TestDocumentFactory(createDocType(), 
+    private final static TestDocumentFactory docFactory = new TestDocumentFactory(createDocType(),
                                                                                   "id:test:my_type::foo");
 
     private static DocumentType createDocType() {