Support for configuring and feeding float16 and bool field types

5 files changed, 13 insertions, 13 deletions

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 cb4b3f6f532..7e5f393c3e0 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DataTypeRepo.java
@@ -12,8 +12,8 @@ import java.util.Map;
  */
 public class DataTypeRepo implements DataTypeCollection {
 
-    Map<Integer, DataType> typeById = new LinkedHashMap<>();
-    Map<String, DataType> typeByName = new LinkedHashMap<>();
+    private Map<Integer, DataType> typeById = new LinkedHashMap<>();
+    private Map<String, DataType> typeByName = new LinkedHashMap<>();
 
     public DataType getDataType(String name) {
         return typeByName.get(name);
diff --git a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java
index 3e711a48109..debb22ece9e 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeCollection.java
@@ -7,7 +7,9 @@ import java.util.Collection;
  * @author baldersheim
  */
 public interface DocumentTypeCollection {
-    public NewDocumentType getDocumentType(NewDocumentType.Name name);
-    public NewDocumentType getDocumentType(int id);
-    public Collection<NewDocumentType> getTypes();
+
+    NewDocumentType getDocumentType(NewDocumentType.Name name);
+    NewDocumentType getDocumentType(int id);
+    Collection<NewDocumentType> getTypes();
+
 }
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 5138caf0b28..7ab8d0f1d8d 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/DocumentTypeRepo.java
@@ -10,8 +10,8 @@ import java.util.Map;
  */
 public class DocumentTypeRepo implements DocumentTypeCollection {
 
-    final Map<Integer, NewDocumentType> typeById = new LinkedHashMap<>();
-    final Map<NewDocumentType.Name, NewDocumentType> typeByName = new LinkedHashMap<>();
+    private final Map<Integer, NewDocumentType> typeById = new LinkedHashMap<>();
+    private final Map<NewDocumentType.Name, NewDocumentType> typeByName = new LinkedHashMap<>();
 
     public final NewDocumentType getDocumentType(String name) {
         return typeByName.get(new NewDocumentType.Name(name));
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 06bb32213f9..fc42864f1d0 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
@@ -32,7 +32,6 @@ import static java.util.Collections.emptySet;
  */
 public final class NewDocumentType extends StructuredDataType implements DataTypeCollection {
 
-
     public static final class Name {
 
         // TODO: privatize
@@ -381,10 +380,7 @@ public final class NewDocumentType extends StructuredDataType implements DataTyp
         return this;
     }
 
-    /**
-     * The field sets defined for this type and its {@link Search}
-     * @return fieldsets
-     */
+    /** The field sets defined for this type and its {@link Search} */
     public Set<FieldSet> getFieldSets() {
         return Collections.unmodifiableSet(fieldSets);
     }
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 2f2c308e633..69fe6f74d27 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/VespaDocumentType.java
@@ -6,7 +6,7 @@ import com.yahoo.document.DataTypeName;
 import com.yahoo.document.PositionDataType;
 
 /**
- * This class represents the builtin 'doument' document type that all other documenttypes inherits.
+ * This class represents the builtin 'document' document type that all other documenttypes inherits.
  * Remember that changes here must be compatible. Changes to types of fields can not be done here.
  * This must also match the mirroring class in c++.
  *
@@ -32,6 +32,8 @@ public class VespaDocumentType {
         vespa.add(PositionDataType.INSTANCE);
         vespa.add(DataType.URI);
         vespa.add(DataType.PREDICATE);
+        vespa.add(DataType.BOOL);
+        vespa.add(DataType.FLOAT16);
         return vespa;
     }