remove TemporarySDDocumentType

* track converted structs as we make them
* inherit directly instead of by name
* remove code to deal with the no-longer-needed temporaries

2 files changed, 1 insertions, 19 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/document/SDDocumentType.java b/config-model/src/main/java/com/yahoo/schema/document/SDDocumentType.java
index d19b62ce555..919a6023151 100644
--- a/config-model/src/main/java/com/yahoo/schema/document/SDDocumentType.java
+++ b/config-model/src/main/java/com/yahoo/schema/document/SDDocumentType.java
@@ -167,16 +167,11 @@ public class SDDocumentType implements Cloneable {
     public DataTypeName getDocumentName() { return docType.getDataTypeName(); }
     public DocumentType getDocumentType() { return docType; }
 
-    public void inherit(DataTypeName name) {
-        inherit(new TemporarySDDocumentType(name));
-    }
-
     public void inherit(SDDocumentType type) {
         if (type == null) return;
         if (type.getName().equals(this.getName()))
             throw new IllegalArgumentException("Document type '" + getName() + "' cannot inherit itself");
-        if ( ! inheritedTypes.containsKey(type.getDocumentName()) ||
-             (inheritedTypes.get(type.getDocumentName()) instanceof TemporarySDDocumentType)) {
+        if (! inheritedTypes.containsKey(type.getDocumentName())) {
             inheritedTypes.put(type.getDocumentName(), type);
         }
     }
diff --git a/config-model/src/main/java/com/yahoo/schema/document/TemporarySDDocumentType.java b/config-model/src/main/java/com/yahoo/schema/document/TemporarySDDocumentType.java
deleted file mode 100644
index 3194a14a143..00000000000
--- a/config-model/src/main/java/com/yahoo/schema/document/TemporarySDDocumentType.java
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.schema.document;
-
-import com.yahoo.document.DataTypeName;
-
-/**
- * @author baldersheim
- */
-public class TemporarySDDocumentType extends SDDocumentType {
-    public TemporarySDDocumentType(DataTypeName name) {
-        super(name);
-    }
-}