Skip to content

Commit 2adff3c

Browse files
author
Bart Koelman
committed
Fixed naming conventions
Resharper was set to auto-detect, making it ignore configured rules
1 parent d0bfb0b commit 2adff3c

File tree

26 files changed

+104
-104
lines changed

26 files changed

+104
-104
lines changed

‎benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Benchmarks.Serialization
1515
[MarkdownExporter]
1616
public class JsonApiDeserializerBenchmarks
1717
{
18-
private static readonly string _content = JsonConvert.SerializeObject(new Document
18+
private static readonly string Content = JsonConvert.SerializeObject(new Document
1919
{
2020
Data = new ResourceObject
2121
{
@@ -43,6 +43,6 @@ public JsonApiDeserializerBenchmarks()
4343
}
4444

4545
[Benchmark]
46-
public object DeserializeSimpleObject() => _jsonApiDeserializer.Deserialize(_content);
46+
public object DeserializeSimpleObject() => _jsonApiDeserializer.Deserialize(Content);
4747
}
4848
}

‎benchmarks/Serialization/JsonApiSerializerBenchmarks.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Benchmarks.Serialization
1414
[MarkdownExporter]
1515
public class JsonApiSerializerBenchmarks
1616
{
17-
private static readonly BenchmarkResource _content = new BenchmarkResource
17+
private static readonly BenchmarkResource Content = new BenchmarkResource
1818
{
1919
Id = 123,
2020
Name = Guid.NewGuid().ToString()
@@ -53,6 +53,6 @@ private static FieldsToSerialize CreateFieldsToSerialize(IResourceGraph resource
5353
}
5454

5555
[Benchmark]
56-
public object SerializeSimpleObject() => _jsonApiSerializer.Serialize(_content);
56+
public object SerializeSimpleObject() => _jsonApiSerializer.Serialize(Content);
5757
}
5858
}

‎src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace JsonApiDotNetCoreExample.Startups
1414
{
1515
public class Startup : EmptyStartup
1616
{
17-
private static readonly Version _postgresCiBuildVersion = new Version(9, 6);
17+
private static readonly Version PostgresCiBuildVersion = new Version(9, 6);
1818
private readonly string _connectionString;
1919

2020
public Startup(IConfiguration configuration)
@@ -31,7 +31,7 @@ public override void ConfigureServices(IServiceCollection services)
3131
services.AddDbContext<AppDbContext>(options =>
3232
{
3333
options.EnableSensitiveDataLogging();
34-
options.UseNpgsql(_connectionString, postgresOptions => postgresOptions.SetPostgresVersion(_postgresCiBuildVersion));
34+
options.UseNpgsql(_connectionString, postgresOptions => postgresOptions.SetPostgresVersion(PostgresCiBuildVersion));
3535
});
3636

3737
services.AddJsonApi<AppDbContext>(ConfigureJsonApiOptions, discovery => discovery.AddCurrentAssembly());

‎src/JsonApiDotNetCore/Configuration/ResourceGraph.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace JsonApiDotNetCore.Configuration
1111
public class ResourceGraph : IResourceGraph
1212
{
1313
private readonly IReadOnlyCollection<ResourceContext> _resources;
14-
private static readonly Type _proxyTargetAccessorType = Type.GetType("Castle.DynamicProxy.IProxyTargetAccessor, Castle.Core");
14+
private static readonly Type ProxyTargetAccessorType = Type.GetType("Castle.DynamicProxy.IProxyTargetAccessor, Castle.Core");
1515

1616
public ResourceGraph(IReadOnlyCollection<ResourceContext> resources)
1717
{
@@ -171,7 +171,7 @@ private IReadOnlyCollection<ResourceFieldAttribute> Getter<TResource>(Expression
171171
}
172172

173173
private bool IsLazyLoadingProxyForResourceType(Type resourceType) =>
174-
_proxyTargetAccessorType?.IsAssignableFrom(resourceType) ?? false;
174+
ProxyTargetAccessorType?.IsAssignableFrom(resourceType) ?? false;
175175

176176
private static Expression RemoveConvert(Expression expression)
177177
{

‎src/JsonApiDotNetCore/Errors/JsonApiException.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace JsonApiDotNetCore.Errors
1111
/// </summary>
1212
public class JsonApiException : Exception
1313
{
14-
private static readonly JsonSerializerSettings _errorSerializerSettings = new JsonSerializerSettings
14+
private static readonly JsonSerializerSettings ErrorSerializerSettings = new JsonSerializerSettings
1515
{
1616
NullValueHandling = NullValueHandling.Ignore,
1717
Formatting = Formatting.Indented
@@ -40,6 +40,6 @@ public JsonApiException(IEnumerable<Error> errors, Exception innerException = nu
4040
}
4141
}
4242

43-
public override string Message => "Errors = " + JsonConvert.SerializeObject(Errors, _errorSerializerSettings);
43+
public override string Message => "Errors = " + JsonConvert.SerializeObject(Errors, ErrorSerializerSettings);
4444
}
4545
}

‎src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ namespace JsonApiDotNetCore.Middleware
2323
/// </summary>
2424
public sealed class JsonApiMiddleware
2525
{
26-
private static readonly MediaTypeHeaderValue _mediaType = MediaTypeHeaderValue.Parse(HeaderConstants.MediaType);
27-
private static readonly MediaTypeHeaderValue _atomicOperationsMediaType = MediaTypeHeaderValue.Parse(HeaderConstants.AtomicOperationsMediaType);
26+
private static readonly MediaTypeHeaderValue MediaType = MediaTypeHeaderValue.Parse(HeaderConstants.MediaType);
27+
private static readonly MediaTypeHeaderValue AtomicOperationsMediaType = MediaTypeHeaderValue.Parse(HeaderConstants.AtomicOperationsMediaType);
2828

2929
private readonly RequestDelegate _next;
3030

@@ -51,7 +51,7 @@ public async Task Invoke(HttpContext httpContext,
5151
if (primaryResourceContext != null)
5252
{
5353
if (!await ValidateContentTypeHeaderAsync(HeaderConstants.MediaType, httpContext, options.SerializerSettings) ||
54-
!await ValidateAcceptHeaderAsync(_mediaType, httpContext, options.SerializerSettings))
54+
!await ValidateAcceptHeaderAsync(MediaType, httpContext, options.SerializerSettings))
5555
{
5656
return;
5757
}
@@ -63,7 +63,7 @@ public async Task Invoke(HttpContext httpContext,
6363
else if (IsOperationsRequest(routeValues))
6464
{
6565
if (!await ValidateContentTypeHeaderAsync(HeaderConstants.AtomicOperationsMediaType, httpContext, options.SerializerSettings) ||
66-
!await ValidateAcceptHeaderAsync(_atomicOperationsMediaType, httpContext, options.SerializerSettings))
66+
!await ValidateAcceptHeaderAsync(AtomicOperationsMediaType, httpContext, options.SerializerSettings))
6767
{
6868
return;
6969
}

‎src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
1818
/// </summary>
1919
public class SelectClauseBuilder : QueryClauseBuilder<object>
2020
{
21-
private static readonly ConstantExpression _nullConstant = Expression.Constant(null);
21+
private static readonly ConstantExpression NullConstant = Expression.Constant(null);
2222

2323
private readonly Expression _source;
2424
private readonly IModel _entityModel;
@@ -207,8 +207,8 @@ private Expression CreateCollectionInitializer(LambdaScope lambdaScope, Property
207207

208208
private static Expression TestForNull(Expression expressionToTest, Expression ifFalseExpression)
209209
{
210-
BinaryExpression equalsNull = Expression.Equal(expressionToTest, _nullConstant);
211-
return Expression.Condition(equalsNull, Expression.Convert(_nullConstant, expressionToTest.Type), ifFalseExpression);
210+
BinaryExpression equalsNull = Expression.Equal(expressionToTest, NullConstant);
211+
return Expression.Condition(equalsNull, Expression.Convert(NullConstant, expressionToTest.Type), ifFalseExpression);
212212
}
213213

214214
private static Expression CopyCollectionExtensionMethodCall(Expression source, string operationName, Type elementType)

‎src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
1414
/// </summary>
1515
public class WhereClauseBuilder : QueryClauseBuilder<Type>
1616
{
17-
private static readonly ConstantExpression _nullConstant = Expression.Constant(null);
17+
private static readonly ConstantExpression NullConstant = Expression.Constant(null);
1818

1919
private readonly Expression _source;
2020
private readonly Type _extensionType;
@@ -252,7 +252,7 @@ private static Expression WrapInConvert(Expression expression, Type targetType)
252252

253253
public override Expression VisitNullConstant(NullConstantExpression expression, Type expressionType)
254254
{
255-
return _nullConstant;
255+
return NullConstant;
256256
}
257257

258258
public override Expression VisitLiteralConstant(LiteralConstantExpression expression, Type expressionType)

‎src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace JsonApiDotNetCore.QueryStrings.Internal
1616
{
1717
public class FilterQueryStringParameterReader : QueryStringParameterReader, IFilterQueryStringParameterReader
1818
{
19-
private static readonly LegacyFilterNotationConverter _legacyConverter = new LegacyFilterNotationConverter();
19+
private static readonly LegacyFilterNotationConverter LegacyConverter = new LegacyFilterNotationConverter();
2020

2121
private readonly IJsonApiOptions _options;
2222
private readonly QueryStringParameterScopeParser _scopeParser;
@@ -79,7 +79,7 @@ private IEnumerable<string> ExtractParameterValues(string parameterName, StringV
7979
{
8080
if (_options.EnableLegacyFilterNotation)
8181
{
82-
foreach (string condition in _legacyConverter.ExtractConditions(parameterName, parameterValue))
82+
foreach (string condition in LegacyConverter.ExtractConditions(parameterName, parameterValue))
8383
{
8484
yield return condition;
8585
}
@@ -97,7 +97,7 @@ private void ReadSingleValue(string parameterName, string parameterValue)
9797
{
9898
if (_options.EnableLegacyFilterNotation)
9999
{
100-
(parameterName, parameterValue) = _legacyConverter.Convert(parameterName, parameterValue);
100+
(parameterName, parameterValue) = LegacyConverter.Convert(parameterName, parameterValue);
101101
}
102102

103103
ResourceFieldChainExpression scope = GetScope(parameterName);

‎src/JsonApiDotNetCore/QueryStrings/Internal/LegacyFilterNotationConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public sealed class LegacyFilterNotationConverter
1515
private const string InPrefix = "in:";
1616
private const string NotInPrefix = "nin:";
1717

18-
private static readonly Dictionary<string, string> _prefixConversionTable = new Dictionary<string, string>
18+
private static readonly Dictionary<string, string> PrefixConversionTable = new Dictionary<string, string>
1919
{
2020
["eq:"] = Keywords.Equals,
2121
["lt:"] = Keywords.LessThan,
@@ -55,7 +55,7 @@ public IEnumerable<string> ExtractConditions(string parameterName, string parame
5555

5656
var attributeName = ExtractAttributeName(parameterName);
5757

58-
foreach (var (prefix, keyword) in _prefixConversionTable)
58+
foreach (var (prefix, keyword) in PrefixConversionTable)
5959
{
6060
if (parameterValue.StartsWith(prefix, StringComparison.Ordinal))
6161
{

‎src/JsonApiDotNetCore/TypeHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace JsonApiDotNetCore
1111
{
1212
internal static class TypeHelper
1313
{
14-
private static readonly Type[] _hashSetCompatibleCollectionTypes =
14+
private static readonly Type[] HashSetCompatibleCollectionTypes =
1515
{
1616
typeof(HashSet<>), typeof(ICollection<>), typeof(ISet<>), typeof(IEnumerable<>), typeof(IReadOnlyCollection<>)
1717
};
@@ -251,7 +251,7 @@ public static bool TypeCanContainHashSet(Type collectionType)
251251
if (collectionType.IsGenericType)
252252
{
253253
var openCollectionType = collectionType.GetGenericTypeDefinition();
254-
return _hashSetCompatibleCollectionTypes.Contains(openCollectionType);
254+
return HashSetCompatibleCollectionTypes.Contains(openCollectionType);
255255
}
256256

257257
return false;

‎test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace DiscoveryTests
1919
{
2020
public sealed class ServiceDiscoveryFacadeTests
2121
{
22-
private static readonly NullLoggerFactory _loggerFactory = NullLoggerFactory.Instance;
22+
private static readonly NullLoggerFactory LoggerFactory = NullLoggerFactory.Instance;
2323
private readonly IServiceCollection _services = new ServiceCollection();
2424
private readonly JsonApiOptions _options = new JsonApiOptions();
2525
private readonly ResourceGraphBuilder _resourceGraphBuilder;
@@ -31,7 +31,7 @@ public ServiceDiscoveryFacadeTests()
3131
_services.AddScoped(_ => dbResolverMock.Object);
3232

3333
_services.AddSingleton<IJsonApiOptions>(_options);
34-
_services.AddSingleton<ILoggerFactory>(_loggerFactory);
34+
_services.AddSingleton<ILoggerFactory>(LoggerFactory);
3535
_services.AddScoped(_ => new Mock<IJsonApiRequest>().Object);
3636
_services.AddScoped(_ => new Mock<ITargetedFields>().Object);
3737
_services.AddScoped(_ => new Mock<IResourceGraph>().Object);
@@ -44,14 +44,14 @@ public ServiceDiscoveryFacadeTests()
4444
_services.AddScoped(_ => new Mock<IResourceRepositoryAccessor>().Object);
4545
_services.AddScoped(_ => new Mock<IResourceHookExecutorFacade>().Object);
4646

47-
_resourceGraphBuilder = new ResourceGraphBuilder(_options, _loggerFactory);
47+
_resourceGraphBuilder = new ResourceGraphBuilder(_options, LoggerFactory);
4848
}
4949

5050
[Fact]
5151
public void Can_add_resources_from_assembly_to_graph()
5252
{
5353
// Arrange
54-
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, _loggerFactory);
54+
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, LoggerFactory);
5555
facade.AddAssembly(typeof(Person).Assembly);
5656

5757
// Act
@@ -71,7 +71,7 @@ public void Can_add_resources_from_assembly_to_graph()
7171
public void Can_add_resource_from_current_assembly_to_graph()
7272
{
7373
// Arrange
74-
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, _loggerFactory);
74+
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, LoggerFactory);
7575
facade.AddCurrentAssembly();
7676

7777
// Act
@@ -88,7 +88,7 @@ public void Can_add_resource_from_current_assembly_to_graph()
8888
public void Can_add_resource_service_from_current_assembly_to_container()
8989
{
9090
// Arrange
91-
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, _loggerFactory);
91+
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, LoggerFactory);
9292
facade.AddCurrentAssembly();
9393

9494
// Act
@@ -105,7 +105,7 @@ public void Can_add_resource_service_from_current_assembly_to_container()
105105
public void Can_add_resource_repository_from_current_assembly_to_container()
106106
{
107107
// Arrange
108-
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, _loggerFactory);
108+
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, LoggerFactory);
109109
facade.AddCurrentAssembly();
110110

111111
// Act
@@ -122,7 +122,7 @@ public void Can_add_resource_repository_from_current_assembly_to_container()
122122
public void Can_add_resource_definition_from_current_assembly_to_container()
123123
{
124124
// Arrange
125-
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, _loggerFactory);
125+
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, LoggerFactory);
126126
facade.AddCurrentAssembly();
127127

128128
// Act
@@ -139,7 +139,7 @@ public void Can_add_resource_definition_from_current_assembly_to_container()
139139
public void Can_add_resource_hooks_definition_from_current_assembly_to_container()
140140
{
141141
// Arrange
142-
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, _loggerFactory);
142+
var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, _options, LoggerFactory);
143143
facade.AddCurrentAssembly();
144144

145145
_options.EnableResourceHooks = true;

‎test/JsonApiDotNetCoreExampleTests/IntegrationTests/AtomicOperations/OperationsFakers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations
1212
{
1313
internal sealed class OperationsFakers : FakerContainer
1414
{
15-
private static readonly Lazy<IReadOnlyList<string>> _lazyLanguageIsoCodes =
15+
private static readonly Lazy<IReadOnlyList<string>> LazyLanguageIsoCodes =
1616
new Lazy<IReadOnlyList<string>>(() => CultureInfo
1717
.GetCultures(CultureTypes.NeutralCultures)
1818
.Where(culture => !string.IsNullOrEmpty(culture.Name))
@@ -41,7 +41,7 @@ internal sealed class OperationsFakers : FakerContainer
4141
private readonly Lazy<Faker<TextLanguage>> _lazyTextLanguageFaker = new Lazy<Faker<TextLanguage>>(() =>
4242
new Faker<TextLanguage>()
4343
.UseSeed(GetFakerSeed())
44-
.RuleFor(textLanguage => textLanguage.IsoCode, f => f.PickRandom<string>(_lazyLanguageIsoCodes.Value)));
44+
.RuleFor(textLanguage => textLanguage.IsoCode, f => f.PickRandom<string>(LazyLanguageIsoCodes.Value)));
4545

4646
private readonly Lazy<Faker<Performer>> _lazyPerformerFaker = new Lazy<Faker<Performer>>(() =>
4747
new Faker<Performer>()

‎test/JsonApiDotNetCoreExampleTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.AtomicOperations.QueryS
1717
public sealed class AtomicQueryStringTests
1818
: IClassFixture<ExampleIntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
1919
{
20-
private static readonly DateTime _frozenTime = 30.July(2018).At(13, 46, 12);
20+
private static readonly DateTime FrozenTime = 30.July(2018).At(13, 46, 12);
2121

2222
private readonly ExampleIntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
2323
private readonly OperationsFakers _fakers = new OperationsFakers();
@@ -30,7 +30,7 @@ public AtomicQueryStringTests(ExampleIntegrationTestContext<TestableStartup<Oper
3030
{
3131
services.AddControllersFromExampleProject();
3232

33-
services.AddSingleton<ISystemClock>(new FrozenSystemClock {UtcNow = _frozenTime});
33+
services.AddSingleton<ISystemClock>(new FrozenSystemClock {UtcNow = FrozenTime});
3434
services.AddScoped<IResourceDefinition<MusicTrack, Guid>, MusicTrackReleaseDefinition>();
3535
});
3636

@@ -278,9 +278,9 @@ public async Task Can_use_Queryable_handler_on_resource_endpoint()
278278
{
279279
// Arrange
280280
var musicTracks = _fakers.MusicTrack.Generate(3);
281-
musicTracks[0].ReleasedAt = _frozenTime.AddMonths(5);
282-
musicTracks[1].ReleasedAt = _frozenTime.AddMonths(-5);
283-
musicTracks[2].ReleasedAt = _frozenTime.AddMonths(-1);
281+
musicTracks[0].ReleasedAt = FrozenTime.AddMonths(5);
282+
musicTracks[1].ReleasedAt = FrozenTime.AddMonths(-5);
283+
musicTracks[2].ReleasedAt = FrozenTime.AddMonths(-1);
284284

285285
await _testContext.RunOnDatabaseAsync(async dbContext =>
286286
{

‎test/JsonApiDotNetCoreExampleTests/IntegrationTests/ResourceDefinitions/CallableResourceDefinition.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace JsonApiDotNetCoreExampleTests.IntegrationTests.ResourceDefinitions
1414
public sealed class CallableResourceDefinition : JsonApiResourceDefinition<CallableResource>
1515
{
1616
private readonly IUserRolesService _userRolesService;
17-
private static readonly PageSize _maxPageSize = new PageSize(5);
17+
private static readonly PageSize MaxPageSize = new PageSize(5);
1818

1919
public CallableResourceDefinition(IResourceGraph resourceGraph, IUserRolesService userRolesService) : base(resourceGraph)
2020
{
@@ -77,11 +77,11 @@ public override PaginationExpression OnApplyPagination(PaginationExpression exis
7777

7878
if (existingPagination != null)
7979
{
80-
var pageSize = existingPagination.PageSize?.Value <= _maxPageSize.Value ? existingPagination.PageSize : _maxPageSize;
80+
var pageSize = existingPagination.PageSize?.Value <= MaxPageSize.Value ? existingPagination.PageSize : MaxPageSize;
8181
return new PaginationExpression(existingPagination.PageNumber, pageSize);
8282
}
8383

84-
return new PaginationExpression(PageNumber.ValueOne, _maxPageSize);
84+
return new PaginationExpression(PageNumber.ValueOne, MaxPageSize);
8585
}
8686

8787
public override SparseFieldSetExpression OnApplySparseFieldSet(SparseFieldSetExpression existingSparseFieldSet)

0 commit comments

Comments
 (0)