Don't emit separate warnings for type filters

server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java

@@ -39,6 +39,7 @@
 
 import java.time.ZoneId;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.function.Supplier;
 
 public class TypeFieldMapper extends MetadataFieldMapper {
@@ -137,6 +138,22 @@ public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower
             }
             return new MatchAllDocsQuery();
         }
+
+        /**
+         * Build a type filter
+         *
+         * This does not emit a deprecation warning, as it is only called when a type
+         * has been specified in a REST request and warnings will have already been
+         * emitted at the REST layer.
+         */
+        public Query typeFilter(String[] types) {
+            for (String t : types) {
+                if (Objects.equals(this.type, t)) {
+                    return new MatchAllDocsQuery();
+                }
+            }
+            return new MatchNoDocsQuery();
+        }
     }
 
     private TypeFieldMapper() {

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

@@ -78,7 +78,6 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -315,8 +314,8 @@ private Query createTypeFilter(String[] types) {
             if (mapperService().documentMapper() == null) {
                 return null;
             }
-            MappedFieldType ft = new TypeFieldMapper.TypeFieldType(mapperService().documentMapper().type());
-            return ft.termsQuery(Arrays.asList(types), queryShardContext);
+            TypeFieldMapper.TypeFieldType ft = new TypeFieldMapper.TypeFieldType(mapperService().documentMapper().type());
+            return ft.typeFilter(types);
         }
         return null;
     }