diff options
author | Jon Bratseth <bratseth@oath.com> | 2018-10-30 10:09:25 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@oath.com> | 2018-10-30 10:09:25 +0100 |
commit | da8209cb5bea57efbe1d31081330085cedaef205 (patch) | |
tree | 5b9d31d293c2a9ab7c5ac7dd44f4b0678b9708d5 | |
parent | bc3fea89a5f3fcfd8b39ad9ac7e831137a009ed8 (diff) |
Fix javadoc
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | 8 | ||||
-rw-r--r-- | document/src/main/java/com/yahoo/document/DocumentUpdate.java | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java index e0e9042e1a3..7c4bec2078a 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java @@ -1340,7 +1340,7 @@ public class YqlParser implements Parser { wordItem = new WordItem(wordData, fromQuery); break; case POSSIBLY: - if (shouldResegmentWord(field, fromQuery)) { + if (shouldResegmentWord(ast, fromQuery)) { wordItem = resegment(field, ast, wordData, fromQuery, parent, language); } else { wordItem = new WordItem(wordData, fromQuery); @@ -1362,8 +1362,8 @@ public class YqlParser implements Parser { } @SuppressWarnings({"deprecation"}) - private boolean shouldResegmentWord(String field, boolean fromQuery) { - return resegment && fromQuery && ! indexFactsSession.getIndex(field).isAttribute(); + private boolean shouldResegmentWord(OperatorNode<ExpressionOperator> ast, boolean fromQuery) { + return resegment && fromQuery && ! indexFactsSession.getIndex(getIndex(ast)).isAttribute(); } @NonNull @@ -1408,7 +1408,7 @@ public class YqlParser implements Parser { WordItem wordItem) { wordItem.setIndexName(field); wordStyleSettings(ast, wordItem); - if (shouldResegmentWord(field, fromQuery)) { + if (shouldResegmentWord(ast, fromQuery)) { // force re-stemming, new case normalization, etc wordItem.setStemmed(false); wordItem.setLowercased(false); diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java index 970fff3bddb..0bbb57ec60b 100644 --- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java +++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java @@ -293,11 +293,7 @@ public class DocumentUpdate extends DocumentOperation implements Iterable<FieldP addFieldUpdates(fieldUpdates); } - /** - * Temporary proxy to setFieldUpdates(Collection<FieldUpdate>) to preserve binary compatibility. - * @param fieldUpdates - */ - @Deprecated + /** The same as setFieldUpdates(Collection<FieldUpdate>) */ public void setFieldUpdates(List<FieldUpdate> fieldUpdates) { setFieldUpdates((Collection<FieldUpdate>) fieldUpdates); } |