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

Author: Mpdreamz

Diff for: src/Nest/Domain/Analysis/CharFilter/PatternReplaceCharFilter.cs

@@ -0,0 +1,22 @@
+using Newtonsoft.Json;
+
+namespace Nest
+{
+    /// <summary>
+    /// The pattern_replace char filter allows the use of a regex to manipulate the characters in a string before analysis. 
+    /// </summary>
+    public class PatternReplaceCharFilter : CharFilterBase
+    {
+        public PatternReplaceCharFilter()
+            : base("pattern_replace")
+        {
+            
+        }
+
+        [JsonProperty("pattern")]
+        public string Pattern { get; set; }
+
+        [JsonProperty("replacement")]
+        public string Replacement { get; set; }
+    }
+}

Diff for: src/Nest/Nest.csproj

@@ -124,6 +124,7 @@
     <Compile Include="Domain\Alias\AliasRemoveDescriptor.cs" />
     <Compile Include="Domain\Alias\AliasRemoveOperation.cs" />
     <Compile Include="Domain\Alias\IAliasAction.cs" />
+    <Compile Include="Domain\Analysis\CharFilter\PatternReplaceCharFilter.cs" />
     <Compile Include="Domain\Bulk\MultiGetDoc.cs" />
     <Compile Include="Domain\Connection\ConnectionSettings.cs" />
     <Compile Include="Domain\Connection\IConnectionSettings.cs" />

Diff for: src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs

@@ -54,7 +54,7 @@ public void GetIndexSettingsComplex()
 
 			settings.Analysis.CharFilters.Add("char1", new HtmlStripCharFilter());
 			settings.Analysis.CharFilters.Add("char2", new MappingCharFilter{ Mappings = new []{"ph=>f", "qu=>q"}});
-
+            settings.Analysis.CharFilters.Add("char3", new PatternReplaceCharFilter { Pattern = "sample(.*)", Replacement = "replacedSample $1" });
 			settings.Analysis.TokenFilters.Add("tokenfilter1", new EdgeNGramTokenFilter());
 			settings.Analysis.TokenFilters.Add("tokenfilter2", new SnowballTokenFilter());
 
@@ -121,7 +121,7 @@ public void GetIndexSettingsComplex()
 				Assert.True(languageAnalyser.StemExclusionList.Contains("stem2"));
 			}
 
-			Assert.AreEqual(2, r.Settings.Analysis.CharFilters.Count);
+			Assert.AreEqual(3, r.Settings.Analysis.CharFilters.Count);
 			{ // assert char filters
 				Assert.True(r.Settings.Analysis.CharFilters.ContainsKey("char1"));
 				var filter1 = r.Settings.Analysis.CharFilters["char1"] as HtmlStripCharFilter;
@@ -132,6 +132,10 @@ public void GetIndexSettingsComplex()
 				Assert.AreEqual(2, filter2.Mappings.Count());
 				Assert.True(filter2.Mappings.Contains("ph=>f"));
 				Assert.True(filter2.Mappings.Contains("qu=>q"));
+                var filter3 = r.Settings.Analysis.CharFilters["char3"] as PatternReplaceCharFilter;
+                Assert.NotNull(filter3);
+                Assert.AreEqual("sample(.*)", filter3.Pattern);
+                Assert.AreEqual("replacedSample $1", filter3.Replacement);
 			}
 
 			Assert.AreEqual(2, r.Settings.Analysis.TokenFilters.Count);