Change method names and signatures to match wrapped types.

Tratcher · Tratcher · commit e7e703202e56 · 2015-10-20T12:48:09.000-07:00
diff --git a/src/Microsoft.AspNet.Html.Abstractions/HtmlContentBuilderExtensions.cs b/src/Microsoft.AspNet.Html.Abstractions/HtmlContentBuilderExtensions.cs
@@ -305,7 +305,7 @@ public string Format(string format, object arg, IFormatProvider formatProvider)
                     var result = customFormatter.Format(format, arg, _formatProvider);
                     if (result != null)
                     {
-                        return _encoder.HtmlEncode(result);
+                        return _encoder.Encode(result);
                     }
                 }
 
@@ -319,7 +319,7 @@ public string Format(string format, object arg, IFormatProvider formatProvider)
                     var result = formattable.ToString(format, _formatProvider);
                     if (result != null)
                     {
-                        return _encoder.HtmlEncode(result);
+                        return _encoder.Encode(result);
                     }
                 }
 
@@ -329,7 +329,7 @@ public string Format(string format, object arg, IFormatProvider formatProvider)
                     var result = arg.ToString();
                     if (result != null)
                     {
-                        return _encoder.HtmlEncode(result);
+                        return _encoder.Encode(result);
                     }
                 }
 
diff --git a/src/Microsoft.Extensions.BufferedHtmlContent.Sources/BufferedHtmlContent.cs b/src/Microsoft.Extensions.BufferedHtmlContent.Sources/BufferedHtmlContent.cs
@@ -86,7 +86,7 @@ public void WriteTo(TextWriter writer, IHtmlEncoder encoder)
                 var entryAsString = entry as string;
                 if (entryAsString != null)
                 {
-                    encoder.HtmlEncode(entryAsString, writer);
+                    encoder.Encode(entryAsString, writer);
                 }
                 else
                 {
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/EncoderExtensions.cs b/src/Microsoft.Extensions.WebEncoders.Core/EncoderExtensions.cs
@@ -18,7 +18,7 @@ public static class EncoderExtensions
         /// The encoded value is also safe for inclusion inside an HTML attribute
         /// as long as the attribute value is surrounded by single or double quotes.
         /// </remarks>
-        public static void HtmlEncode(this IHtmlEncoder htmlEncoder, string value, TextWriter output)
+        public static void Encode(this IHtmlEncoder htmlEncoder, string value, TextWriter output)
         {
             if (htmlEncoder == null)
             {
@@ -27,23 +27,23 @@ public static void HtmlEncode(this IHtmlEncoder htmlEncoder, string value, TextW
 
             if (!String.IsNullOrEmpty(value))
             {
-                htmlEncoder.HtmlEncode(value, 0, value.Length, output);
+                htmlEncoder.Encode(output, value, 0, value.Length);
             }
         }
 
         /// <summary>
         /// JavaScript-escapes a string and writes the result to the supplied output.
         /// </summary>
-        public static void JavaScriptStringEncode(this IJavaScriptStringEncoder javaScriptStringEncoder, string value, TextWriter output)
+        public static void Encode(this IJavaScriptEncoder javaScriptEncoder, string value, TextWriter output)
         {
-            if (javaScriptStringEncoder == null)
+            if (javaScriptEncoder == null)
             {
-                throw new ArgumentNullException(nameof(javaScriptStringEncoder));
+                throw new ArgumentNullException(nameof(javaScriptEncoder));
             }
 
             if (!String.IsNullOrEmpty(value))
             {
-                javaScriptStringEncoder.JavaScriptStringEncode(value, 0, value.Length, output);
+                javaScriptEncoder.Encode(output, value, 0, value.Length);
             }
         }
 
@@ -54,7 +54,7 @@ public static void JavaScriptStringEncode(this IJavaScriptStringEncoder javaScri
         /// The encoded value is safe for use in the segment, query, or
         /// fragment portion of a URI.
         /// </remarks>
-        public static void UrlEncode(this IUrlEncoder urlEncoder, string value, TextWriter output)
+        public static void Encode(this IUrlEncoder urlEncoder, string value, TextWriter output)
         {
             if (urlEncoder == null)
             {
@@ -63,7 +63,7 @@ public static void UrlEncode(this IUrlEncoder urlEncoder, string value, TextWrit
 
             if (!String.IsNullOrEmpty(value))
             {
-                urlEncoder.UrlEncode(value, 0, value.Length, output);
+                urlEncoder.Encode(output, value, 0, value.Length);
             }
         }
     }
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/EncoderServiceProviderExtensions.cs b/src/Microsoft.Extensions.WebEncoders.Core/EncoderServiceProviderExtensions.cs
@@ -23,15 +23,15 @@ public static IHtmlEncoder GetHtmlEncoder(this IServiceProvider serviceProvider)
         }
 
         /// <summary>
-        /// Retrieves an <see cref="IJavaScriptStringEncoder"/> from an <see cref="IServiceProvider"/>.
+        /// Retrieves an <see cref="IJavaScriptEncoder"/> from an <see cref="IServiceProvider"/>.
         /// </summary>
         /// <remarks>
         /// This method is guaranteed never to return null.
         /// It will return a default encoder instance if <paramref name="serviceProvider"/> does not contain one or is null.
         /// </remarks>
-        public static IJavaScriptStringEncoder GetJavaScriptStringEncoder(this IServiceProvider serviceProvider)
+        public static IJavaScriptEncoder GetJavaScriptEncoder(this IServiceProvider serviceProvider)
         {
-            return (IJavaScriptStringEncoder)serviceProvider?.GetService(typeof(IJavaScriptStringEncoder)) ?? JavaScriptEncoderWrapper.Default;
+            return (IJavaScriptEncoder)serviceProvider?.GetService(typeof(IJavaScriptEncoder)) ?? JavaScriptEncoderWrapper.Default;
         }
 
         /// <summary>
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/HtmlEncoderWrapper.cs b/src/Microsoft.Extensions.WebEncoders.Core/HtmlEncoderWrapper.cs
@@ -27,17 +27,17 @@ public HtmlEncoderWrapper(TextEncoderSettings settings)
 
         public static HtmlEncoderWrapper Default { get; } = new HtmlEncoderWrapper(HtmlEncoder.Default);
 
-        public string HtmlEncode(string value)
+        public string Encode(string value)
         {
             return _encoder.Encode(value);
         }
 
-        public void HtmlEncode(string value, int startIndex, int charCount, TextWriter output)
+        public void Encode(TextWriter output, string value, int startIndex, int charCount)
         {
             _encoder.Encode(output, value, startIndex, charCount);
         }
 
-        public void HtmlEncode(char[] value, int startIndex, int charCount, TextWriter output)
+        public void Encode(TextWriter output, char[] value, int startIndex, int charCount)
         {
             _encoder.Encode(output, value, startIndex, charCount);
         }
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/IHtmlEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/IHtmlEncoder.cs
@@ -18,7 +18,7 @@ public interface IHtmlEncoder
         /// The encoded value is also appropriately encoded for inclusion inside an HTML attribute
         /// as long as the attribute value is surrounded by single or double quotes.
         /// </remarks>
-        void HtmlEncode(char[] value, int startIndex, int charCount, TextWriter output);
+        void Encode(TextWriter output, char[] value, int startIndex, int charCount);
 
         /// <summary>
         /// HTML-encodes a given input string.
@@ -30,7 +30,7 @@ public interface IHtmlEncoder
         /// The return value is also appropriately encoded for inclusion inside an HTML attribute
         /// as long as the attribute value is surrounded by single or double quotes.
         /// </remarks>
-        string HtmlEncode(string value);
+        string Encode(string value);
 
         /// <summary>
         /// HTML-encodes a given input string and writes the result to the
@@ -40,6 +40,6 @@ public interface IHtmlEncoder
         /// The encoded value is also appropriately encoded for inclusion inside an HTML attribute
         /// as long as the attribute value is surrounded by single or double quotes.
         /// </remarks>
-        void HtmlEncode(string value, int startIndex, int charCount, TextWriter output);
+        void Encode(TextWriter output, string value, int startIndex, int charCount);
     }
 }
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/IJavaScriptEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/IJavaScriptEncoder.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Extensions.WebEncoders
     /// <summary>
     /// Provides services for JavaScript-escaping strings.
     /// </summary>
-    public interface IJavaScriptStringEncoder
+    public interface IJavaScriptEncoder
     {
         /// <summary>
         /// JavaScript-escapes a character array and writes the result to the
@@ -17,7 +17,7 @@ public interface IJavaScriptStringEncoder
         /// <remarks>
         /// The encoded value is appropriately encoded for inclusion inside a quoted JSON string.
         /// </remarks>
-        void JavaScriptStringEncode(char[] value, int startIndex, int charCount, TextWriter output);
+        void Encode(TextWriter output, char[] value, int startIndex, int charCount);
 
         /// <summary>
         /// JavaScript-escapes a given input string.
@@ -26,7 +26,7 @@ public interface IJavaScriptStringEncoder
         /// The JavaScript-escaped value, or null if the input string was null.
         /// The encoded value is appropriately encoded for inclusion inside a quoted JSON string.
         /// </returns>
-        string JavaScriptStringEncode(string value);
+        string Encode(string value);
 
         /// <summary>
         /// JavaScript-escapes a given input string and writes the
@@ -35,6 +35,6 @@ public interface IJavaScriptStringEncoder
         /// <remarks>
         /// The encoded value is appropriately encoded for inclusion inside a quoted JSON string.
         /// </remarks>
-        void JavaScriptStringEncode(string value, int startIndex, int charCount, TextWriter output);
+        void Encode(TextWriter output, string value, int startIndex, int charCount);
     }
 }
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/IUrlEncoder.cs b/src/Microsoft.Extensions.WebEncoders.Core/IUrlEncoder.cs
@@ -18,7 +18,7 @@ public interface IUrlEncoder
         /// The encoded value is appropriately encoded for inclusion in the segment, query, or
         /// fragment portion of a URI.
         /// </remarks>
-        void UrlEncode(char[] value, int startIndex, int charCount, TextWriter output);
+        void Encode(TextWriter output, char[] value, int startIndex, int charCount);
 
         /// <summary>
         /// URL-escapes a given input string.
@@ -30,7 +30,7 @@ public interface IUrlEncoder
         /// The return value is appropriately encoded for inclusion in the segment, query, or
         /// fragment portion of a URI.
         /// </remarks>
-        string UrlEncode(string value);
+        string Encode(string value);
 
         /// <summary>
         /// URL-escapes a string and writes the result to the supplied output.
@@ -39,6 +39,6 @@ public interface IUrlEncoder
         /// The encoded value is appropriately encoded for inclusion in the segment, query, or
         /// fragment portion of a URI.
         /// </remarks>
-        void UrlEncode(string value, int startIndex, int charCount, TextWriter output);
+        void Encode(TextWriter output, string value, int startIndex, int charCount);
     }
 }
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/JavaScriptEncoderWrapper.cs b/src/Microsoft.Extensions.WebEncoders.Core/JavaScriptEncoderWrapper.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Extensions.WebEncoders
 {
-    public class JavaScriptEncoderWrapper : IJavaScriptStringEncoder
+    public class JavaScriptEncoderWrapper : IJavaScriptEncoder
     {
         private JavaScriptEncoder _encoder;
 
@@ -25,19 +25,19 @@ public JavaScriptEncoderWrapper(TextEncoderSettings settings)
             _encoder = JavaScriptEncoder.Create(settings);
         }
 
-        public static IJavaScriptStringEncoder Default { get; } = new JavaScriptEncoderWrapper(JavaScriptEncoder.Default);
+        public static IJavaScriptEncoder Default { get; } = new JavaScriptEncoderWrapper(JavaScriptEncoder.Default);
 
-        public string JavaScriptStringEncode(string value)
+        public string Encode(string value)
         {
             return _encoder.Encode(value);
         }
 
-        public void JavaScriptStringEncode(string value, int startIndex, int charCount, TextWriter output)
+        public void Encode(TextWriter output, string value, int startIndex, int charCount)
         {
             _encoder.Encode(output, value, startIndex, charCount);
         }
 
-        public void JavaScriptStringEncode(char[] value, int startIndex, int charCount, TextWriter output)
+        public void Encode(TextWriter output, char[] value, int startIndex, int charCount)
         {
             _encoder.Encode(output, value, startIndex, charCount);
         }
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/UrlEncoderWrapper.cs b/src/Microsoft.Extensions.WebEncoders.Core/UrlEncoderWrapper.cs
@@ -28,17 +28,17 @@ public UrlEncoderWrapper(TextEncoderSettings settings)
 
         public static IUrlEncoder Default { get; } = new UrlEncoderWrapper(UrlEncoder.Default);
 
-        public string UrlEncode(string value)
+        public string Encode(string value)
         {
             return _encoder.Encode(value);
         }
 
-        public void UrlEncode(string value, int startIndex, int charCount, TextWriter output)
+        public void Encode(TextWriter output, string value, int startIndex, int charCount)
         {
             _encoder.Encode(output, value, startIndex, charCount);
         }
 
-        public void UrlEncode(char[] value, int startIndex, int charCount, TextWriter output)
+        public void Encode(TextWriter output, char[] value, int startIndex, int charCount)
         {
             _encoder.Encode(output, value, startIndex, charCount);
         }
diff --git a/src/Microsoft.Extensions.WebEncoders.Core/WebEncoderOptions.cs b/src/Microsoft.Extensions.WebEncoders.Core/WebEncoderOptions.cs
@@ -1,13 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Text.Encodings.Web;
 
 namespace Microsoft.Extensions.WebEncoders
 {
     /// <summary>
-    /// Specifies options common to all three encoders (HtmlEncode, JavaScriptStringEncode, UrlEncode).
+    /// Specifies options common to all three encoders (HtmlEncode, JavaScriptEncode, UrlEncode).
     /// </summary>
     public sealed class WebEncoderOptions
     {
diff --git a/src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs b/src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs
@@ -34,7 +34,7 @@ public static IServiceCollection AddWebEncoders(this IServiceCollection services
             // We want to call the 'Default' property getters lazily since they perform static caching
             services.TryAdd(ServiceDescriptor.Singleton<IHtmlEncoder>(
                 CreateFactory(() => HtmlEncoderWrapper.Default, settings => new HtmlEncoderWrapper(settings))));
-            services.TryAdd(ServiceDescriptor.Singleton<IJavaScriptStringEncoder>(
+            services.TryAdd(ServiceDescriptor.Singleton<IJavaScriptEncoder>(
                 CreateFactory(() => JavaScriptEncoderWrapper.Default, settings => new JavaScriptEncoderWrapper(settings))));
             services.TryAdd(ServiceDescriptor.Singleton<IUrlEncoder>(
                 CreateFactory(() => UrlEncoderWrapper.Default, settings => new UrlEncoderWrapper(settings))));
diff --git a/test/Microsoft.AspNet.Html.Abstractions.Test/HtmlContentBuilderExtensionsTest.cs b/test/Microsoft.AspNet.Html.Abstractions.Test/HtmlContentBuilderExtensionsTest.cs
@@ -413,7 +413,7 @@ public UnencodedString(string value)
 
             public void WriteTo(TextWriter writer, IHtmlEncoder encoder)
             {
-                encoder.HtmlEncode(Value, writer);
+                encoder.Encode(Value, writer);
             }
         }
 
diff --git a/test/Microsoft.Extensions.WebEncoders.Tests/CommonTestEncoder.cs b/test/Microsoft.Extensions.WebEncoders.Tests/CommonTestEncoder.cs
diff --git a/test/Microsoft.Extensions.WebEncoders.Tests/EncoderExtensionsTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/EncoderExtensionsTests.cs
diff --git a/test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs
diff --git a/test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs b/test/Microsoft.Extensions.WebEncoders.Tests/EncoderServiceProviderExtensionsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ public string Format(string format, object arg, IFormatProvider formatProvider)`
`305`	`305`	`var result = customFormatter.Format(format, arg, _formatProvider);`
`306`	`306`	`if (result != null)`
`307`	`307`	`{`
`308`		`- return _encoder.HtmlEncode(result);`
	`308`	`+ return _encoder.Encode(result);`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`
`@@ -319,7 +319,7 @@ public string Format(string format, object arg, IFormatProvider formatProvider)`
`319`	`319`	`var result = formattable.ToString(format, _formatProvider);`
`320`	`320`	`if (result != null)`
`321`	`321`	`{`
`322`		`- return _encoder.HtmlEncode(result);`
	`322`	`+ return _encoder.Encode(result);`
`323`	`323`	`}`
`324`	`324`	`}`
`325`	`325`
`@@ -329,7 +329,7 @@ public string Format(string format, object arg, IFormatProvider formatProvider)`
`329`	`329`	`var result = arg.ToString();`
`330`	`330`	`if (result != null)`
`331`	`331`	`{`
`332`		`- return _encoder.HtmlEncode(result);`
	`332`	`+ return _encoder.Encode(result);`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void WriteTo(TextWriter writer, IHtmlEncoder encoder)`
`86`	`86`	`var entryAsString = entry as string;`
`87`	`87`	`if (entryAsString != null)`
`88`	`88`	`{`
`89`		`- encoder.HtmlEncode(entryAsString, writer);`
	`89`	`+ encoder.Encode(entryAsString, writer);`
`90`	`90`	`}`
`91`	`91`	`else`
`92`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static class EncoderExtensions`
`18`	`18`	`/// The encoded value is also safe for inclusion inside an HTML attribute`
`19`	`19`	`/// as long as the attribute value is surrounded by single or double quotes.`
`20`	`20`	`/// </remarks>`
`21`		`- public static void HtmlEncode(this IHtmlEncoder htmlEncoder, string value, TextWriter output)`
	`21`	`+ public static void Encode(this IHtmlEncoder htmlEncoder, string value, TextWriter output)`
`22`	`22`	`{`
`23`	`23`	`if (htmlEncoder == null)`
`24`	`24`	`{`
`@@ -27,23 +27,23 @@ public static void HtmlEncode(this IHtmlEncoder htmlEncoder, string value, TextW`
`27`	`27`
`28`	`28`	`if (!String.IsNullOrEmpty(value))`
`29`	`29`	`{`
`30`		`- htmlEncoder.HtmlEncode(value, 0, value.Length, output);`
	`30`	`+ htmlEncoder.Encode(output, value, 0, value.Length);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/// <summary>`
`35`	`35`	`/// JavaScript-escapes a string and writes the result to the supplied output.`
`36`	`36`	`/// </summary>`
`37`		`- public static void JavaScriptStringEncode(this IJavaScriptStringEncoder javaScriptStringEncoder, string value, TextWriter output)`
	`37`	`+ public static void Encode(this IJavaScriptEncoder javaScriptEncoder, string value, TextWriter output)`
`38`	`38`	`{`
`39`		`- if (javaScriptStringEncoder == null)`
	`39`	`+ if (javaScriptEncoder == null)`
`40`	`40`	`{`
`41`		`- throw new ArgumentNullException(nameof(javaScriptStringEncoder));`
	`41`	`+ throw new ArgumentNullException(nameof(javaScriptEncoder));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (!String.IsNullOrEmpty(value))`
`45`	`45`	`{`
`46`		`- javaScriptStringEncoder.JavaScriptStringEncode(value, 0, value.Length, output);`
	`46`	`+ javaScriptEncoder.Encode(output, value, 0, value.Length);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`@@ -54,7 +54,7 @@ public static void JavaScriptStringEncode(this IJavaScriptStringEncoder javaScri`
`54`	`54`	`/// The encoded value is safe for use in the segment, query, or`
`55`	`55`	`/// fragment portion of a URI.`
`56`	`56`	`/// </remarks>`
`57`		`- public static void UrlEncode(this IUrlEncoder urlEncoder, string value, TextWriter output)`
	`57`	`+ public static void Encode(this IUrlEncoder urlEncoder, string value, TextWriter output)`
`58`	`58`	`{`
`59`	`59`	`if (urlEncoder == null)`
`60`	`60`	`{`
`@@ -63,7 +63,7 @@ public static void UrlEncode(this IUrlEncoder urlEncoder, string value, TextWrit`
`63`	`63`
`64`	`64`	`if (!String.IsNullOrEmpty(value))`
`65`	`65`	`{`
`66`		`- urlEncoder.UrlEncode(value, 0, value.Length, output);`
	`66`	`+ urlEncoder.Encode(output, value, 0, value.Length);`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ public static IHtmlEncoder GetHtmlEncoder(this IServiceProvider serviceProvider)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/// <summary>`
`26`		`- /// Retrieves an <see cref="IJavaScriptStringEncoder"/> from an <see cref="IServiceProvider"/>.`
	`26`	`+ /// Retrieves an <see cref="IJavaScriptEncoder"/> from an <see cref="IServiceProvider"/>.`
`27`	`27`	`/// </summary>`
`28`	`28`	`/// <remarks>`
`29`	`29`	`/// This method is guaranteed never to return null.`
`30`	`30`	`/// It will return a default encoder instance if <paramref name="serviceProvider"/> does not contain one or is null.`
`31`	`31`	`/// </remarks>`
`32`		`- public static IJavaScriptStringEncoder GetJavaScriptStringEncoder(this IServiceProvider serviceProvider)`
	`32`	`+ public static IJavaScriptEncoder GetJavaScriptEncoder(this IServiceProvider serviceProvider)`
`33`	`33`	`{`
`34`		`- return (IJavaScriptStringEncoder)serviceProvider?.GetService(typeof(IJavaScriptStringEncoder)) ?? JavaScriptEncoderWrapper.Default;`
	`34`	`+ return (IJavaScriptEncoder)serviceProvider?.GetService(typeof(IJavaScriptEncoder)) ?? JavaScriptEncoderWrapper.Default;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -27,17 +27,17 @@ public HtmlEncoderWrapper(TextEncoderSettings settings)`
`27`	`27`
`28`	`28`	`public static HtmlEncoderWrapper Default { get; } = new HtmlEncoderWrapper(HtmlEncoder.Default);`
`29`	`29`
`30`		`- public string HtmlEncode(string value)`
	`30`	`+ public string Encode(string value)`
`31`	`31`	`{`
`32`	`32`	`return _encoder.Encode(value);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public void HtmlEncode(string value, int startIndex, int charCount, TextWriter output)`
	`35`	`+ public void Encode(TextWriter output, string value, int startIndex, int charCount)`
`36`	`36`	`{`
`37`	`37`	`_encoder.Encode(output, value, startIndex, charCount);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public void HtmlEncode(char[] value, int startIndex, int charCount, TextWriter output)`
	`40`	`+ public void Encode(TextWriter output, char[] value, int startIndex, int charCount)`
`41`	`41`	`{`
`42`	`42`	`_encoder.Encode(output, value, startIndex, charCount);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.Extensions.WebEncoders`
`8`	`8`	`{`
`9`		`- public class JavaScriptEncoderWrapper : IJavaScriptStringEncoder`
	`9`	`+ public class JavaScriptEncoderWrapper : IJavaScriptEncoder`
`10`	`10`	`{`
`11`	`11`	`private JavaScriptEncoder _encoder;`
`12`	`12`
`@@ -25,19 +25,19 @@ public JavaScriptEncoderWrapper(TextEncoderSettings settings)`
`25`	`25`	`_encoder = JavaScriptEncoder.Create(settings);`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static IJavaScriptStringEncoder Default { get; } = new JavaScriptEncoderWrapper(JavaScriptEncoder.Default);`
	`28`	`+ public static IJavaScriptEncoder Default { get; } = new JavaScriptEncoderWrapper(JavaScriptEncoder.Default);`
`29`	`29`
`30`		`- public string JavaScriptStringEncode(string value)`
	`30`	`+ public string Encode(string value)`
`31`	`31`	`{`
`32`	`32`	`return _encoder.Encode(value);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public void JavaScriptStringEncode(string value, int startIndex, int charCount, TextWriter output)`
	`35`	`+ public void Encode(TextWriter output, string value, int startIndex, int charCount)`
`36`	`36`	`{`
`37`	`37`	`_encoder.Encode(output, value, startIndex, charCount);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public void JavaScriptStringEncode(char[] value, int startIndex, int charCount, TextWriter output)`
	`40`	`+ public void Encode(TextWriter output, char[] value, int startIndex, int charCount)`
`41`	`41`	`{`
`42`	`42`	`_encoder.Encode(output, value, startIndex, charCount);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,17 +28,17 @@ public UrlEncoderWrapper(TextEncoderSettings settings)`
`28`	`28`
`29`	`29`	`public static IUrlEncoder Default { get; } = new UrlEncoderWrapper(UrlEncoder.Default);`
`30`	`30`
`31`		`- public string UrlEncode(string value)`
	`31`	`+ public string Encode(string value)`
`32`	`32`	`{`
`33`	`33`	`return _encoder.Encode(value);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public void UrlEncode(string value, int startIndex, int charCount, TextWriter output)`
	`36`	`+ public void Encode(TextWriter output, string value, int startIndex, int charCount)`
`37`	`37`	`{`
`38`	`38`	`_encoder.Encode(output, value, startIndex, charCount);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public void UrlEncode(char[] value, int startIndex, int charCount, TextWriter output)`
	`41`	`+ public void Encode(TextWriter output, char[] value, int startIndex, int charCount)`
`42`	`42`	`{`
`43`	`43`	`_encoder.Encode(output, value, startIndex, charCount);`
`44`	`44`	`}`