Merge pull request #1252 from elasticsearch/fix/untyped-index-type-path-steal-type

fix #1251 Smarter untyped baseindextypepath

Author: gmarz

src/Nest/DSL/Paths/IndexTypePathDescriptor.cs

@@ -24,13 +24,18 @@ public static void SetRouteParameters<TParameters>(
 			var inferrer = new ElasticInferrer(settings);
 
 			if (path.Index == null)
-				throw new DslException("Index() not specified");
+			{
+				if (path.Type != null && path.Type.Type != null)
+					path.Index = path.Type.Type;
+				else 
+					throw new DslException("Index() not specified");
+			}
 
 			if (path.Type == null)
 				throw new DslException("Type() not specified");
 
 			var index = inferrer.IndexName(path.Index); 
-			var type = inferrer.TypeName(path.Type); 
+			var type = inferrer.TypeName(path.Type);
 
 			pathInfo.Index = index;
 			pathInfo.Type = type;
@@ -51,6 +56,7 @@ public static void SetRouteParameters<TParameters, T>(
 			if (path.Type == null)
 				path.Type = inferrer.TypeName<T>();
 
+
 			var index = inferrer.IndexName(path.Index);
 			var type = inferrer.TypeName(path.Type);
 

src/Tests/Nest.Tests.Unit/BigBadUrlUnitTests.cs

@@ -111,6 +111,7 @@ public void TestAllTheUrls()
 			Do("HEAD", "/mydefaultindex", c => c.IndexExists(h => h.Index<Doc>()));
 			Do("HEAD", "/mydefaultindex/_alias/myalias", c => c.AliasExists(h => h.Index<Doc>().Name("myalias")));
 			Do("HEAD", "/mydefaultindex/some-type", c => c.TypeExists(h => h.Index<Doc>().Type("some-type")));
+			Do("HEAD", "/mydefaultindex/doc", c => c.TypeExists(h=>h.Type<Doc>()));
 			Do("HEAD", "/_alias/myalias", c => c.AliasExists(new AliasExistsRequest("myalias")));
 			Do("POST", "/_bulk", c => c.IndexMany(Enumerable.Range(0, 10).Select(i => new Doc {Id = i.ToString()})));
 			Do("POST", "/customindex/customtype/_bulk", c =>