1 files changed, 42 insertions, 35 deletions

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 9fda53d52ce..d896a7f7d22 100644
--- a/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/documentmodel/NewDocumentType.java
@@ -32,34 +32,6 @@ import static java.util.Collections.emptySet;
  */
 public final class NewDocumentType extends StructuredDataType implements DataTypeCollection {
 
-    public static final class Name {
-
-        private final String name;
-        private final int id;
-
-        public Name(String name) {
-            this(name.hashCode(), name);
-        }
-
-        public Name(int id, String name) {
-            this.id = id;
-            this.name = name;
-        }
-
-        public String toString() { return name; }
-
-        public final String getName() { return name; }
-
-        public final int getId() { return id; }
-
-        public int hashCode() { return name.hashCode(); }
-
-        public boolean equals(Object other) {
-            if ( ! (other instanceof Name)) return false;
-            return name.equals(((Name)other).getName());
-        }
-    }
-
     private final Name name;
     private final DataTypeRepo dataTypes = new DataTypeRepo();
     private final Map<Integer, NewDocumentType> inherits = new LinkedHashMap<>();
@@ -139,7 +111,7 @@ public final class NewDocumentType extends StructuredDataType implements DataTyp
     }
 
     @Override
-    public Class getValueClass() {
+    public Class<Document> getValueClass() {
         return Document.class;
     }
 
@@ -148,7 +120,8 @@ public final class NewDocumentType extends StructuredDataType implements DataTyp
         if (!(value instanceof Document)) {
             return false;
         }
-        /** Temporary disabled  due to clash with document and covariant return type
+        /*
+         Temporary disabled  due to clash with document and covariant return type
          Document doc = (Document) value;
          if (((NewDocumentType) doc.getDataType()).inherits(this)) {
          //the value is of this type; or the supertype of the value is of this type, etc....
@@ -162,28 +135,31 @@ public final class NewDocumentType extends StructuredDataType implements DataTyp
         for (Field f : getFields()) {
             Field inhF = inherited.getField(f.getName());
             if (inhF != null && !inhF.equals(f)) {
-                 throw new IllegalArgumentException("Inherited document '" + inherited.toString() + "' already contains field '" +
-                         inhF.getName() + "'. Can not override with '" + f.getName() + "'.");
+                 throw new IllegalArgumentException("Inherited document '" + inherited + "' already contains field '" +
+                                                    inhF.getName() + "'. Can not override with '" + f.getName() + "'.");
             }
         }
         for (Field f : inherited.getAllFields()) {
             for (NewDocumentType side : inherits.values()) {
                 Field sideF = side.getField(f.getName());
                 if (sideF != null && !sideF.equals(f)) {
-                    throw new IllegalArgumentException("Inherited document '" + side.toString() + "' already contains field '" +
-                            sideF.getName() + "'. Document '" + inherited.toString() + "' also defines field '" + f.getName() +
-                            "'.Multiple inheritance must be disjunctive.");
+                    throw new IllegalArgumentException("Inherited document '" + side + "' already contains field '" +
+                                                       sideF.getName() + "'. Document '" + inherited +
+                                                       "' also defines field '" + f.getName() +
+                                                       "'.Multiple inheritance must be disjunctive.");
                 }
             }
         }
         return true;
     }
+
     public void inherit(NewDocumentType inherited) {
         if ( ! inherits.containsKey(inherited.getId())) {
             verifyInheritance(inherited);
             inherits.put(inherited.getId(), inherited);
         }
     }
+
     public boolean inherits(NewDocumentType superType) {
         if (getId() == superType.getId()) return true;
         for (NewDocumentType type : inherits.values()) {
@@ -375,4 +351,35 @@ public final class NewDocumentType extends StructuredDataType implements DataTyp
         return importedFieldNames;
     }
 
+    public static final class Name {
+
+        private final String name;
+        private final int id;
+
+        public Name(String name) {
+            this(name.hashCode(), name);
+        }
+
+        public Name(int id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        public String toString() { return name; }
+
+        public final String getName() { return name; }
+
+        public final int getId() { return id; }
+
+        @Override
+        public int hashCode() { return name.hashCode(); }
+
+        @Override
+        public boolean equals(Object other) {
+            if ( ! (other instanceof Name)) return false;
+            return name.equals(((Name)other).getName());
+        }
+
+    }
+
 }