diff options
| author | gjoranv <gv@oath.com> | 2018-11-02 16:10:47 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:25 +0100 |
| commit | 4a72ebb71e80068eb4ac87a8c3fe3dfc099ee4a9 (patch) | |
| tree | d5d4f347f5cdf307e61fd0247c148266f50460d1 /config-model | |
| parent | 172fdb019b9eab3eb885c47212d6b216f278c3c9 (diff) | |
Fixes after rebase.
- Update gc options test
- Suppress deprecation warnings temporarily
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BodyOperation.java | 1 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/HeaderOperation.java | 1 |
2 files changed, 2 insertions, 0 deletions
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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ 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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ 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); |