summaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-25 14:48:48 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-25 14:48:48 +0200
commita97e90f7cc5bad4448d6f7b28f7dceebb70768da (patch)
treed6ac196664d2cd427f86bcef7e9b5d8ffee4d4f2 /config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
parent6b02d4bd56f0ca11e7771daf809a7058b4b67514 (diff)
warn for deprecation too
Diffstat (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java6
1 files changed, 5 insertions, 1 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 42ad77376c5..387f8ed867e 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
@@ -201,6 +201,8 @@ public class DocumentModelBuilder {
resolveTemporariesRecurse(type, dtc, docs);
}
}
+
+ @SuppressWarnings("deprecation")
private static DataType resolveTemporariesRecurse(DataType type, DataTypeCollection repo,
Collection<NewDocumentType> docs) {
if (type instanceof TemporaryStructuredDataType) {
@@ -218,6 +220,7 @@ public class DocumentModelBuilder {
StructDataType dt = (StructDataType) type;
for (com.yahoo.document.Field field : dt.getFields()) {
if (field.getDataType() != type) {
+ // XXX deprecated:
field.setDataType(resolveTemporariesRecurse(field.getDataType(), repo, docs));
}
}
@@ -247,12 +250,13 @@ public class DocumentModelBuilder {
return null;
}
+ @SuppressWarnings("deprecation")
private static void specialHandleAnnotationReference(NewDocumentType docType, Field field) {
DataType fieldType = specialHandleAnnotationReferenceRecurse(docType, field.getName(), field.getDataType());
if (fieldType == null) {
return;
}
- field.setDataType(fieldType);
+ field.setDataType(fieldType); // XXX deprecated
}
private static DataType specialHandleAnnotationReferenceRecurse(NewDocumentType docType, String fieldName,