From 31a9845bc2179d8bf5391f93ef6d2ea8696a0aec Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Mon, 25 Apr 2016 15:51:26 +0200 Subject: [PATCH] Remove the `SearchType` setter on `SearchContext`. #17955 It was not used. --- .../elasticsearch/search/internal/DefaultSearchContext.java | 6 ------ .../search/internal/FilteredSearchContext.java | 5 ----- .../org/elasticsearch/search/internal/SearchContext.java | 2 -- .../org/elasticsearch/search/internal/SubSearchContext.java | 5 ----- .../main/java/org/elasticsearch/test/TestSearchContext.java | 5 ----- 5 files changed, 23 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java index 25f7572dfb5..435e809a893 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java +++ b/core/src/main/java/org/elasticsearch/search/internal/DefaultSearchContext.java @@ -309,12 +309,6 @@ public class DefaultSearchContext extends SearchContext { return this.searchType; } - @Override - public SearchContext searchType(SearchType searchType) { - this.searchType = searchType; - return this; - } - @Override public SearchShardTarget shardTarget() { return this.shardTarget; diff --git a/core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java index fedab3f9782..283e1dd60e8 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java +++ b/core/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java @@ -105,11 +105,6 @@ public abstract class FilteredSearchContext extends SearchContext { return in.searchType(); } - @Override - public SearchContext searchType(SearchType searchType) { - return in.searchType(searchType); - } - @Override public SearchShardTarget shardTarget() { return in.shardTarget(); diff --git a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java index 105d5ed608d..8b55c764bbb 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java +++ b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java @@ -129,8 +129,6 @@ public abstract class SearchContext implements Releasable { public abstract SearchType searchType(); - public abstract SearchContext searchType(SearchType searchType); - public abstract SearchShardTarget shardTarget(); public abstract int numberOfShards(); diff --git a/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java index c57502741e9..be2c3798430 100644 --- a/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java +++ b/core/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java @@ -87,11 +87,6 @@ public class SubSearchContext extends FilteredSearchContext { throw new UnsupportedOperationException("this context should be read only"); } - @Override - public SearchContext searchType(SearchType searchType) { - throw new UnsupportedOperationException("this context should be read only"); - } - @Override public SearchContext queryBoost(float queryBoost) { throw new UnsupportedOperationException("Not supported"); diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java b/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java index 891353ef589..60a660ead42 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java +++ b/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java @@ -157,11 +157,6 @@ public class TestSearchContext extends SearchContext { return null; } - @Override - public SearchContext searchType(SearchType searchType) { - return null; - } - @Override public SearchShardTarget shardTarget() { return null;