diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2017-04-21 11:00:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 11:00:45 +0200 |
| commit | dc115e576eab4ff8f43c5f9c40b9b79473c911d2 (patch) | |
| tree | e6a7712b27322a9047f4313ebf895614b1a571c2 /container-search/src | |
| parent | 7b6ca3c1e2fa23d72a820add54f6ce4d4ac8a882 (diff) | |
| parent | fe8794eab4f891f5ea09865fd753df7a3f77b7a9 (diff) | |
Merge pull request #2210 from yahoo/arnej/silence-warnings-2
Arnej/silence warnings 2
Diffstat (limited to 'container-search/src')
4 files changed, 11 insertions, 0 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java index e56303e60f8..84ca89694a5 100644 --- a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java @@ -188,6 +188,7 @@ public class IndexCombinatorSearcher extends Searcher { break; case FLAT: c = flatTransform(c, session); + break; default: break; } diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java index 554424c267f..c3662102b85 100644 --- a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java +++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java @@ -66,6 +66,7 @@ public class QueryMarshaller { break; case WEAK_AND: marshalWeakAnd((WeakAndItem)root, s); + break; default: break; } diff --git a/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java b/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java index 79b8d55bb07..5fe604dca15 100644 --- a/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java +++ b/container-search/src/main/java/com/yahoo/search/result/DefaultErrorHit.java @@ -50,6 +50,7 @@ public class DefaultErrorHit extends Hit implements ErrorHit, Cloneable { * @deprecated since 5.18, use {@link #errors()} */ @Override + @Deprecated public ErrorMessage getMainError() { return errors.get(0); } diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index a888ad9b59e..c9176b208a4 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -221,6 +221,14 @@ public class Execution extends com.yahoo.processing.execution.Execution { } @Override + public int hashCode() { + return java.util.Objects.hash(indexFacts, + rendererRegistry, tokenRegistry, searchChainRegistry, + detailedDiagnostics, breakdown, + linguistics); + } + + @Override public boolean equals(Object other) { if (other == null) { return false; |