Merge branch 'master' of github.com:elastic/elasticsearch-net

Mpdreamz · Mpdreamz · commit 0a03b3c80e04 · 2016-01-06T17:09:37.000+01:00
diff --git a/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs b/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs
@@ -22,7 +22,7 @@ public class IdsQuery : QueryBase, IIdsQuery
 		public IEnumerable<Id> Values { get; set; }
 
 		internal override void WrapInContainer(IQueryContainer c) => c.Ids = this;
-		internal static bool IsConditionless(IIdsQuery q) => q.Types == null || !q.Values.HasAny();
+		internal static bool IsConditionless(IIdsQuery q) => !q.Values.HasAny();
 	}
 
 	public class IdsQueryDescriptor 
diff --git a/src/Tests/QueryDsl/TermLevel/Ids/IdsQueryUsageTests.cs b/src/Tests/QueryDsl/TermLevel/Ids/IdsQueryUsageTests.cs
@@ -41,7 +41,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IIdsQuery>(a => a.Ids)
 		{
-			q => q.Types = null,
 			q => q.Values = null,
 			q => q.Values = Enumerable.Empty<Id>()
 		};

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class IdsQuery : QueryBase, IIdsQuery`
`22`	`22`	`public IEnumerable<Id> Values { get; set; }`
`23`	`23`
`24`	`24`	`internal override void WrapInContainer(IQueryContainer c) => c.Ids = this;`
`25`		`- internal static bool IsConditionless(IIdsQuery q) => q.Types == null \|\| !q.Values.HasAny();`
	`25`	`+ internal static bool IsConditionless(IIdsQuery q) => !q.Values.HasAny();`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public class IdsQueryDescriptor`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>`
`41`	`41`
`42`	`42`	`protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<IIdsQuery>(a => a.Ids)`
`43`	`43`	`{`
`44`		`- q => q.Types = null,`
`45`	`44`	`q => q.Values = null,`
`46`	`45`	`q => q.Values = Enumerable.Empty<Id>()`
`47`	`46`	`};`