Skip to content

Commit 91a905d

Browse files
committed
Fix review comments
1 parent 4a66112 commit 91a905d

12 files changed

+20
-20
lines changed

src/Microsoft.OpenApi/Services/OpenApiComparer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public static IEnumerable<OpenApiDifference> Compare(OpenApiDocument source, Ope
2626
throw Error.ArgumentNull(nameof(target));
2727
}
2828

29-
var comparisionContext = new ComparisonContext(new OpenApiComparerFactory(), source, target);
29+
var comparisonContext = new ComparisonContext(new OpenApiComparerFactory(), source, target);
3030

31-
new OpenApiDocumentComparer().Compare(source, target, comparisionContext);
31+
new OpenApiDocumentComparer().Compare(source, target, comparisonContext);
3232

33-
return comparisionContext.OpenApiDifferences;
33+
return comparisonContext.OpenApiDifferences;
3434
}
3535
}
3636
}

src/Microsoft.OpenApi/Services/OpenApiComparerBase.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ internal void Compare(decimal? source, decimal? target, ComparisonContext compar
104104
/// <param name="source">The source.</param>
105105
/// <param name="target">The target.</param>
106106
/// <param name="comparisonContext">The context under which to compare the objects.</param>
107-
internal void Compare<TE>(Enum source, Enum target, ComparisonContext comparisonContext)
107+
internal void Compare<TEnum>(Enum source, Enum target, ComparisonContext comparisonContext)
108108
{
109109
if (source == null && target == null)
110110
{
@@ -116,7 +116,7 @@ internal void Compare<TE>(Enum source, Enum target, ComparisonContext comparison
116116
comparisonContext.AddOpenApiDifference(new OpenApiDifference
117117
{
118118
OpenApiDifferenceOperation = OpenApiDifferenceOperation.Update,
119-
OpenApiComparedElementType = typeof(TE),
119+
OpenApiComparedElementType = typeof(TEnum),
120120
SourceValue = source,
121121
TargetValue = target,
122122
Pointer = comparisonContext.PathString
@@ -130,7 +130,7 @@ internal void Compare<TE>(Enum source, Enum target, ComparisonContext comparison
130130
comparisonContext.AddOpenApiDifference(new OpenApiDifference
131131
{
132132
OpenApiDifferenceOperation = OpenApiDifferenceOperation.Update,
133-
OpenApiComparedElementType = typeof(T),
133+
OpenApiComparedElementType = typeof(TEnum),
134134
SourceValue = source,
135135
TargetValue = target,
136136
Pointer = comparisonContext.PathString
@@ -149,7 +149,7 @@ internal void WalkAndAddOpenApiDifference(
149149
string segment,
150150
OpenApiDifference openApiDifference)
151151
{
152-
comparisonContext.Enter(segment.Replace("/", "~1"));
152+
comparisonContext.Enter(segment.Replace("/", "~1").Replace("~", "~0"));
153153
openApiDifference.Pointer = comparisonContext.PathString;
154154
comparisonContext.AddOpenApiDifference(openApiDifference);
155155
comparisonContext.Exit();
@@ -166,7 +166,7 @@ protected virtual void WalkAndCompare(
166166
string segment,
167167
Action compare)
168168
{
169-
comparisonContext.Enter(segment.Replace("/", "~1"));
169+
comparisonContext.Enter(segment.Replace("/", "~1").Replace("~", "~0"));
170170
compare();
171171
comparisonContext.Exit();
172172
}

src/Microsoft.OpenApi/Services/OpenApiEncodingComparer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public override void Compare(
5151
WalkAndCompare(comparisonContext, OpenApiConstants.AllowReserved,
5252
() => Compare(sourceEncoding.AllowReserved, targetEncoding.AllowReserved, comparisonContext));
5353

54-
5554
WalkAndCompare(comparisonContext, OpenApiConstants.Style,
5655
() => Compare<ParameterStyle>(sourceEncoding.Style, targetEncoding.Style, comparisonContext));
5756

src/Microsoft.OpenApi/Services/OpenApiHeaderComparer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override void Compare(
4848
{
4949
WalkAndAddOpenApiDifference(
5050
comparisonContext,
51-
"$ref",
51+
OpenApiConstants.DollarRef,
5252
new OpenApiDifference
5353
{
5454
OpenApiDifferenceOperation = OpenApiDifferenceOperation.Update,
@@ -63,7 +63,7 @@ public override void Compare(
6363
if (sourceHeader.Reference != null)
6464
{
6565
sourceHeader = (OpenApiHeader) comparisonContext.SourceDocument.ResolveReference(
66-
targetHeader.Reference);
66+
sourceHeader.Reference);
6767
}
6868

6969
if (targetHeader.Reference != null)

src/Microsoft.OpenApi/Services/OpenApiMediaTypeComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override void Compare(
4848

4949
WalkAndCompare(
5050
comparisonContext,
51-
OpenApiConstants.Content,
51+
OpenApiConstants.Encoding,
5252
() => comparisonContext
5353
.GetComparer<IDictionary<string, OpenApiEncoding>>()
5454
.Compare(sourceMediaType.Encoding, sourceMediaType.Encoding, comparisonContext));

src/Microsoft.OpenApi/Services/OpenApiOperationComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public override void Compare(
6464

6565
WalkAndCompare(
6666
comparisonContext,
67-
OpenApiConstants.Components,
67+
OpenApiConstants.Servers,
6868
() => comparisonContext
6969
.GetComparer<IList<OpenApiServer>>()
7070
.Compare(sourceOperation?.Servers, targetOperation?.Servers, comparisonContext));

src/Microsoft.OpenApi/Services/OpenApiParameterComparer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public override void Compare(
5454
.GetComparer<IDictionary<string, OpenApiMediaType>>()
5555
.Compare(sourceParameter.Content, targetParameter.Content, comparisonContext));
5656

57+
// To Do Add compare for reference object
5758
// To Do Compare Examples
5859
// To Do Compare parameter as IOpenApiExtensible
5960
}

src/Microsoft.OpenApi/Services/OpenApiParametersComparer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public override void Compare(
4343
{
4444
WalkAndAddOpenApiDifference(
4545
comparisonContext,
46-
i.ToString(),
46+
targetParameters.IndexOf(newParametersInTarget[i]).ToString(),
4747
new OpenApiDifference
4848
{
4949
OpenApiDifferenceOperation = OpenApiDifferenceOperation.Add,
@@ -60,7 +60,7 @@ public override void Compare(
6060
{
6161
WalkAndAddOpenApiDifference(
6262
comparisonContext,
63-
i.ToString(),
63+
sourceParameters.IndexOf(removedParameters[i]).ToString(),
6464
new OpenApiDifference
6565
{
6666
OpenApiDifferenceOperation = OpenApiDifferenceOperation.Remove,

src/Microsoft.OpenApi/Services/OpenApiPathItemComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public override void Compare(
4949

5050
WalkAndCompare(
5151
comparisonContext,
52-
OpenApiConstants.Parameters,
52+
OpenApiConstants.Servers,
5353
() => comparisonContext
5454
.GetComparer<IList<OpenApiServer>>()
5555
.Compare(sourcePathItem?.Servers, targetPathItem?.Servers, comparisonContext));

src/Microsoft.OpenApi/Services/OpenApiRequestBodyComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override void Compare(
4848
{
4949
WalkAndAddOpenApiDifference(
5050
comparisonContext,
51-
"$ref",
51+
OpenApiConstants.DollarRef,
5252
new OpenApiDifference
5353
{
5454
OpenApiDifferenceOperation = OpenApiDifferenceOperation.Update,

0 commit comments

Comments
 (0)