maxmustermann/OpenAPI.NET.OData
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change the OperationId for function/functionImport

Browse source
This commit is contained in:
Sam Xu 2019-10-10 11:35:39 -07:00
parent fe608056a4
commit 6377ee0d47
18 changed files with 2622 additions and 2498 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.ps1
View file

@ -51,8 +51,8 @@ $SNx64 = $PROGRAMFILESX86 + "\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools
$FXCOP = $FXCOPDIR + "\FxCopCmd.exe"
$BUILDLOG = $LOGDIR + "\msbuild.log"
$TESTLOG = $LOGDIR + "\mstest.log"
$TESTDIR = $ENLISTMENT_ROOT + "\bin\$Configuration\Test\net46"
$PRODUCTDIR = $ENLISTMENT_ROOT + "\bin\$Configuration\net46"
$TESTDIR = $ENLISTMENT_ROOT + "\bin\$Configuration\Test\net461"
$PRODUCTDIR = $ENLISTMENT_ROOT + "\bin\$Configuration\net461"
$NUGETEXE = $PROGRAMFILESX86 + "\Microsoft Visual Studio\2017\Enterprise\MSBuild\ReadyRoll\OctoPack\build\NuGet.exe"
$NUGETPACK = $ENLISTMENT_ROOT + "\packages"

28
docs/oas3_0_0/TripService.json
View file

@ -589,7 +589,7 @@
"Airports"
],
"summary": "Invoke functionImport GetNearestAirport",
"operationId": "OperationImport.GetNearestAirport.fc9c4516cf76a7e9b89d87b1",
"operationId": "OperationImport-GetNearestAirport",
"parameters": [
{
"name": "lat",
@ -667,7 +667,7 @@
"People"
],
"summary": "Invoke functionImport GetPersonWithMostFriends",
"operationId": "OperationImport.GetPersonWithMostFriends.14b2097dbee53f4fb8fb308d",
"operationId": "OperationImport-GetPersonWithMostFriends",
"responses": {
"200": {
"description": "Success",
@ -1095,7 +1095,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "Me.GetFavoriteAirline.cf64",
"operationId": "Me.GetFavoriteAirline",
"responses": {
"200": {
"description": "Success",
@ -1125,7 +1125,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "Me.GetFriendsTrips.16f3",
"operationId": "Me.GetFriendsTrips",
"parameters": [
{
"name": "userName",
@ -1208,7 +1208,7 @@
"Me.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "Me.UpdatePersonLastName.01a4",
"operationId": "Me.UpdatePersonLastName",
"parameters": [
{
"name": "lastName",
@ -1448,7 +1448,7 @@
"Me.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "Me.Trips.GetInvolvedPeople.0bed",
"operationId": "Me.Trips.GetInvolvedPeople",
"parameters": [
{
"name": "TripId",
@ -2172,7 +2172,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "NewComePeople.GetFavoriteAirline.cf64",
"operationId": "NewComePeople.GetFavoriteAirline",
"parameters": [
{
"name": "UserName",
@ -2214,7 +2214,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "NewComePeople.GetFriendsTrips.16f3",
"operationId": "NewComePeople.GetFriendsTrips",
"parameters": [
{
"name": "UserName",
@ -2319,7 +2319,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "NewComePeople.UpdatePersonLastName.01a4",
"operationId": "NewComePeople.UpdatePersonLastName",
"parameters": [
{
"name": "UserName",
@ -2589,7 +2589,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "NewComePeople.Trips.GetInvolvedPeople.0bed",
"operationId": "NewComePeople.Trips.GetInvolvedPeople",
"parameters": [
{
"name": "UserName",
@ -3323,7 +3323,7 @@
"People.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "People.GetFavoriteAirline.cf64",
"operationId": "People.GetFavoriteAirline",
"parameters": [
{
"name": "UserName",
@ -3365,7 +3365,7 @@
"People.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "People.GetFriendsTrips.16f3",
"operationId": "People.GetFriendsTrips",
"parameters": [
{
"name": "UserName",
@ -3470,7 +3470,7 @@
"People.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "People.UpdatePersonLastName.01a4",
"operationId": "People.UpdatePersonLastName",
"parameters": [
{
"name": "UserName",
@ -3740,7 +3740,7 @@
"People.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "People.Trips.GetInvolvedPeople.0bed",
"operationId": "People.Trips.GetInvolvedPeople",
"parameters": [
{
"name": "UserName",

876
docs/oas3_0_0/graph.beta.json
View file

File diff suppressed because it is too large Load diff

764
docs/oas3_0_0/graph1.0.json
View file

File diff suppressed because it is too large Load diff

764
docs/oas3_0_0/graph1.0_updated.json
View file

File diff suppressed because it is too large Load diff

28
docs/oas_2_0/TripService.json
View file

@ -534,7 +534,7 @@
"Airports"
],
"summary": "Invoke functionImport GetNearestAirport",
"operationId": "OperationImport.GetNearestAirport.fc9c4516cf76a7e9b89d87b1",
"operationId": "OperationImport-GetNearestAirport",
"produces": [
"application/json"
],
@ -570,7 +570,7 @@
"People"
],
"summary": "Invoke functionImport GetPersonWithMostFriends",
"operationId": "OperationImport.GetPersonWithMostFriends.14b2097dbee53f4fb8fb308d",
"operationId": "OperationImport-GetPersonWithMostFriends",
"produces": [
"application/json"
],
@ -951,7 +951,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "Me.GetFavoriteAirline.cf64",
"operationId": "Me.GetFavoriteAirline",
"produces": [
"application/json"
],
@ -973,7 +973,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "Me.GetFriendsTrips.16f3",
"operationId": "Me.GetFriendsTrips",
"produces": [
"application/json"
],
@ -1049,7 +1049,7 @@
"Me.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "Me.UpdatePersonLastName.01a4",
"operationId": "Me.UpdatePersonLastName",
"produces": [
"application/json"
],
@ -1262,7 +1262,7 @@
"Me.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "Me.Trips.GetInvolvedPeople.0bed",
"operationId": "Me.Trips.GetInvolvedPeople",
"produces": [
"application/json"
],
@ -1890,7 +1890,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "NewComePeople.GetFavoriteAirline.cf64",
"operationId": "NewComePeople.GetFavoriteAirline",
"produces": [
"application/json"
],
@ -1922,7 +1922,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "NewComePeople.GetFriendsTrips.16f3",
"operationId": "NewComePeople.GetFriendsTrips",
"produces": [
"application/json"
],
@ -2014,7 +2014,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "NewComePeople.UpdatePersonLastName.01a4",
"operationId": "NewComePeople.UpdatePersonLastName",
"produces": [
"application/json"
],
@ -2251,7 +2251,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "NewComePeople.Trips.GetInvolvedPeople.0bed",
"operationId": "NewComePeople.Trips.GetInvolvedPeople",
"produces": [
"application/json"
],
@ -2887,7 +2887,7 @@
"People.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "People.GetFavoriteAirline.cf64",
"operationId": "People.GetFavoriteAirline",
"produces": [
"application/json"
],
@ -2919,7 +2919,7 @@
"People.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "People.GetFriendsTrips.16f3",
"operationId": "People.GetFriendsTrips",
"produces": [
"application/json"
],
@ -3011,7 +3011,7 @@
"People.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "People.UpdatePersonLastName.01a4",
"operationId": "People.UpdatePersonLastName",
"produces": [
"application/json"
],
@ -3248,7 +3248,7 @@
"People.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "People.Trips.GetInvolvedPeople.0bed",
"operationId": "People.Trips.GetInvolvedPeople",
"produces": [
"application/json"
],

876
docs/oas_2_0/graph.beta.json
View file

File diff suppressed because it is too large Load diff

764
docs/oas_2_0/graph1.0.json
View file

File diff suppressed because it is too large Load diff

764
docs/oas_2_0/graph1.0_updated.json
View file

File diff suppressed because it is too large Load diff

8
src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
View file

@ -178,7 +178,13 @@ namespace Microsoft.OpenApi.OData.Edm
).Count() > 1;
}
public static bool IsOperationOverload(this IEdmModel model, IEdmOperationImport operationImport)
/// <summary>
/// Check whether the operaiton import is overload in the model.
/// </summary>
/// <param name="model">The Edm model.</param>
/// <param name="operation">The test operations.</param>
/// <returns>True/false.</returns>
public static bool IsOperationImportOverload(this IEdmModel model, IEdmOperationImport operationImport)
{
Utils.CheckArgumentNull(model, nameof(model));
Utils.CheckArgumentNull(operationImport, nameof(operationImport));

11
src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
View file

@ -50,8 +50,15 @@ namespace Microsoft.OpenApi.OData.Operation
{
ODataOperationImportSegment operationImportSegment = Path.LastSegment as ODataOperationImportSegment;
string pathItemName = operationImportSegment.GetPathItemName(Context.Settings, new HashSet<string>());
string hash = pathItemName.GetHashSHA256();
operation.OperationId = "OperationImport." + EdmOperationImport.Name + "." + hash.Substring(8, 24);
if (Context.Model.IsOperationImportOverload(EdmOperationImport))
{
string hash = pathItemName.GetHashSHA256();
operation.OperationId = "OperationImport-" + EdmOperationImport.Name + "-" + hash.Substring(0, 4);
}
else
{
operation.OperationId = "OperationImport-" + EdmOperationImport.Name;
}
}
}

12
src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs
View file

@ -70,8 +70,16 @@ namespace Microsoft.OpenApi.OData.Operation
{
ODataOperationSegment operationSegment = Path.LastSegment as ODataOperationSegment;
string pathItemName = operationSegment.GetPathItemName(Context.Settings, new HashSet<string>());
string hash = pathItemName.GetHashSHA256();
operation.OperationId = operationId + "." + hash.Substring(0, 4);
if (Context.Model.IsOperationOverload(operationSegment.Operation))
{
string hash = pathItemName.GetHashSHA256();
operation.OperationId = operationId + "-" + hash.Substring(0, 4);
}
else
{
operation.OperationId = operationId;
}
}
}

54
test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionImportOperationHandlerTests.cs
View file

@ -63,6 +63,7 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
model.AddElement(function);
EdmEntityContainer container = new EdmEntityContainer("NS", "Default");
EdmFunctionImport functionImport = new EdmFunctionImport(container, "MyFunction", function);
container.AddElement(functionImport);
model.AddElement(container);
OpenApiConvertSettings settings = new OpenApiConvertSettings
@ -81,7 +82,58 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
if (enableOperationId)
{
Assert.Equal("OperationImport.MyFunction.790300f48b60d73292a9c056", operation.OperationId);
Assert.Equal("OperationImport-MyFunction", operation.OperationId);
}
else
{
Assert.Null(operation.OperationId);
}
}
[Theory]
[InlineData(true)]
[InlineData(false)]
public void CreateOperationIdWithSHA5ForOverloadEdmFunctionImport(bool enableOperationId)
{
// Arrange
EdmModel model = new EdmModel();
EdmEntityType customer = new EdmEntityType("NS", "Customer");
customer.AddKeys(customer.AddStructuralProperty("ID", EdmPrimitiveTypeKind.Int32));
model.AddElement(customer);
EdmFunction function1 = new EdmFunction("NS", "MyFunction1", EdmCoreModel.Instance.GetString(false), false, null, false);
function1.AddParameter("entity", new EdmEntityTypeReference(customer, false));
function1.AddParameter("param", EdmCoreModel.Instance.GetString(false));
model.AddElement(function1);
EdmFunction function2 = new EdmFunction("NS", "MyFunction1", EdmCoreModel.Instance.GetString(false), false, null, false);
function2.AddParameter("entity", new EdmEntityTypeReference(customer, false));
function2.AddParameter("param", EdmCoreModel.Instance.GetString(false));
function2.AddParameter("otherParam", EdmCoreModel.Instance.GetString(false));
model.AddElement(function2);
EdmEntityContainer container = new EdmEntityContainer("NS", "Default");
EdmFunctionImport functionImport1 = new EdmFunctionImport(container, "MyFunction", function1);
EdmFunctionImport functionImport2 = new EdmFunctionImport(container, "MyFunction", function2);
container.AddElement(functionImport1);
container.AddElement(functionImport2);
model.AddElement(container);
OpenApiConvertSettings settings = new OpenApiConvertSettings
{
EnableOperationId = enableOperationId
};
ODataContext context = new ODataContext(model, settings);
ODataPath path = new ODataPath(new ODataOperationImportSegment(functionImport1));
// Act
var operation = _operationHandler.CreateOperation(context, path);
// Assert
Assert.NotNull(operation);
if (enableOperationId)
{
Assert.Equal("OperationImport-MyFunction-3e3f", operation.OperationId);
}
else
{

55
test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EdmFunctionOperationHandlerTests.cs
View file

@ -88,7 +88,7 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
if (enableOperationId)
{
Assert.Equal("Customers.MyFunction.373f", operation.OperationId);
Assert.Equal("Customers.MyFunction", operation.OperationId);
}
else
{
@ -135,7 +135,58 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
if (enableOperationId)
{
Assert.Equal("Customers.NS.VipCustomer.MyFunction.373f", operation.OperationId);
Assert.Equal("Customers.NS.VipCustomer.MyFunction", operation.OperationId);
}
else
{
Assert.Null(operation.OperationId);
}
}
[Theory]
[InlineData(true)]
[InlineData(false)]
public void CreateOperationForOverloadEdmFunctionReturnsCorrectOperationId(bool enableOperationId)
{
// Arrange
EdmModel model = new EdmModel();
EdmEntityType customer = new EdmEntityType("NS", "Customer");
customer.AddKeys(customer.AddStructuralProperty("ID", EdmPrimitiveTypeKind.Int32));
model.AddElement(customer);
EdmFunction function = new EdmFunction("NS", "MyFunction", EdmCoreModel.Instance.GetString(false), true, null, false);
function.AddParameter("entity", new EdmEntityTypeReference(customer, false));
function.AddParameter("param", EdmCoreModel.Instance.GetString(false));
model.AddElement(function);
function = new EdmFunction("NS", "MyFunction", EdmCoreModel.Instance.GetString(false), true, null, false);
function.AddParameter("entity", new EdmEntityTypeReference(customer, false));
function.AddParameter("param", EdmCoreModel.Instance.GetString(false));
function.AddParameter("param2", EdmCoreModel.Instance.GetString(false));
model.AddElement(function);
EdmEntityContainer container = new EdmEntityContainer("NS", "Default");
EdmEntitySet customers = new EdmEntitySet(container, "Customers", customer);
model.AddElement(container);
OpenApiConvertSettings settings = new OpenApiConvertSettings
{
EnableOperationId = enableOperationId
};
ODataContext context = new ODataContext(model, settings);
ODataPath path = new ODataPath(new ODataNavigationSourceSegment(customers),
new ODataKeySegment(customer),
new ODataOperationSegment(function));
// Act
var operation = _operationHandler.CreateOperation(context, path);
// Assert
Assert.NotNull(operation);
if (enableOperationId)
{
Assert.Equal("Customers.MyFunction-28ae", operation.OperationId);
}
else
{

28
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.json
View file

@ -535,7 +535,7 @@
"Airports"
],
"summary": "Invoke functionImport GetNearestAirport",
"operationId": "OperationImport.GetNearestAirport.fc9c4516cf76a7e9b89d87b1",
"operationId": "OperationImport-GetNearestAirport",
"produces": [
"application/json"
],
@ -573,7 +573,7 @@
"People"
],
"summary": "Invoke functionImport GetPersonWithMostFriends",
"operationId": "OperationImport.GetPersonWithMostFriends.14b2097dbee53f4fb8fb308d",
"operationId": "OperationImport-GetPersonWithMostFriends",
"produces": [
"application/json"
],
@ -956,7 +956,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "Me.GetFavoriteAirline.56eb",
"operationId": "Me.GetFavoriteAirline",
"produces": [
"application/json"
],
@ -980,7 +980,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "Me.GetFriendsTrips.679d",
"operationId": "Me.GetFriendsTrips",
"produces": [
"application/json"
],
@ -1110,7 +1110,7 @@
"Me.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "Me.UpdatePersonLastName.290b",
"operationId": "Me.UpdatePersonLastName",
"produces": [
"application/json"
],
@ -1323,7 +1323,7 @@
"Me.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "Me.Trips.GetInvolvedPeople.5b52",
"operationId": "Me.Trips.GetInvolvedPeople",
"produces": [
"application/json"
],
@ -1953,7 +1953,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "NewComePeople.GetFavoriteAirline.56eb",
"operationId": "NewComePeople.GetFavoriteAirline",
"produces": [
"application/json"
],
@ -1987,7 +1987,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "NewComePeople.GetFriendsTrips.679d",
"operationId": "NewComePeople.GetFriendsTrips",
"produces": [
"application/json"
],
@ -2141,7 +2141,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "NewComePeople.UpdatePersonLastName.290b",
"operationId": "NewComePeople.UpdatePersonLastName",
"produces": [
"application/json"
],
@ -2378,7 +2378,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "NewComePeople.Trips.GetInvolvedPeople.5b52",
"operationId": "NewComePeople.Trips.GetInvolvedPeople",
"produces": [
"application/json"
],
@ -3016,7 +3016,7 @@
"People.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "People.GetFavoriteAirline.56eb",
"operationId": "People.GetFavoriteAirline",
"produces": [
"application/json"
],
@ -3050,7 +3050,7 @@
"People.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "People.GetFriendsTrips.679d",
"operationId": "People.GetFriendsTrips",
"produces": [
"application/json"
],
@ -3204,7 +3204,7 @@
"People.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "People.UpdatePersonLastName.290b",
"operationId": "People.UpdatePersonLastName",
"produces": [
"application/json"
],
@ -3441,7 +3441,7 @@
"People.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "People.Trips.GetInvolvedPeople.5b52",
"operationId": "People.Trips.GetInvolvedPeople",
"produces": [
"application/json"
],

28
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V2.yaml
View file

@ -357,7 +357,7 @@ paths:
tags:
- Airports
summary: Invoke functionImport GetNearestAirport
operationId: OperationImport.GetNearestAirport.fc9c4516cf76a7e9b89d87b1
operationId: OperationImport-GetNearestAirport
produces:
- application/json
parameters:
@ -382,7 +382,7 @@ paths:
tags:
- People
summary: Invoke functionImport GetPersonWithMostFriends
operationId: OperationImport.GetPersonWithMostFriends.14b2097dbee53f4fb8fb308d
operationId: OperationImport-GetPersonWithMostFriends
produces:
- application/json
responses:
@ -660,7 +660,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function GetFavoriteAirline
operationId: Me.GetFavoriteAirline.56eb
operationId: Me.GetFavoriteAirline
produces:
- application/json
responses:
@ -676,7 +676,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function GetFriendsTrips
operationId: Me.GetFriendsTrips.679d
operationId: Me.GetFriendsTrips
produces:
- application/json
parameters:
@ -763,7 +763,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function UpdatePersonLastName
operationId: Me.UpdatePersonLastName.290b
operationId: Me.UpdatePersonLastName
produces:
- application/json
parameters:
@ -912,7 +912,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function GetInvolvedPeople
operationId: Me.Trips.GetInvolvedPeople.5b52
operationId: Me.Trips.GetInvolvedPeople
produces:
- application/json
parameters:
@ -1367,7 +1367,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function GetFavoriteAirline
operationId: NewComePeople.GetFavoriteAirline.56eb
operationId: NewComePeople.GetFavoriteAirline
produces:
- application/json
parameters:
@ -1390,7 +1390,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function GetFriendsTrips
operationId: NewComePeople.GetFriendsTrips.679d
operationId: NewComePeople.GetFriendsTrips
produces:
- application/json
parameters:
@ -1495,7 +1495,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function UpdatePersonLastName
operationId: NewComePeople.UpdatePersonLastName.290b
operationId: NewComePeople.UpdatePersonLastName
produces:
- application/json
parameters:
@ -1662,7 +1662,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function GetInvolvedPeople
operationId: NewComePeople.Trips.GetInvolvedPeople.5b52
operationId: NewComePeople.Trips.GetInvolvedPeople
produces:
- application/json
parameters:
@ -2123,7 +2123,7 @@ paths:
tags:
- People.Functions
summary: Invoke function GetFavoriteAirline
operationId: People.GetFavoriteAirline.56eb
operationId: People.GetFavoriteAirline
produces:
- application/json
parameters:
@ -2146,7 +2146,7 @@ paths:
tags:
- People.Functions
summary: Invoke function GetFriendsTrips
operationId: People.GetFriendsTrips.679d
operationId: People.GetFriendsTrips
produces:
- application/json
parameters:
@ -2251,7 +2251,7 @@ paths:
tags:
- People.Functions
summary: Invoke function UpdatePersonLastName
operationId: People.UpdatePersonLastName.290b
operationId: People.UpdatePersonLastName
produces:
- application/json
parameters:
@ -2418,7 +2418,7 @@ paths:
tags:
- People.Functions
summary: Invoke function GetInvolvedPeople
operationId: People.Trips.GetInvolvedPeople.5b52
operationId: People.Trips.GetInvolvedPeople
produces:
- application/json
parameters:

28
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.json
View file

@ -589,7 +589,7 @@
"Airports"
],
"summary": "Invoke functionImport GetNearestAirport",
"operationId": "OperationImport.GetNearestAirport.fc9c4516cf76a7e9b89d87b1",
"operationId": "OperationImport-GetNearestAirport",
"parameters": [
{
"name": "lat",
@ -667,7 +667,7 @@
"People"
],
"summary": "Invoke functionImport GetPersonWithMostFriends",
"operationId": "OperationImport.GetPersonWithMostFriends.14b2097dbee53f4fb8fb308d",
"operationId": "OperationImport-GetPersonWithMostFriends",
"responses": {
"200": {
"description": "Success",
@ -1095,7 +1095,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "Me.GetFavoriteAirline.56eb",
"operationId": "Me.GetFavoriteAirline",
"responses": {
"200": {
"description": "Success",
@ -1125,7 +1125,7 @@
"Me.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "Me.GetFriendsTrips.679d",
"operationId": "Me.GetFriendsTrips",
"parameters": [
{
"name": "userName",
@ -1263,7 +1263,7 @@
"Me.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "Me.UpdatePersonLastName.290b",
"operationId": "Me.UpdatePersonLastName",
"parameters": [
{
"name": "lastName",
@ -1503,7 +1503,7 @@
"Me.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "Me.Trips.GetInvolvedPeople.5b52",
"operationId": "Me.Trips.GetInvolvedPeople",
"parameters": [
{
"name": "TripId",
@ -2227,7 +2227,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "NewComePeople.GetFavoriteAirline.56eb",
"operationId": "NewComePeople.GetFavoriteAirline",
"parameters": [
{
"name": "UserName",
@ -2269,7 +2269,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "NewComePeople.GetFriendsTrips.679d",
"operationId": "NewComePeople.GetFriendsTrips",
"parameters": [
{
"name": "UserName",
@ -2441,7 +2441,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "NewComePeople.UpdatePersonLastName.290b",
"operationId": "NewComePeople.UpdatePersonLastName",
"parameters": [
{
"name": "UserName",
@ -2711,7 +2711,7 @@
"NewComePeople.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "NewComePeople.Trips.GetInvolvedPeople.5b52",
"operationId": "NewComePeople.Trips.GetInvolvedPeople",
"parameters": [
{
"name": "UserName",
@ -3445,7 +3445,7 @@
"People.Functions"
],
"summary": "Invoke function GetFavoriteAirline",
"operationId": "People.GetFavoriteAirline.56eb",
"operationId": "People.GetFavoriteAirline",
"parameters": [
{
"name": "UserName",
@ -3487,7 +3487,7 @@
"People.Functions"
],
"summary": "Invoke function GetFriendsTrips",
"operationId": "People.GetFriendsTrips.679d",
"operationId": "People.GetFriendsTrips",
"parameters": [
{
"name": "UserName",
@ -3659,7 +3659,7 @@
"People.Functions"
],
"summary": "Invoke function UpdatePersonLastName",
"operationId": "People.UpdatePersonLastName.290b",
"operationId": "People.UpdatePersonLastName",
"parameters": [
{
"name": "UserName",
@ -3929,7 +3929,7 @@
"People.Functions"
],
"summary": "Invoke function GetInvolvedPeople",
"operationId": "People.Trips.GetInvolvedPeople.5b52",
"operationId": "People.Trips.GetInvolvedPeople",
"parameters": [
{
"name": "UserName",

28
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.yaml
View file

@ -387,7 +387,7 @@ paths:
tags:
- Airports
summary: Invoke functionImport GetNearestAirport
operationId: OperationImport.GetNearestAirport.fc9c4516cf76a7e9b89d87b1
operationId: OperationImport-GetNearestAirport
parameters:
- name: lat
in: path
@ -430,7 +430,7 @@ paths:
tags:
- People
summary: Invoke functionImport GetPersonWithMostFriends
operationId: OperationImport.GetPersonWithMostFriends.14b2097dbee53f4fb8fb308d
operationId: OperationImport-GetPersonWithMostFriends
responses:
'200':
description: Success
@ -736,7 +736,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function GetFavoriteAirline
operationId: Me.GetFavoriteAirline.56eb
operationId: Me.GetFavoriteAirline
responses:
'200':
description: Success
@ -754,7 +754,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function GetFriendsTrips
operationId: Me.GetFriendsTrips.679d
operationId: Me.GetFriendsTrips
parameters:
- name: userName
in: path
@ -842,7 +842,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function UpdatePersonLastName
operationId: Me.UpdatePersonLastName.290b
operationId: Me.UpdatePersonLastName
parameters:
- name: lastName
in: path
@ -1008,7 +1008,7 @@ paths:
tags:
- Me.Functions
summary: Invoke function GetInvolvedPeople
operationId: Me.Trips.GetInvolvedPeople.5b52
operationId: Me.Trips.GetInvolvedPeople
parameters:
- name: TripId
in: path
@ -1520,7 +1520,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function GetFavoriteAirline
operationId: NewComePeople.GetFavoriteAirline.56eb
operationId: NewComePeople.GetFavoriteAirline
parameters:
- name: UserName
in: path
@ -1546,7 +1546,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function GetFriendsTrips
operationId: NewComePeople.GetFriendsTrips.679d
operationId: NewComePeople.GetFriendsTrips
parameters:
- name: UserName
in: path
@ -1657,7 +1657,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function UpdatePersonLastName
operationId: NewComePeople.UpdatePersonLastName.290b
operationId: NewComePeople.UpdatePersonLastName
parameters:
- name: UserName
in: path
@ -1844,7 +1844,7 @@ paths:
tags:
- NewComePeople.Functions
summary: Invoke function GetInvolvedPeople
operationId: NewComePeople.Trips.GetInvolvedPeople.5b52
operationId: NewComePeople.Trips.GetInvolvedPeople
parameters:
- name: UserName
in: path
@ -2363,7 +2363,7 @@ paths:
tags:
- People.Functions
summary: Invoke function GetFavoriteAirline
operationId: People.GetFavoriteAirline.56eb
operationId: People.GetFavoriteAirline
parameters:
- name: UserName
in: path
@ -2389,7 +2389,7 @@ paths:
tags:
- People.Functions
summary: Invoke function GetFriendsTrips
operationId: People.GetFriendsTrips.679d
operationId: People.GetFriendsTrips
parameters:
- name: UserName
in: path
@ -2500,7 +2500,7 @@ paths:
tags:
- People.Functions
summary: Invoke function UpdatePersonLastName
operationId: People.UpdatePersonLastName.290b
operationId: People.UpdatePersonLastName
parameters:
- name: UserName
in: path
@ -2687,7 +2687,7 @@ paths:
tags:
- People.Functions
summary: Invoke function GetInvolvedPeople
operationId: People.Trips.GetInvolvedPeople.5b52
operationId: People.Trips.GetInvolvedPeople
parameters:
- name: UserName
in: path