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
{

0 commit comments

Comments
 (0)