From 4a72ebb71e80068eb4ac87a8c3fe3dfc099ee4a9 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Fri, 2 Nov 2018 16:10:47 +0100 Subject: Fixes after rebase. - Update gc options test - Suppress deprecation warnings temporarily --- .../java/com/yahoo/searchdefinition/fieldoperation/BodyOperation.java | 1 + .../java/com/yahoo/searchdefinition/fieldoperation/HeaderOperation.java | 1 + 2 files changed, 2 insertions(+) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BodyOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BodyOperation.java index 7ea11873a12..309fcc0add5 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BodyOperation.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BodyOperation.java @@ -7,6 +7,7 @@ import com.yahoo.searchdefinition.document.SDField; * @author Einar M R Rosenvinge */ public class BodyOperation implements FieldOperation { + @SuppressWarnings("deprecation") // TODO Vespa 7: remove annotation and fix usage of field.setHeader public void apply(SDField field) { field.setHeader(false); field.setHeaderOrBodyDefined(true); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/HeaderOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/HeaderOperation.java index 22d85f89105..aaf2025f7c6 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/HeaderOperation.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/HeaderOperation.java @@ -7,6 +7,7 @@ import com.yahoo.searchdefinition.document.SDField; * @author Einar M R Rosenvinge */ public class HeaderOperation implements FieldOperation { + @SuppressWarnings("deprecation") // TODO Vespa 7: remove annotation and fix usage of field.setHeader public void apply(SDField field) { field.setHeader(true); field.setHeaderOrBodyDefined(true); -- cgit v1.2.3