add explicit type missing exception when trying to search on a type that is not registered

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/action/get/TransportGetAction.java

@@ -32,11 +32,16 @@
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.lucene.uid.UidField;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.index.Index;
 import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.mapper.*;
+import org.elasticsearch.index.mapper.DocumentMapper;
+import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.mapper.FieldMappers;
+import org.elasticsearch.index.mapper.FieldMappersFieldSelector;
 import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.shard.service.IndexShard;
 import org.elasticsearch.indices.IndicesService;
+import org.elasticsearch.indices.TypeMissingException;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportService;
 
@@ -79,7 +84,7 @@ public class TransportGetAction extends TransportShardSingleOperationAction<GetR
 
         DocumentMapper docMapper = indexService.mapperService().documentMapper(request.type());
         if (docMapper == null) {
-            throw new DocumentMapperNotFoundException("No mapper found for type [" + request.type() + "]");
+            throw new TypeMissingException(new Index(request.index()), request.type());
         }
 
         if (request.refresh()) {

modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/DocumentMapperNotFoundException.java

@@ -41,6 +41,7 @@
 import org.elasticsearch.index.mapper.xcontent.XContentDocumentMapperParser;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.indices.InvalidTypeNameException;
+import org.elasticsearch.indices.TypeMissingException;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -237,10 +238,17 @@ public DocumentMapper documentMapperWithAutoCreate(String type) {
      */
     public Filter typesFilter(String... types) {
         if (types.length == 1) {
-            return documentMapper(types[0]).typeFilter();
+            DocumentMapper docMapper = documentMapper(types[0]);
+            if (docMapper == null) {
+                throw new TypeMissingException(index, types[0]);
+            }
+            return docMapper.typeFilter();
         }
         PublicTermsFilter termsFilter = new PublicTermsFilter();
         for (String type : types) {
+            if (!hasMapping(type)) {
+                throw new TypeMissingException(index, type);
+            }
             termsFilter.addTerm(new Term(TypeFieldMapper.NAME, type));
         }
         return termsFilter;