diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-06-02 10:40:41 +0000 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:24 +0200 |
commit | 338d383d81ee6b142b308ef8798b44374b480838 (patch) | |
tree | 0af5af65e84a05fb2f8fbdcb1050b9d5db793937 /config-model/src | |
parent | 9e330c98d573866f162ef76207a8699d76d634c4 (diff) |
remove TemporaryStructuredDataType
Diffstat (limited to 'config-model/src')
3 files changed, 2 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/schema/DocumentModelBuilder.java index 1a6134b410f..50ae4b72e13 100644 --- a/config-model/src/main/java/com/yahoo/schema/DocumentModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/schema/DocumentModelBuilder.java @@ -8,7 +8,6 @@ import com.yahoo.document.DocumentType; import com.yahoo.document.Field; import com.yahoo.document.MapDataType; import com.yahoo.document.StructDataType; -import com.yahoo.document.TemporaryStructuredDataType; import com.yahoo.document.WeightedSetDataType; import com.yahoo.document.annotation.AnnotationReferenceDataType; import com.yahoo.document.annotation.AnnotationType; @@ -232,9 +231,6 @@ public class DocumentModelBuilder { return replacements.get(type); } DataType original = type; - if (type instanceof TemporaryStructuredDataType) { - throw new IllegalArgumentException("Cannot handle temporary: " + type); - } if (type instanceof TemporaryUnknownType) { // must be a known struct or document type DataType other = repo.getDataType(type.getId()); diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java index 1974774f7b5..dc10cf36244 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentManager.java @@ -188,9 +188,7 @@ public class DocumentManager { return; } indexMap.setDone(type); - if (type instanceof TemporaryStructuredDataType) { - throw new IllegalArgumentException("Can not create config for temporary data type: " + type.getName()); - } else if (type instanceof TemporaryUnknownType) { + if (type instanceof TemporaryUnknownType) { throw new IllegalArgumentException("Can not create config for temporary data type: " + type.getName()); } else if (type instanceof OwnedTemporaryType) { throw new IllegalArgumentException("Can not create config for temporary data type: " + type.getName()); diff --git a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java index bb57cd189c9..b55eddd771d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java +++ b/config-model/src/main/java/com/yahoo/vespa/configmodel/producers/DocumentTypes.java @@ -167,9 +167,7 @@ public class DocumentTypes { return; } indexMap.setDone(type); - if (type instanceof TemporaryStructuredDataType) { - throw new IllegalArgumentException("Can not create config for temporary data type: " + type.getName()); - } else if (type instanceof TemporaryUnknownType) { + if (type instanceof TemporaryUnknownType) { throw new IllegalArgumentException("Can not create config for temporary data type: " + type.getName()); } else if (type instanceof OwnedTemporaryType) { throw new IllegalArgumentException("Can not create config for temporary data type: " + type.getName()); |