Skip to content

Commit 6ae128c

Browse files
SimonCroppSimonCropp
committed
use some expression lambdas
1 parent 2690da5 commit 6ae128c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+482
-982
lines changed

‎src/Microsoft.OpenApi.Hidi/Logger.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ public static ILoggerFactory ConfigureLogger(LogLevel logLevel)
1717
return LoggerFactory.Create((builder) =>
1818
{
1919
builder
20-
.AddSimpleConsole(c =>
21-
{
22-
c.IncludeScopes = true;
23-
})
20+
.AddSimpleConsole(c => c.IncludeScopes = true)
2421
#if DEBUG
2522
.AddDebug()
2623
#endif

‎src/Microsoft.OpenApi.Readers/V2/OpenApiContactDeserializer.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,16 @@ internal static partial class OpenApiV2Deserializer
1717
private static FixedFieldMap<OpenApiContact> _contactFixedFields = new()
1818
{
1919
{
20-
"name", (o, n) =>
21-
{
22-
o.Name = n.GetScalarValue();
23-
}
20+
"name",
21+
(o, n) => o.Name = n.GetScalarValue()
2422
},
2523
{
26-
"url", (o, n) =>
27-
{
28-
o.Url = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
29-
}
24+
"url",
25+
(o, n) => o.Url = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute)
3026
},
3127
{
32-
"email", (o, n) =>
33-
{
34-
o.Email = n.GetScalarValue();
35-
}
28+
"email",
29+
(o, n) => o.Email = n.GetScalarValue()
3630
},
3731
};
3832

‎src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ internal static partial class OpenApiV2Deserializer
2121
private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()
2222
{
2323
{
24-
"swagger", (o, n) =>
25-
{
26-
} /* Version is valid field but we already parsed it */
24+
"swagger",
25+
(o, n) => {}
26+
/* Version is valid field but we already parsed it */
2727
},
2828
{"info", (o, n) => o.Info = LoadInfo(n)},
2929
{"host", (o, n) => n.Context.SetTempStorage("host", n.GetScalarValue())},

‎src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@ internal static partial class OpenApiV2Deserializer
1818
new()
1919
{
2020
{
21-
OpenApiConstants.Description, (o, n) =>
22-
{
23-
o.Description = n.GetScalarValue();
24-
}
21+
OpenApiConstants.Description,
22+
(o, n) => o.Description = n.GetScalarValue()
2523
},
2624
{
27-
OpenApiConstants.Url, (o, n) =>
28-
{
29-
o.Url = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
30-
}
25+
OpenApiConstants.Url,
26+
(o, n) => o.Url = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute)
3127
},
3228
};
3329

‎src/Microsoft.OpenApi.Readers/V2/OpenApiHeaderDeserializer.cs

Lines changed: 36 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -19,112 +19,76 @@ internal static partial class OpenApiV2Deserializer
1919
private static readonly FixedFieldMap<OpenApiHeader> _headerFixedFields = new()
2020
{
2121
{
22-
"description", (o, n) =>
23-
{
24-
o.Description = n.GetScalarValue();
25-
}
22+
"description",
23+
(o, n) => o.Description = n.GetScalarValue()
2624
},
2725
{
28-
"type", (o, n) =>
29-
{
30-
GetOrCreateSchema(o).Type = n.GetScalarValue();
31-
}
26+
"type",
27+
(o, n) => GetOrCreateSchema(o).Type = n.GetScalarValue()
3228
},
3329
{
34-
"format", (o, n) =>
35-
{
36-
GetOrCreateSchema(o).Format = n.GetScalarValue();
37-
}
30+
"format",
31+
(o, n) => GetOrCreateSchema(o).Format = n.GetScalarValue()
3832
},
3933
{
40-
"items", (o, n) =>
41-
{
42-
GetOrCreateSchema(o).Items = LoadSchema(n);
43-
}
34+
"items",
35+
(o, n) => GetOrCreateSchema(o).Items = LoadSchema(n)
4436
},
4537
{
46-
"collectionFormat", (o, n) =>
47-
{
48-
LoadStyle(o, n.GetScalarValue());
49-
}
38+
"collectionFormat",
39+
(o, n) => LoadStyle(o, n.GetScalarValue())
5040
},
5141
{
52-
"default", (o, n) =>
53-
{
54-
GetOrCreateSchema(o).Default = n.CreateAny();
55-
}
42+
"default",
43+
(o, n) => GetOrCreateSchema(o).Default = n.CreateAny()
5644
},
5745
{
58-
"maximum", (o, n) =>
59-
{
60-
GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
61-
}
46+
"maximum",
47+
(o, n) => GetOrCreateSchema(o).Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture)
6248
},
6349
{
64-
"exclusiveMaximum", (o, n) =>
65-
{
66-
GetOrCreateSchema(o).ExclusiveMaximum = bool.Parse(n.GetScalarValue());
67-
}
50+
"exclusiveMaximum",
51+
(o, n) => GetOrCreateSchema(o).ExclusiveMaximum = bool.Parse(n.GetScalarValue())
6852
},
6953
{
70-
"minimum", (o, n) =>
71-
{
72-
GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
73-
}
54+
"minimum",
55+
(o, n) => GetOrCreateSchema(o).Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture)
7456
},
7557
{
76-
"exclusiveMinimum", (o, n) =>
77-
{
78-
GetOrCreateSchema(o).ExclusiveMinimum = bool.Parse(n.GetScalarValue());
79-
}
58+
"exclusiveMinimum",
59+
(o, n) => GetOrCreateSchema(o).ExclusiveMinimum = bool.Parse(n.GetScalarValue())
8060
},
8161
{
82-
"maxLength", (o, n) =>
83-
{
84-
GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
85-
}
62+
"maxLength",
63+
(o, n) => GetOrCreateSchema(o).MaxLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture)
8664
},
8765
{
88-
"minLength", (o, n) =>
89-
{
90-
GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
91-
}
66+
"minLength",
67+
(o, n) => GetOrCreateSchema(o).MinLength = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture)
9268
},
9369
{
94-
"pattern", (o, n) =>
95-
{
96-
GetOrCreateSchema(o).Pattern = n.GetScalarValue();
97-
}
70+
"pattern",
71+
(o, n) => GetOrCreateSchema(o).Pattern = n.GetScalarValue()
9872
},
9973
{
100-
"maxItems", (o, n) =>
101-
{
102-
GetOrCreateSchema(o).MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
103-
}
74+
"maxItems",
75+
(o, n) => GetOrCreateSchema(o).MaxItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture)
10476
},
10577
{
106-
"minItems", (o, n) =>
107-
{
108-
GetOrCreateSchema(o).MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
109-
}
78+
"minItems",
79+
(o, n) => GetOrCreateSchema(o).MinItems = int.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture)
11080
},
11181
{
112-
"uniqueItems", (o, n) =>
113-
{
114-
GetOrCreateSchema(o).UniqueItems = bool.Parse(n.GetScalarValue());
115-
}
82+
"uniqueItems",
83+
(o, n) => GetOrCreateSchema(o).UniqueItems = bool.Parse(n.GetScalarValue())
11684
},
11785
{
118-
"multipleOf", (o, n) =>
119-
{
120-
GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
121-
}
86+
"multipleOf",
87+
(o, n) => GetOrCreateSchema(o).MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture)
12288
},
12389
{
124-
"enum", (o, n) =>
125-
{
126-
GetOrCreateSchema(o).Enum = n.CreateListOfAny();
127-
}
90+
"enum",
91+
(o, n) => GetOrCreateSchema(o).Enum = n.CreateListOfAny()
12892
}
12993
};
13094

‎src/Microsoft.OpenApi.Readers/V2/OpenApiInfoDeserializer.cs

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,28 @@ internal static partial class OpenApiV2Deserializer
1717
private static FixedFieldMap<OpenApiInfo> _infoFixedFields = new()
1818
{
1919
{
20-
"title", (o, n) =>
21-
{
22-
o.Title = n.GetScalarValue();
23-
}
20+
"title",
21+
(o, n) => o.Title = n.GetScalarValue()
2422
},
2523
{
26-
"description", (o, n) =>
27-
{
28-
o.Description = n.GetScalarValue();
29-
}
24+
"description",
25+
(o, n) => o.Description = n.GetScalarValue()
3026
},
3127
{
32-
"termsOfService", (o, n) =>
33-
{
34-
o.TermsOfService = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
35-
}
28+
"termsOfService",
29+
(o, n) => o.TermsOfService = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute)
3630
},
3731
{
38-
"contact", (o, n) =>
39-
{
40-
o.Contact = LoadContact(n);
41-
}
32+
"contact",
33+
(o, n) => o.Contact = LoadContact(n)
4234
},
4335
{
44-
"license", (o, n) =>
45-
{
46-
o.License = LoadLicense(n);
47-
}
36+
"license",
37+
(o, n) => o.License = LoadLicense(n)
4838
},
4939
{
50-
"version", (o, n) =>
51-
{
52-
o.Version = n.GetScalarValue();
53-
}
40+
"version",
41+
(o, n) => o.Version = n.GetScalarValue()
5442
}
5543
};
5644

‎src/Microsoft.OpenApi.Readers/V2/OpenApiLicenseDeserializer.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,12 @@ internal static partial class OpenApiV2Deserializer
1717
private static FixedFieldMap<OpenApiLicense> _licenseFixedFields = new()
1818
{
1919
{
20-
"name", (o, n) =>
21-
{
22-
o.Name = n.GetScalarValue();
23-
}
20+
"name",
21+
(o, n) => o.Name = n.GetScalarValue()
2422
},
2523
{
26-
"url", (o, n) =>
27-
{
28-
o.Url = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
29-
}
24+
"url",
25+
(o, n) => o.Url = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute)
3026
},
3127
};
3228

‎src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,24 @@ internal static partial class OpenApiV2Deserializer
2727
valueNode.GetScalarValue()))
2828
},
2929
{
30-
"summary", (o, n) =>
31-
{
32-
o.Summary = n.GetScalarValue();
33-
}
30+
"summary",
31+
(o, n) => o.Summary = n.GetScalarValue()
3432
},
3533
{
36-
"description", (o, n) =>
37-
{
38-
o.Description = n.GetScalarValue();
39-
}
34+
"description",
35+
(o, n) => o.Description = n.GetScalarValue()
4036
},
4137
{
42-
"externalDocs", (o, n) =>
43-
{
44-
o.ExternalDocs = LoadExternalDocs(n);
45-
}
38+
"externalDocs",
39+
(o, n) => o.ExternalDocs = LoadExternalDocs(n)
4640
},
4741
{
48-
"operationId", (o, n) =>
49-
{
50-
o.OperationId = n.GetScalarValue();
51-
}
42+
"operationId",
43+
(o, n) => o.OperationId = n.GetScalarValue()
5244
},
5345
{
54-
"parameters", (o, n) =>
55-
{
56-
o.Parameters = n.CreateList(LoadParameter);
57-
}
46+
"parameters",
47+
(o, n) => o.Parameters = n.CreateList(LoadParameter)
5848
},
5949
{
6050
"consumes", (o, n) => {
@@ -73,22 +63,16 @@ internal static partial class OpenApiV2Deserializer
7363
}
7464
},
7565
{
76-
"responses", (o, n) =>
77-
{
78-
o.Responses = LoadResponses(n);
79-
}
66+
"responses",
67+
(o, n) => o.Responses = LoadResponses(n)
8068
},
8169
{
82-
"deprecated", (o, n) =>
83-
{
84-
o.Deprecated = bool.Parse(n.GetScalarValue());
85-
}
70+
"deprecated",
71+
(o, n) => o.Deprecated = bool.Parse(n.GetScalarValue())
8672
},
8773
{
88-
"security", (o, n) =>
89-
{
90-
o.Security = n.CreateList(LoadSecurityRequirement);
91-
}
74+
"security",
75+
(o, n) => o.Security = n.CreateList(LoadSecurityRequirement)
9276
},
9377
};
9478

0 commit comments

Comments
 (0)