diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-03-14 14:09:36 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-03-14 14:09:36 +0000 |
commit | 101614ccc0d1c0079a85143ced8c271cdc333e7a (patch) | |
tree | 9a4065227ead69c2f9673a69aab5679a59f969a9 /config-model/src | |
parent | a7bbb22c377f645981da6e2aa145c4f2525948c3 (diff) |
Revert "convert DocumentType to NewDocumentType inside reference"
This reverts commit 6e89431976e24a64878b2db5728c91b84160b150.
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java index 4a449dc898f..b71e2498669 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java @@ -291,17 +291,9 @@ public class DocumentModelBuilder { } else if (type instanceof ReferenceDataType) { ReferenceDataType t = (ReferenceDataType) type; - var tt = t.getTargetType(); - if (tt instanceof TemporaryStructuredDataType) { - DataType targetType = resolveTemporariesRecurse(tt, repo, docs, replacements); + if (t.getTargetType() instanceof TemporaryStructuredDataType) { + DataType targetType = resolveTemporariesRecurse(t.getTargetType(), repo, docs, replacements); t.setTargetType((StructuredDataType) targetType); - } else if (tt instanceof DocumentType) { - DataType targetType = resolveTemporariesRecurse(tt, repo, docs, replacements); - // super ugly, the APIs for this are horribly inconsistent - var tmptmp = TemporaryStructuredDataType.create(tt.getName()); - var tmp = new ReferenceDataType(tmptmp, t.getId()); - tmp.setTargetType((StructuredDataType) targetType); - type = tmp; } } if (type != original) { |