diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-10-15 15:17:29 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-10-15 15:17:29 +0200 |
commit | 3f822c0fc92c0d2909fb143e1235e27c17973dde (patch) | |
tree | 380a0577cfa4b6f8aab39f686e5c8d906c2be32b /container-search/src | |
parent | e26f77c447678f0be63ad1b49762e1e22b2f2377 (diff) |
Avoid deprecated method
Diffstat (limited to 'container-search/src')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/IndexFacts.java | 5 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/IndexModel.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java index bdf395c1f0b..8a57f74639e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java +++ b/container-search/src/main/java/com/yahoo/prelude/IndexFacts.java @@ -64,8 +64,9 @@ public class IndexFacts { @SuppressWarnings({"deprecation"}) public IndexFacts(IndexModel indexModel) { - if (indexModel.getSearchDefinitions() != null && indexModel.getUnionSearchDefinition() != null) { - setSearchDefinitions(indexModel.getSearchDefinitions(), indexModel.getUnionSearchDefinition()); + if (indexModel.getSearchDefinitions() != null) { + this.searchDefinitions = indexModel.getSearchDefinitions(); + this.unionSearchDefinition = indexModel.getUnionSearchDefinition(); } if (indexModel.getMasterClusters() != null) { setMasterClusters(indexModel.getMasterClusters()); diff --git a/container-search/src/main/java/com/yahoo/prelude/IndexModel.java b/container-search/src/main/java/com/yahoo/prelude/IndexModel.java index 7764b45a817..0a413c1611c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/IndexModel.java +++ b/container-search/src/main/java/com/yahoo/prelude/IndexModel.java @@ -127,7 +127,7 @@ public final class IndexModel { public Map<String, SearchDefinition> getSearchDefinitions() { return searchDefinitions; } - // TODO: Deprecate on Vespa 7 and remove on Vespa 8 + // TODO: Deprecate on Vespa 7 and make package scope on Vespa 8 public SearchDefinition getUnionSearchDefinition() { return unionSearchDefinition; } } |