Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop

Mpdreamz · Mpdreamz · commit ff3d3d7e6be0 · 2014-07-10T23:22:16.000+02:00
diff --git a/build/Elasticsearch.Net.Connection.Thrift.nuspec b/build/Elasticsearch.Net.Connection.Thrift.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net.Connection.Thrift</id>
-    <version>1.0.0-ci20140604105901</version>
+    <version>1.0.0-rc1</version>
     <title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.0.0-ci20140604105901"/>
+      <dependency id="Elasticsearch.Net" version="1.0.0-rc1"/>
       <dependency id="NetReflector" />
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>
diff --git a/build/Elasticsearch.Net.nuspec b/build/Elasticsearch.Net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net</id>
-    <version>1.0.0-ci20140604105901</version>
+    <version>1.0.0-rc1</version>
     <title>Elasticsearch.Net - official low level elasticsearch client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
diff --git a/build/NEST.nuspec b/build/NEST.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>NEST</id>
-    <version>1.0.0-ci20140604105901</version>
+    <version>1.0.0-rc1</version>
     <title>NEST - Elasticsearch Client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.0.0-ci20140604105901"/>
+      <dependency id="Elasticsearch.Net" version="1.0.0-rc1"/>
       <dependency id="Newtonsoft.Json" version="6.0.1" />
     </dependencies>
     <tags>elasticsearch elastic search lucene nest</tags>
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs b/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs b/src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs b/src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs b/src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Elasticsearch.Net/Properties/AssemblyInfo.cs b/src/Elasticsearch.Net/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-ci20140710110619")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs
@@ -1,42 +1,39 @@
 ﻿using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
-	public class GeoShapeMappingDescriptor<T>
+	public class GeoPointMappingDescriptor<T>
 	{
-		internal GeoShapeMapping _Mapping = new GeoShapeMapping();
+		internal GeoPointMapping _Mapping = new GeoPointMapping();
 
-		public GeoShapeMappingDescriptor<T> Name(string name)
+		public GeoPointMappingDescriptor<T> Name(string name)
 		{
 			this._Mapping.Name = name;
 			return this;
 		}
-		public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
+		public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
 		{
 			this._Mapping.Name = objectPath;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
+		public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
 		{
-			this._Mapping.Tree = geoTree;
+			this._Mapping.IndexLatLon = indexLatLon;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
+		public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
 		{
-			this._Mapping.TreeLevels = treeLevels;
+			this._Mapping.IndexGeoHash = indexGeoHash;
 			return this;
 		}
 
-		public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
+		public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
 		{
-			this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
+			this._Mapping.GeoHashPrecision = geoHashPrecision;
 			return this;
 		}
-		
-
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs
@@ -1,43 +1,39 @@
 ﻿using System;
 using System.Linq.Expressions;
-using Nest.Resolvers;
 
 namespace Nest
 {
-	public class GeoPointMappingDescriptor<T>
+	public class GeoShapeMappingDescriptor<T>
 	{
-		internal GeoPointMapping _Mapping = new GeoPointMapping();
+		internal GeoShapeMapping _Mapping = new GeoShapeMapping();
 
-		public GeoPointMappingDescriptor<T> Name(string name)
+		public GeoShapeMappingDescriptor<T> Name(string name)
 		{
 			this._Mapping.Name = name;
 			return this;
 		}
-		public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
+		public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
 		{
 			this._Mapping.Name = objectPath;
 			return this;
 		}
 
-
-		public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
+		public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
 		{
-			this._Mapping.IndexLatLon = indexLatLon;
+			this._Mapping.Tree = geoTree;
 			return this;
 		}
 
-		public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
+		public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
 		{
-			this._Mapping.IndexGeoHash = indexGeoHash;
+			this._Mapping.TreeLevels = treeLevels;
 			return this;
 		}
 
-		public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
+		public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
 		{
-			this._Mapping.GeoHashPrecision = geoHashPrecision;
+			this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
 			return this;
 		}
-		
-
 	}
 }
diff --git a/src/Nest/Properties/AssemblyInfo.cs b/src/Nest/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Profiling/Profiling.InMemoryConnection/Properties/AssemblyInfo.cs b/src/Profiling/Profiling.InMemoryConnection/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Profiling/Profiling.Indexing/Properties/AssemblyInfo.cs b/src/Profiling/Profiling.Indexing/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Serialization/Elasticsearch.Net.JsonNET/Properties/AssemblyInfo.cs b/src/Serialization/Elasticsearch.Net.JsonNET/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/Properties/AssemblyInfo.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Properties/AssemblyInfo.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Nest.Tests.Integration/Properties/AssemblyInfo.cs b/src/Tests/Nest.Tests.Integration/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Nest.Tests.MockData/Properties/AssemblyInfo.cs b/src/Tests/Nest.Tests.MockData/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Nest.Tests.Unit/Properties/AssemblyInfo.cs b/src/Tests/Nest.Tests.Unit/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
 [assembly: AssemblyFileVersionAttribute("1.0.0")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";

Original file line number	Diff line number	Diff line change
`@@ -1,42 +1,39 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq.Expressions;`
`3`		`-using Nest.Resolvers;`
`4`	`3`
`5`	`4`	`namespace Nest`
`6`	`5`	`{`
`7`		`- public class GeoShapeMappingDescriptor<T>`
	`6`	`+ public class GeoPointMappingDescriptor<T>`
`8`	`7`	`{`
`9`		`- internal GeoShapeMapping _Mapping = new GeoShapeMapping();`
	`8`	`+ internal GeoPointMapping _Mapping = new GeoPointMapping();`
`10`	`9`
`11`		`- public GeoShapeMappingDescriptor<T> Name(string name)`
	`10`	`+ public GeoPointMappingDescriptor<T> Name(string name)`
`12`	`11`	`{`
`13`	`12`	`this._Mapping.Name = name;`
`14`	`13`	`return this;`
`15`	`14`	`}`
`16`		`- public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)`
	`15`	`+ public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)`
`17`	`16`	`{`
`18`	`17`	`this._Mapping.Name = objectPath;`
`19`	`18`	`return this;`
`20`	`19`	`}`
`21`	`20`
`22`		`- public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)`
	`21`	`+ public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)`
`23`	`22`	`{`
`24`		`- this._Mapping.Tree = geoTree;`
	`23`	`+ this._Mapping.IndexLatLon = indexLatLon;`
`25`	`24`	`return this;`
`26`	`25`	`}`
`27`	`26`
`28`		`- public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)`
	`27`	`+ public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)`
`29`	`28`	`{`
`30`		`- this._Mapping.TreeLevels = treeLevels;`
	`29`	`+ this._Mapping.IndexGeoHash = indexGeoHash;`
`31`	`30`	`return this;`
`32`	`31`	`}`
`33`	`32`
`34`		`- public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)`
	`33`	`+ public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)`
`35`	`34`	`{`
`36`		`- this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;`
	`35`	`+ this._Mapping.GeoHashPrecision = geoHashPrecision;`
`37`	`36`	`return this;`
`38`	`37`	`}`
`39`		`-`
`40`		`-`
`41`	`38`	`}`
`42`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,43 +1,39 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq.Expressions;`
`3`		`-using Nest.Resolvers;`
`4`	`3`
`5`	`4`	`namespace Nest`
`6`	`5`	`{`
`7`		`- public class GeoPointMappingDescriptor<T>`
	`6`	`+ public class GeoShapeMappingDescriptor<T>`
`8`	`7`	`{`
`9`		`- internal GeoPointMapping _Mapping = new GeoPointMapping();`
	`8`	`+ internal GeoShapeMapping _Mapping = new GeoShapeMapping();`
`10`	`9`
`11`		`- public GeoPointMappingDescriptor<T> Name(string name)`
	`10`	`+ public GeoShapeMappingDescriptor<T> Name(string name)`
`12`	`11`	`{`
`13`	`12`	`this._Mapping.Name = name;`
`14`	`13`	`return this;`
`15`	`14`	`}`
`16`		`- public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)`
	`15`	`+ public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)`
`17`	`16`	`{`
`18`	`17`	`this._Mapping.Name = objectPath;`
`19`	`18`	`return this;`
`20`	`19`	`}`
`21`	`20`
`22`		`-`
`23`		`- public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)`
	`21`	`+ public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)`
`24`	`22`	`{`
`25`		`- this._Mapping.IndexLatLon = indexLatLon;`
	`23`	`+ this._Mapping.Tree = geoTree;`
`26`	`24`	`return this;`
`27`	`25`	`}`
`28`	`26`
`29`		`- public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)`
	`27`	`+ public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)`
`30`	`28`	`{`
`31`		`- this._Mapping.IndexGeoHash = indexGeoHash;`
	`29`	`+ this._Mapping.TreeLevels = treeLevels;`
`32`	`30`	`return this;`
`33`	`31`	`}`
`34`	`32`
`35`		`- public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)`
	`33`	`+ public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)`
`36`	`34`	`{`
`37`		`- this._Mapping.GeoHashPrecision = geoHashPrecision;`
	`35`	`+ this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;`
`38`	`36`	`return this;`
`39`	`37`	`}`
`40`		`-`
`41`		`-`
`42`	`38`	`}`
`43`	`39`	`}`