clean code

Author: piergm

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

@@ -3922,9 +3922,6 @@ public void testDoubleConstantKeywordNestedQueriesBothHighlighted() throws Excep
             		"test_constant_keyword_field_2": {
                         "type": "constant_keyword",
                         "value": "constant_value_2"
-            		},
-            		"another_constant_field": {
-                        "type": "keyword"
             		}
             	}
             }
@@ -3959,9 +3956,6 @@ public void testDoubleConstantKeywordNestedQueriesJustOneHighlighted() throws Ex
             		"test_constant_keyword_field_2": {
                         "type": "constant_keyword",
                         "value": "constant_value_2"
-            		},
-            		"another_constant_field": {
-                        "type": "keyword"
             		}
             	}
             }

server/src/main/java/org/elasticsearch/action/search/CanMatchNodeRequest.java

@@ -40,8 +40,6 @@
 public class CanMatchNodeRequest extends TransportRequest implements IndicesRequest {
 
     private final SearchSourceBuilder source;
-
-    private final SearchSourceBuilder originalSource;
     private final List<Shard> shards;
     private final SearchType searchType;
     private final Boolean requestCache;
@@ -132,7 +130,6 @@ public CanMatchNodeRequest(
         @Nullable String clusterAlias
     ) {
         this.source = searchRequest.source();
-        this.originalSource = searchRequest.source();
         this.indicesOptions = indicesOptions;
         this.shards = new ArrayList<>(shards);
         this.searchType = searchRequest.searchType();
@@ -152,7 +149,6 @@ public CanMatchNodeRequest(
     public CanMatchNodeRequest(StreamInput in) throws IOException {
         super(in);
         source = in.readOptionalWriteable(SearchSourceBuilder::new);
-        originalSource = in.readOptionalWriteable(SearchSourceBuilder::new);
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         searchType = SearchType.fromId(in.readByte());
         if (in.getTransportVersion().before(TransportVersion.V_8_0_0)) {
@@ -179,7 +175,6 @@ public CanMatchNodeRequest(StreamInput in) throws IOException {
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeOptionalWriteable(source);
-        out.writeOptionalWriteable(originalSource);
         indicesOptions.writeIndicesOptions(out);
         out.writeByte(searchType.id());
         if (out.getTransportVersion().before(TransportVersion.V_8_0_0)) {