warn for deprecation too

2 files changed, 7 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
index fbe392f698a..32f7fc12599 100644
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java
@@ -103,6 +103,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter
      * @param root The Root to set as parent for all plugins
      * @param servicesRoot XML root node of the services file
      */
+    @SuppressWarnings("deprecation")
     private void readConfigModels(ApplicationConfigProducerRoot root, Element servicesRoot, DeployState deployState, ConfigModelRegistry configModelRegistry) throws IOException, SAXException {
         final Map<ConfigModelBuilder, List<Element>> model2Element = new LinkedHashMap<>();
         ModelGraphBuilder graphBuilder = new ModelGraphBuilder();
@@ -141,7 +142,7 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter
         for (ModelNode node : graphBuilder.build().topologicalSort())
             buildModels(node, getApplicationType(servicesRoot), deployState, root, model2Element.get(node.builder));
         for (ConfigModel model : configModels)
-            model.initialize(ConfigModelRepo.this);
+            model.initialize(ConfigModelRepo.this); // XXX deprecated
     }
 
     private ApplicationType getApplicationType(Element servicesRoot) {
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,