From a97e90f7cc5bad4448d6f7b28f7dceebb70768da Mon Sep 17 00:00:00 2001
From: Arne H Juul <arnej@yahoo-inc.com>
Date: Tue, 25 Apr 2017 14:48:48 +0200
Subject: warn for deprecation too

---
 .../main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java')

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,
-- 
cgit v1.2.3