Skip to content

Commit c3c29ba

Browse files
committed
Apply new Resharper suggestions
1 parent c9ec0a5 commit c3c29ba

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

src/Examples/JsonApiDotNetCoreExampleClient/ExampleApiClient.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
using JetBrains.Annotations;
12
using JsonApiDotNetCore.OpenApi.Client;
23
using Newtonsoft.Json;
34

45
namespace JsonApiDotNetCoreExampleClient;
56

7+
[UsedImplicitly(ImplicitUseTargetFlags.Itself)]
68
public partial class ExampleApiClient : JsonApiClient
79
{
810
partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)

src/JsonApiDotNetCore.OpenApi.Client/JsonApiClient.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,8 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer
122122

123123
if (value != null)
124124
{
125-
if (_alwaysIncludedAttributesPerRequestDocumentInstance.ContainsKey(value))
125+
if (_alwaysIncludedAttributesPerRequestDocumentInstance.TryGetValue(value, out AttributeNamesContainer? attributeNamesContainer))
126126
{
127-
AttributeNamesContainer attributeNamesContainer = _alwaysIncludedAttributesPerRequestDocumentInstance[value];
128127
serializer.ContractResolver = new JsonApiDocumentContractResolver(attributeNamesContainer);
129128
}
130129

src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ private IReadOnlyCollection<RelationshipAttribute> GetRelationshipsOfPrimaryReso
7575

7676
private static bool IsSecondaryOrRelationshipEndpoint(JsonApiEndpoint endpoint)
7777
{
78-
return endpoint is JsonApiEndpoint.GetSecondary or JsonApiEndpoint.GetRelationship or JsonApiEndpoint.PostRelationship
79-
or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship;
78+
return endpoint is JsonApiEndpoint.GetSecondary or JsonApiEndpoint.GetRelationship or JsonApiEndpoint.PostRelationship or
79+
JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship;
8080
}
8181

8282
private void SetResponseMetadata(ActionModel action, JsonApiEndpoint endpoint)
@@ -160,7 +160,7 @@ private static void SetRequestMetadata(ActionModel action, JsonApiEndpoint endpo
160160

161161
private static bool RequiresRequestBody(JsonApiEndpoint endpoint)
162162
{
163-
return endpoint is JsonApiEndpoint.Post or JsonApiEndpoint.Patch or JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship
164-
or JsonApiEndpoint.DeleteRelationship;
163+
return endpoint is JsonApiEndpoint.Post or JsonApiEndpoint.Patch or JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship or
164+
JsonApiEndpoint.DeleteRelationship;
165165
}
166166
}

src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ private static void ReorderMembers(OpenApiSchema fullSchemaForResourceObject, IE
132132

133133
foreach (string member in orderedMembers)
134134
{
135-
if (fullSchemaForResourceObject.Properties.ContainsKey(member))
135+
if (fullSchemaForResourceObject.Properties.TryGetValue(member, out OpenApiSchema? schema))
136136
{
137-
reorderedMembers[member] = fullSchemaForResourceObject.Properties[member];
137+
reorderedMembers[member] = schema;
138138
}
139139
}
140140

0 commit comments

Comments
 (0)