Skip to content

Commit efa9aad

Browse files
baywetbaywet
authored
Merge pull request #627 from microsoft/fix/port-586
fix/port 586
2 parents bbce0a8 + ebc0671 commit efa9aad

File tree

11 files changed

+416
-484
lines changed

11 files changed

+416
-484
lines changed

‎src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs‎

Lines changed: 304 additions & 276 deletions
Large diffs are not rendered by default.

‎test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmActionOperationHandlerTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void CreateOperationForEdmActionReturnsCorrectOperation()
4040
Assert.Equal("Details of the shared trip.", operation.Description);
4141
Assert.NotNull(operation.Tags);
4242
var tag = Assert.Single(operation.Tags);
43-
Assert.Equal("People.Actions", tag.Name);
43+
Assert.Equal("People.Person", tag.Name);
4444

4545
Assert.NotNull(operation.Parameters);
4646
Assert.Single(operation.Parameters);
@@ -79,7 +79,7 @@ public void CreateOperationForEdmActionReturnsCorrectOperationHierarchicalClass(
7979
Assert.Equal($"Invoke action {actionName}", operation.Summary);
8080
Assert.NotNull(operation.Tags);
8181
var tag = Assert.Single(operation.Tags);
82-
Assert.Equal($"{entitySetName}.Actions", tag.Name);
82+
Assert.Equal($"{entitySetName}.AccountApiModel", tag.Name);
8383

8484
Assert.NotNull(operation.Parameters);
8585
Assert.Single(operation.Parameters);

‎test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionOperationHandlerTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void CreateOperationForEdmFunctionReturnsCorrectOperation(bool useHTTPSta
100100
Assert.Equal("Invoke function GetFavoriteAirline", operation.Summary);
101101
Assert.NotNull(operation.Tags);
102102
var tag = Assert.Single(operation.Tags);
103-
Assert.Equal("People.Functions", tag.Name);
103+
Assert.Equal("People.Person", tag.Name);
104104

105105
Assert.NotNull(operation.Parameters);
106106
Assert.Single(operation.Parameters);
@@ -138,7 +138,7 @@ public void CreateOperationForEdmFunctionReturnsCorrectOperationHierarchicalClas
138138
Assert.Equal("Collection of contract attachments.", operation.Description);
139139
Assert.NotNull(operation.Tags);
140140
var tag = Assert.Single(operation.Tags);
141-
Assert.Equal($"{entitySetName}.Functions", tag.Name);
141+
Assert.Equal($"{entitySetName}.AccountApiModel", tag.Name);
142142

143143
Assert.NotNull(operation.Parameters);
144144
Assert.Equal(6, operation.Parameters.Count); // id, top, skip, count, search, filter

‎test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@
591591
"/Documents({Id})/Default.Upload": {
592592
"post": {
593593
"tags": [
594-
"Documents.Actions"
594+
"Documents.DocumentDto"
595595
],
596596
"summary": "Invoke action Upload",
597597
"operationId": "Documents.DocumentDto.Upload",
@@ -3519,7 +3519,7 @@
35193519
"/Tasks({Id})/Default.Upload": {
35203520
"post": {
35213521
"tags": [
3522-
"Tasks.Actions"
3522+
"Tasks.DocumentDto"
35233523
],
35243524
"summary": "Invoke action Upload",
35253525
"operationId": "Tasks.DocumentDto.Upload",
@@ -6274,10 +6274,6 @@
62746274
"name": "Documents.DocumentDto",
62756275
"x-ms-docs-toc-type": "page"
62766276
},
6277-
{
6278-
"name": "Documents.Actions",
6279-
"x-ms-docs-toc-type": "container"
6280-
},
62816277
{
62826278
"name": "Documents.RevisionDto",
62836279
"x-ms-docs-toc-type": "page"
@@ -6318,10 +6314,6 @@
63186314
"name": "Tasks.DocumentDto",
63196315
"x-ms-docs-toc-type": "page"
63206316
},
6321-
{
6322-
"name": "Tasks.Actions",
6323-
"x-ms-docs-toc-type": "container"
6324-
},
63256317
{
63266318
"name": "Tasks.RevisionDto",
63276319
"x-ms-docs-toc-type": "page"

‎test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ paths:
413413
'/Documents({Id})/Default.Upload':
414414
post:
415415
tags:
416-
- Documents.Actions
416+
- Documents.DocumentDto
417417
summary: Invoke action Upload
418418
operationId: Documents.DocumentDto.Upload
419419
parameters:
@@ -2495,7 +2495,7 @@ paths:
24952495
'/Tasks({Id})/Default.Upload':
24962496
post:
24972497
tags:
2498-
- Tasks.Actions
2498+
- Tasks.DocumentDto
24992499
summary: Invoke action Upload
25002500
operationId: Tasks.DocumentDto.Upload
25012501
parameters:
@@ -4544,8 +4544,6 @@ tags:
45444544
x-ms-docs-toc-type: page
45454545
- name: Documents.DocumentDto
45464546
x-ms-docs-toc-type: page
4547-
- name: Documents.Actions
4548-
x-ms-docs-toc-type: container
45494547
- name: Documents.RevisionDto
45504548
x-ms-docs-toc-type: page
45514549
- name: Documents.DocumentTagRelDto
@@ -4566,8 +4564,6 @@ tags:
45664564
x-ms-docs-toc-type: page
45674565
- name: Tasks.DocumentDto
45684566
x-ms-docs-toc-type: page
4569-
- name: Tasks.Actions
4570-
x-ms-docs-toc-type: container
45714567
- name: Tasks.RevisionDto
45724568
x-ms-docs-toc-type: page
45734569
- name: Tasks.DocumentTagRelDto

‎test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@
663663
"description": "Provides operations to call the Upload method.",
664664
"post": {
665665
"tags": [
666-
"Documents.Actions"
666+
"Documents.DocumentDto"
667667
],
668668
"summary": "Invoke action Upload",
669669
"operationId": "Documents.DocumentDto.Upload",
@@ -3940,7 +3940,7 @@
39403940
"description": "Provides operations to call the Upload method.",
39413941
"post": {
39423942
"tags": [
3943-
"Tasks.Actions"
3943+
"Tasks.DocumentDto"
39443944
],
39453945
"summary": "Invoke action Upload",
39463946
"operationId": "Tasks.DocumentDto.Upload",
@@ -7479,10 +7479,6 @@
74797479
"name": "Documents.DocumentDto",
74807480
"x-ms-docs-toc-type": "page"
74817481
},
7482-
{
7483-
"name": "Documents.Actions",
7484-
"x-ms-docs-toc-type": "container"
7485-
},
74867482
{
74877483
"name": "Documents.RevisionDto",
74887484
"x-ms-docs-toc-type": "page"
@@ -7523,10 +7519,6 @@
75237519
"name": "Tasks.DocumentDto",
75247520
"x-ms-docs-toc-type": "page"
75257521
},
7526-
{
7527-
"name": "Tasks.Actions",
7528-
"x-ms-docs-toc-type": "container"
7529-
},
75307522
{
75317523
"name": "Tasks.RevisionDto",
75327524
"x-ms-docs-toc-type": "page"

‎test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ paths:
460460
description: Provides operations to call the Upload method.
461461
post:
462462
tags:
463-
- Documents.Actions
463+
- Documents.DocumentDto
464464
summary: Invoke action Upload
465465
operationId: Documents.DocumentDto.Upload
466466
parameters:
@@ -2771,7 +2771,7 @@ paths:
27712771
description: Provides operations to call the Upload method.
27722772
post:
27732773
tags:
2774-
- Tasks.Actions
2774+
- Tasks.DocumentDto
27752775
summary: Invoke action Upload
27762776
operationId: Tasks.DocumentDto.Upload
27772777
parameters:
@@ -5382,8 +5382,6 @@ tags:
53825382
x-ms-docs-toc-type: page
53835383
- name: Documents.DocumentDto
53845384
x-ms-docs-toc-type: page
5385-
- name: Documents.Actions
5386-
x-ms-docs-toc-type: container
53875385
- name: Documents.RevisionDto
53885386
x-ms-docs-toc-type: page
53895387
- name: Documents.DocumentTagRelDto
@@ -5404,8 +5402,6 @@ tags:
54045402
x-ms-docs-toc-type: page
54055403
- name: Tasks.DocumentDto
54065404
x-ms-docs-toc-type: page
5407-
- name: Tasks.Actions
5408-
x-ms-docs-toc-type: container
54095405
- name: Tasks.RevisionDto
54105406
x-ms-docs-toc-type: page
54115407
- name: Tasks.DocumentTagRelDto

0 commit comments

Comments
 (0)