diff --git a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs index d702b9716c..83c036c101 100644 --- a/src/Umbraco.Tests.Common/Builders/UserBuilder.cs +++ b/src/Umbraco.Tests.Common/Builders/UserBuilder.cs @@ -79,7 +79,7 @@ namespace Umbraco.Tests.Common.Builders return this; } - public UserBuilder WithUsername(string username) + public UserBuilder WithUsername(string username) { _username = username; return this; diff --git a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/UsersControllerTests.cs b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/UsersControllerTests.cs index 16a05a7aaa..07ba387b4d 100644 --- a/src/Umbraco.Tests.Integration/TestServerTest/Controllers/UsersControllerTests.cs +++ b/src/Umbraco.Tests.Integration/TestServerTest/Controllers/UsersControllerTests.cs @@ -66,7 +66,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix); var actual = JsonConvert.DeserializeObject(body, new JsonSerializerSettings { - ContractResolver = new IgnoreRequiredAttributsResolver() + ContractResolver = new IgnoreRequiredAttributesResolver() }); Assert.AreEqual(userSave.Name, actual.Name); Assert.AreEqual(userSave.Id, actual.Id); @@ -90,7 +90,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers Assert.AreEqual(HttpStatusCode.OK, response.StatusCode); var actual = JsonConvert.DeserializeObject>(body, new JsonSerializerSettings { - ContractResolver = new IgnoreRequiredAttributsResolver() + ContractResolver = new IgnoreRequiredAttributesResolver() }); Assert.Multiple(() => { @@ -129,7 +129,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers Assert.AreEqual(HttpStatusCode.OK, response.StatusCode); var actual = JsonConvert.DeserializeObject>(body, new JsonSerializerSettings { - ContractResolver = new IgnoreRequiredAttributsResolver() + ContractResolver = new IgnoreRequiredAttributesResolver() }); Assert.Multiple(() => { @@ -164,7 +164,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers var actual = JsonConvert.DeserializeObject(body, new JsonSerializerSettings { - ContractResolver = new IgnoreRequiredAttributsResolver() + ContractResolver = new IgnoreRequiredAttributesResolver() }); Assert.Multiple(() => { @@ -197,7 +197,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers Assert.AreEqual(HttpStatusCode.OK, response.StatusCode); var actual = JsonConvert.DeserializeObject(body, new JsonSerializerSettings { - ContractResolver = new IgnoreRequiredAttributsResolver() + ContractResolver = new IgnoreRequiredAttributesResolver() }); Assert.Multiple(() => @@ -243,7 +243,7 @@ namespace Umbraco.Tests.Integration.TestServerTest.Controllers Assert.AreEqual(HttpStatusCode.OK, response.StatusCode); var actual = JsonConvert.DeserializeObject(body, new JsonSerializerSettings { - ContractResolver = new IgnoreRequiredAttributsResolver() + ContractResolver = new IgnoreRequiredAttributesResolver() }); Assert.Multiple(() => diff --git a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs index 67785191f1..4786ae09c5 100644 --- a/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs +++ b/src/Umbraco.Web.BackOffice/Filters/UserGroupValidateAttribute.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web.BackOffice.Filters private readonly IUserService _userService; private readonly UmbracoMapper _umbracoMapper; - public UserGroupValidateFilter( + public UserGroupValidateFilter( IUserService userService, UmbracoMapper umbracoMapper) { diff --git a/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributsResolver.cs b/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs similarity index 85% rename from src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributsResolver.cs rename to src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs index 86186dea41..d016a023be 100644 --- a/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributsResolver.cs +++ b/src/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolver.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json.Serialization; namespace Umbraco.Web.Common.Formatters { - public class IgnoreRequiredAttributsResolver : DefaultContractResolver + public class IgnoreRequiredAttributesResolver : DefaultContractResolver { protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization) { diff --git a/src/Umbraco.Web.Common/ModelBinding/UmbracoJsonModelBinderProvider.cs b/src/Umbraco.Web.Common/ModelBinding/UmbracoJsonModelBinderProvider.cs index 2b5ea1b4fe..94b5b37c82 100644 --- a/src/Umbraco.Web.Common/ModelBinding/UmbracoJsonModelBinderProvider.cs +++ b/src/Umbraco.Web.Common/ModelBinding/UmbracoJsonModelBinderProvider.cs @@ -33,7 +33,7 @@ namespace Umbraco.Web.Common.ModelBinding var ss = jsonOptions.SerializerSettings; // Just use the defaults as base // We need to ignore required attributes when serializing. E.g UserSave.ChangePassword. Otherwise the model is not model bound. - ss.ContractResolver = new IgnoreRequiredAttributsResolver(); + ss.ContractResolver = new IgnoreRequiredAttributesResolver(); return new IInputFormatter[] { new NewtonsoftJsonInputFormatter(