code format

Author: piergm

server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java

@@ -7,10 +7,10 @@
  */
 package org.elasticsearch.search.fetch.subphase.highlight;
 
-import com.carrotsearch.randomizedtesting.generators.RandomPicks;
-
 import net.bytebuddy.utility.RandomString;
 
+import com.carrotsearch.randomizedtesting.generators.RandomPicks;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.TokenStream;
@@ -27,7 +27,6 @@
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.Settings.Builder;
-import org.elasticsearch.common.text.Text;
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider;
@@ -47,7 +46,6 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder.BoundaryScannerType;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder.Field;
@@ -3514,10 +3512,7 @@ public void testConstantKeywordFieldHighlighting() throws IOException {
         XContentBuilder mappings = prepareConstantKeywordMappings(constantKeywordFieldName, constantValue);
         assertAcked(prepareCreate(index).setMapping(mappings));
 
-        XContentBuilder document = jsonBuilder().startObject()
-            .field("message", "some text")
-            .field("level", constantValue)
-            .endObject();
+        XContentBuilder document = jsonBuilder().startObject().field("message", "some text").field("level", constantValue).endObject();
         saveDocumentIntoIndex(index, "1", document);
 
         SearchResponse search = prepareConstantKeywordSearch(QueryBuilders.queryStringQuery(constantValue));
@@ -3527,17 +3522,15 @@ public void testConstantKeywordFieldHighlighting() throws IOException {
     }
 
     public void testImplicitConstantKeywordFieldHighlighting() throws IOException {
-        //Constant field value is defined by the mapping
+        // Constant field value is defined by the mapping
         String index = "test";
         String constantKeywordFieldName = "level";
         String constantValue = new RandomString(5).nextString();
 
         XContentBuilder mappings = prepareConstantKeywordMappings(constantKeywordFieldName, constantValue);
         assertAcked(prepareCreate(index).setMapping(mappings));
 
-        XContentBuilder document = jsonBuilder().startObject()
-            .field("message", "some text")
-            .endObject();
+        XContentBuilder document = jsonBuilder().startObject().field("message", "some text").endObject();
         saveDocumentIntoIndex(index, "1", document);
 
         SearchResponse search = prepareConstantKeywordSearch(QueryBuilders.queryStringQuery(constantValue));
@@ -3555,9 +3548,7 @@ public void testConstantKeywordFieldPartialNoHighlighting() throws IOException {
         XContentBuilder mappings = prepareConstantKeywordMappings(constantKeywordFieldName, constantValue);
         assertAcked(prepareCreate(index).setMapping(mappings));
 
-        XContentBuilder document = jsonBuilder().startObject()
-            .field("message", "some text")
-            .endObject();
+        XContentBuilder document = jsonBuilder().startObject().field("message", "some text").endObject();
         saveDocumentIntoIndex(index, "1", document);
 
         SearchResponse search = prepareConstantKeywordSearch(QueryBuilders.queryStringQuery(partialConstantValue));
@@ -3575,9 +3566,7 @@ public void testConstantKeywordFieldPartialWithWildcardHighlighting() throws IOE
         XContentBuilder mappings = prepareConstantKeywordMappings(constantKeywordFieldName, constantValue);
         assertAcked(prepareCreate(index).setMapping(mappings));
 
-        XContentBuilder document = jsonBuilder().startObject()
-            .field("message", "some text")
-            .endObject();
+        XContentBuilder document = jsonBuilder().startObject().field("message", "some text").endObject();
         saveDocumentIntoIndex(index, "1", document);
 
         SearchResponse search = prepareConstantKeywordSearch(QueryBuilders.queryStringQuery(partialConstantValueWithWildCard));
@@ -3604,22 +3593,14 @@ private XContentBuilder prepareConstantKeywordMappings(String constantKeywordFie
         return mappings;
     }
 
-    private SearchResponse prepareConstantKeywordSearch(QueryBuilder query){
+    private SearchResponse prepareConstantKeywordSearch(QueryBuilder query) {
         return client().prepareSearch()
-            .setSource(
-                new SearchSourceBuilder().query(query)
-                    .highlighter(new HighlightBuilder().field("*"))
-            )
+            .setSource(new SearchSourceBuilder().query(query).highlighter(new HighlightBuilder().field("*")))
             .get();
     }
 
-    private void saveDocumentIntoIndex(String index, String id, XContentBuilder document){
-        client().prepareIndex(index)
-            .setId(id)
-            .setSource(
-                document
-            )
-            .get();
+    private void saveDocumentIntoIndex(String index, String id, XContentBuilder document) {
+        client().prepareIndex(index).setId(id).setSource(document).get();
         refresh();
     }
 
@@ -3672,5 +3653,4 @@ public Analyzer get() {
         }
     }
 
-
 }

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

@@ -70,7 +70,7 @@ public void process(HitContext hitContext) throws IOException {
                 for (String field : contextBuilders.keySet()) {
                     FieldHighlightContext fieldContext = contextBuilders.get(field).apply(hitContext);
                     Highlighter highlighter = getHighlighter(fieldContext.field);
-                    HighlightField highlightField = highlighter.highlight(fieldContext); //field context query should have also original query
+                    HighlightField highlightField = highlighter.highlight(fieldContext);
                     if (highlightField != null) {
                         // Note that we make sure to use the original field name in the response. This is because the
                         // original field could be an alias, and highlighter implementations may instead reference the
@@ -144,13 +144,8 @@ private FieldContext contextBuilders(
                 }
 
                 Query highlightQuery = field.fieldOptions().highlightQuery();
-                if (fieldType instanceof ConstantFieldType){
-                    highlightQuery = new TermQuery(
-                        new Term(
-                            fieldType.name(),
-                            getValueForConstantFieldType(context, fieldType)
-                        )
-                    );
+                if (fieldType instanceof ConstantFieldType) {
+                    highlightQuery = new TermQuery(new Term(fieldType.name(), getValueForConstantFieldType(context, fieldType)));
                 }
                 Query finalHighlightQuery = highlightQuery;
                 builders.put(
@@ -171,9 +166,9 @@ private FieldContext contextBuilders(
         return new FieldContext(storedFieldsSpec, builders);
     }
 
-    private String getValueForConstantFieldType(FetchContext context, MappedFieldType fieldType){ //TODO Move this somewhere-else
+    private String getValueForConstantFieldType(FetchContext context, MappedFieldType fieldType) {
         try {
-            return (String) fieldType.valueFetcher(context.getSearchExecutionContext(), null).fetchValues(null,0, List.of()).get(0);
+            return (String) fieldType.valueFetcher(context.getSearchExecutionContext(), null).fetchValues(null, 0, List.of()).get(0);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }