Revert "Revert "Revert "Bratseth/tensor type info in documents"""

5 files changed, 13 insertions, 11 deletions

diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java
index ff1a582d7fa..9c507d7be05 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeCollection.java
@@ -9,9 +9,7 @@ import java.util.Collection;
  * @author baldersheim
  */
 public interface DataTypeCollection {
-
-    DataType getDataType(String name);
-    DataType getDataType(int id);
-    Collection<DataType> getTypes();
-
+    public DataType getDataType(String name);
+    public DataType getDataType(int id);
+    public Collection<DataType> getTypes();
 }
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
index 2c527201ce4..73f8d7f91c5 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
@@ -11,7 +11,6 @@ import java.util.Map;
  * @author baldersheim
  */
 public class DataTypeRepo implements DataTypeCollection {
-
     Map<Integer, DataType> typeById = new LinkedHashMap<>();
     Map<String, DataType> typeByName = new LinkedHashMap<>();
 
@@ -26,9 +25,10 @@ public class DataTypeRepo implements DataTypeCollection {
     public Collection<DataType> getTypes() { return typeById.values(); }
 
     public DataTypeRepo add(DataType type) {
-        if (typeByName.containsKey(type.getName()) || typeById.containsKey(type.getId())) {
-            throw new IllegalStateException("Data type '" + type.getName() + "', id '" + 
-                                            type.getId() + "' is already registered.");
+        if (typeByName.containsKey(type.getName()) ||
+            typeById.containsKey(type.getId()))
+        {
+            throw new IllegalStateException("Data type '" + type.getName() + "', id '" + type.getId() + "' is already registered.");
         }
         typeByName.put(type.getName(), type);
         typeById.put(type.getId(), type);
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
index 1abbf8b3ae1..b71a400666a 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
@@ -9,7 +9,6 @@ import java.util.Map;
  * @author baldersheim
  */
 public class DocumentTypeRepo implements DocumentTypeCollection {
-
     final Map<Integer, NewDocumentType> typeById = new LinkedHashMap<>();
     final Map<NewDocumentType.Name, NewDocumentType> typeByName = new LinkedHashMap<>();
 
@@ -37,5 +36,4 @@ public class DocumentTypeRepo implements DocumentTypeCollection {
         typeById.put(type.getFullName().getId(), type);
         return this;
     }
-
 }
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
index 7c594a4e836..ccf9bdec302 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
@@ -13,10 +13,15 @@ import com.yahoo.searchdefinition.processing.BuiltInFieldSets;
 import java.util.*;
 
 /**
+ * TODO: What is this and why?
+ *
  * @author baldersheim
  */
 public final class NewDocumentType extends StructuredDataType implements DataTypeCollection {
 
+    /**
+     * TODO: What is this and why?
+     */
     public static final class Name {
 
         // TODO: privatize
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
index 09aa55f776b..793a5fcff6c 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
@@ -32,6 +32,7 @@ public class VespaDocumentType {
         vespa.add(PositionDataType.INSTANCE);
         vespa.add(DataType.URI);
         vespa.add(DataType.PREDICATE);
+        vespa.add(DataType.TENSOR);
         return vespa;
     }