Remove obsolete IndexName from mapping properties

Closes #2293
elastic · Sep 30, 2016 · 7312a17 · 7312a17
1 parent 9aee38a
commit 7312a17
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 22 deletions.
diff --git a/src/Nest/Mapping/AttributeBased/ElasticsearchPropertyAttributeBase.cs b/src/Nest/Mapping/AttributeBased/ElasticsearchPropertyAttributeBase.cs
@@ -14,11 +14,9 @@ public abstract class ElasticsearchPropertyAttributeBase : Attribute, IProperty,
 
 		PropertyName IProperty.Name { get; set; }
 		TypeName IProperty.Type { get; set; }
-		string IProperty.IndexName { get; set; }
 
 		public string Name { get; set; }
 		public bool Ignore { get; set; }
-		public string IndexName { get { return Self.IndexName; } set { Self.IndexName = value; } }
 
 		protected ElasticsearchPropertyAttributeBase(string typeName)
 		{

diff --git a/src/Nest/Mapping/Types/PropertyBase.cs b/src/Nest/Mapping/Types/PropertyBase.cs
@@ -11,9 +11,6 @@ public interface IProperty : IFieldMapping
 
 		[JsonProperty("type")]
 		TypeName Type { get; set; }
-
-		[JsonProperty("index_name")]
-		string IndexName { get; set; }
 	}
 
 	public interface IPropertyWithClrOrigin
@@ -30,7 +27,6 @@ protected PropertyBase(TypeName typeName)
 
 		public PropertyName Name { get; set; }
 		public virtual TypeName Type { get; set; }
-		public string IndexName { get; set; }
 		PropertyInfo IPropertyWithClrOrigin.ClrOrigin { get; set; }
 	}
 }
diff --git a/src/Nest/Mapping/Types/PropertyDescriptorBase.cs b/src/Nest/Mapping/Types/PropertyDescriptorBase.cs
@@ -11,14 +11,11 @@ public abstract class PropertyDescriptorBase<TDescriptor, TInterface, T>
 	{
 		PropertyName IProperty.Name { get; set; }
 		TypeName IProperty.Type { get; set; }
-		string IProperty.IndexName { get; set; }
 
 		protected PropertyDescriptorBase(string type) { Self.Type = type; }
 
 		public TDescriptor Name(PropertyName name) => Assign(a => a.Name = name);
 
 		public TDescriptor Name(Expression<Func<T, object>> objectPath) => Assign(a => a.Name = objectPath);
-
-		public TDescriptor IndexName(string indexName) => Assign(a => a.IndexName = indexName);
 	}
-}
+}
diff --git a/src/Tests/Mapping/Types/Core/Binary/BinaryMappingTests.cs b/src/Tests/Mapping/Types/Core/Binary/BinaryMappingTests.cs
@@ -7,7 +7,6 @@ public class BinaryTest
 	{
 		[Binary(
 			DocValues = true,
-			IndexName = "myindex",
 			Similarity = "classic",
 			Store = true)]
 		public string Full { get; set; }
@@ -26,7 +25,6 @@ public class BinaryMappingTests : TypeMappingTestBase<BinaryTest>
 				{
 					type = "binary",
 					doc_values = true,
-					index_name = "myindex",
 					similarity = "classic",
 					store = true
 				},
@@ -41,7 +39,6 @@ public class BinaryMappingTests : TypeMappingTestBase<BinaryTest>
 			.Binary(s => s
 				.Name(o => o.Full)
 				.DocValues()
-				.IndexName("myindex")
 				.Similarity(SimilarityOption.Classic)
 				.Store()
 			)

diff --git a/src/Tests/Mapping/Types/Core/Boolean/BooleanMappingTests.cs b/src/Tests/Mapping/Types/Core/Boolean/BooleanMappingTests.cs
@@ -7,7 +7,6 @@ public class BooleanTest
 	{
 		[Boolean(
 			DocValues = false,
-			IndexName = "myindex",
 			Similarity = "BM25",
 			Index = false,
 			Store = true)]
@@ -27,7 +26,6 @@ public class BooleanMappingTests : TypeMappingTestBase<BooleanTest>
 				{
 					type = "boolean",
 					doc_values = false,
-					index_name = "myindex",
 					similarity = "BM25",
 					store = true,
 					index = false,
@@ -43,7 +41,6 @@ public class BooleanMappingTests : TypeMappingTestBase<BooleanTest>
 			.Boolean(s => s
 				.Name(o => o.Full)
 				.DocValues(false)
-				.IndexName("myindex")
 				.Similarity(SimilarityOption.BM25)
 				.Index(false)
 				.Store(true)

diff --git a/src/Tests/Mapping/Types/Core/Date/DateMappingTests.cs b/src/Tests/Mapping/Types/Core/Date/DateMappingTests.cs
@@ -7,7 +7,6 @@ public class DateTest
 	{
 		[Date(
 			DocValues = true,
-			IndexName = "myindex",
 			Similarity = "classic",
 			Store = true,
 			Index = false,
@@ -37,7 +36,6 @@ public class DateMappingTests : TypeMappingTestBase<DateTest>
 				{
 					type = "date",
 					doc_values = true,
-					index_name = "myindex",
 					similarity = "classic",
 					store = true,
 					index = false,
@@ -67,7 +65,6 @@ public class DateMappingTests : TypeMappingTestBase<DateTest>
 			.Date(d => d
 				.Name(o => o.Full)
 				.DocValues()
-				.IndexName("myindex")
 				.Similarity(SimilarityOption.Classic)
 				.Store()
 				.Index(false)

diff --git a/src/Tests/Mapping/Types/Core/Number/NumberMappingTests.cs b/src/Tests/Mapping/Types/Core/Number/NumberMappingTests.cs
@@ -7,7 +7,6 @@ public class NumberTest
 	{
 		[Number(
 			DocValues = true,
-			IndexName = "myindex",
 			Similarity = "classic",
 			Store = true,
 			Index = false,
@@ -58,7 +57,6 @@ public class NumberMappingTests
 				{
 					type = "float",
 					doc_values = true,
-					index_name = "myindex",
 					similarity = "classic",
 					store = true,
 					index = false,
@@ -128,7 +126,6 @@ public class NumberMappingTests
 			.Number(d => d
 				.Name(o => o.Full)
 				.DocValues()
-				.IndexName("myindex")
 				.Similarity(SimilarityOption.Classic)
 				.Store()
 				.Index(false)