Adapt DocCountFieldType#valueFetcher signature

javanna · javanna · commit 263ea664e0c9 · 2020-11-04T12:13:37.000+01:00
Relates to #64524
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocCountFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DocCountFieldMapper.java
@@ -90,12 +90,12 @@ public Query termQuery(Object value, QueryShardContext context) {
         }
 
         @Override
-        public ValueFetcher valueFetcher(MapperService mapperService, SearchLookup searchLookup, String format) {
+        public ValueFetcher valueFetcher(QueryShardContext context, SearchLookup searchLookup, String format) {
             if (format != null) {
                 throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
             }
 
-            return new SourceValueFetcher(name(), mapperService, defaultValue) {
+            return new SourceValueFetcher(name(), context, defaultValue) {
                 @Override
                 protected Object parseSourceValue(Object value) {
                     if ("".equals(value)) {

Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,12 @@ public Query termQuery(Object value, QueryShardContext context) {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@Override`
`93`		`- public ValueFetcher valueFetcher(MapperService mapperService, SearchLookup searchLookup, String format) {`
	`93`	`+ public ValueFetcher valueFetcher(QueryShardContext context, SearchLookup searchLookup, String format) {`
`94`	`94`	`if (format != null) {`
`95`	`95`	`throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");`
`96`	`96`	`}`
`97`	`97`
`98`		`- return new SourceValueFetcher(name(), mapperService, defaultValue) {`
	`98`	`+ return new SourceValueFetcher(name(), context, defaultValue) {`
`99`	`99`	`@Override`
`100`	`100`	`protected Object parseSourceValue(Object value) {`
`101`	`101`	`if ("".equals(value)) {`