removed old implementation

Author: piergm

server/src/main/java/org/elasticsearch/index/query/InnerHitContextBuilder.java

@@ -118,7 +118,7 @@ protected void setupInnerHitsContext(
             }
         }
         if (innerHitBuilder.getHighlightBuilder() != null) {
-            innerHitsContext.highlight(innerHitBuilder.getHighlightBuilder().build(searchExecutionContext, query));
+            innerHitsContext.highlight(innerHitBuilder.getHighlightBuilder().build(searchExecutionContext));
         }
         ParsedQuery parsedQuery = new ParsedQuery(query.toQuery(searchExecutionContext), searchExecutionContext.copyNamedQueries());
         innerHitsContext.parsedQuery(parsedQuery);

server/src/main/java/org/elasticsearch/search/SearchService.java

@@ -1288,7 +1288,7 @@ private void parseSource(DefaultSearchContext context, SearchSourceBuilder sourc
         if (source.highlighter() != null) {
             HighlightBuilder highlightBuilder = source.highlighter();
             try {
-                context.highlight(highlightBuilder.build(searchExecutionContext, source.query()));
+                context.highlight(highlightBuilder.build(searchExecutionContext));
             } catch (IOException e) {
                 throw new SearchException(shardTarget, "failed to create SearchContextHighlighter", e);
             }

server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorFactory.java

@@ -118,9 +118,7 @@ public Aggregator createInternal(Aggregator parent, CardinalityUpperBound cardin
             subSearchContext.fetchSourceContext(fetchSourceContext);
         }
         if (highlightBuilder != null) {
-            subSearchContext.highlight(
-                highlightBuilder.build(subSearchContext.getSearchExecutionContext(), highlightBuilder.highlightQuery())
-            );
+            subSearchContext.highlight(highlightBuilder.build(subSearchContext.getSearchExecutionContext()));
         }
         return new TopHitsAggregator(subSearchContext, name, context, parent, metadata);
     }

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java

@@ -279,7 +279,7 @@ public static HighlightBuilder fromXContent(XContentParser p) {
         return PARSER.apply(p, new HighlightBuilder());
     }
 
-    public SearchHighlightContext build(SearchExecutionContext context, QueryBuilder originalQuery) throws IOException {
+    public SearchHighlightContext build(SearchExecutionContext context) throws IOException {
         // create template global options that are later merged with any partial field options
         final SearchHighlightContext.FieldOptions.Builder globalOptionsBuilder = new SearchHighlightContext.FieldOptions.Builder();
         globalOptionsBuilder.encoder(this.encoder);

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SearchHighlightContext.java

@@ -20,6 +20,7 @@
 import java.util.Set;
 
 public class SearchHighlightContext {
+
     private final Map<String, Field> fields;
 
     public SearchHighlightContext(Collection<Field> fields) {

server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java

@@ -328,7 +328,7 @@ public MappedFieldType getFieldType(String name) {
         for (int runs = 0; runs < NUMBER_OF_TESTBUILDERS; runs++) {
             HighlightBuilder highlightBuilder = randomHighlighterBuilder();
             highlightBuilder = Rewriteable.rewrite(highlightBuilder, mockContext);
-            SearchHighlightContext highlight = highlightBuilder.build(mockContext, highlightBuilder.highlightQuery);
+            SearchHighlightContext highlight = highlightBuilder.build(mockContext);
             for (SearchHighlightContext.Field field : highlight.fields()) {
                 String encoder = highlightBuilder.encoder() != null ? highlightBuilder.encoder() : HighlightBuilder.DEFAULT_ENCODER;
                 assertEquals(encoder, field.fieldOptions().encoder());

test/framework/src/main/java/org/elasticsearch/search/fetch/HighlighterTestCase.java

@@ -109,7 +109,7 @@ protected static void assertHighlights(Map<String, HighlightField> highlights, S
 
     private static FetchContext fetchContext(SearchExecutionContext context, SearchSourceBuilder search) throws IOException {
         FetchContext fetchContext = mock(FetchContext.class);
-        when(fetchContext.highlight()).thenReturn(search.highlighter().build(context, search.query()));
+        when(fetchContext.highlight()).thenReturn(search.highlighter().build(context));
         when(fetchContext.parsedQuery()).thenReturn(new ParsedQuery(search.query().toQuery(context)));
         when(fetchContext.getSearchExecutionContext()).thenReturn(context);
         when(fetchContext.sourceLoader()).thenReturn(context.newSourceLoader(false));