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

Update to Open API library on Nuget.org and resolve the conflicts

Browse source
This commit is contained in:
Sam Xu 2017-12-20 11:44:43 -08:00
parent 54a585aac9
commit 7588eb08de
18 changed files with 61 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
View file

@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.OData.Edm" Version="7.3.1" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta008" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta009" />
</ItemGroup>
<ItemGroup>

4
src/OoasGui/MainForm.cs
View file

@ -25,7 +25,7 @@ namespace OoasGui
{
private OpenApiFormat Format { get; set; } = OpenApiFormat.Json;
private OpenApiSpecVersion Version { get; set; } = OpenApiSpecVersion.OpenApi3_0_0;
private OpenApiSpecVersion Version { get; set; } = OpenApiSpecVersion.OpenApi3_0;
private OpenApiConvertSettings Settings = new OpenApiConvertSettings();
@ -70,7 +70,7 @@ namespace OoasGui
private void v3RadioBtn_CheckedChanged(object sender, EventArgs e)
{
Version = OpenApiSpecVersion.OpenApi3_0_0;
Version = OpenApiSpecVersion.OpenApi3_0;
Convert();
}

2
src/OoasGui/OoasGui.csproj
View file

@ -36,7 +36,7 @@
<HintPath>..\..\packages\Microsoft.OData.Edm.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OpenApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3f5743946376f042, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.OpenApi.1.0.0-beta008\lib\net46\Microsoft.OpenApi.dll</HintPath>
<HintPath>..\..\packages\Microsoft.OpenApi.1.0.0-beta009\lib\net46\Microsoft.OpenApi.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

2
src/OoasGui/packages.config
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.OData.Edm" version="7.3.1" targetFramework="net461" />
<package id="Microsoft.OpenApi" version="1.0.0-beta008" targetFramework="net461" />
<package id="Microsoft.OpenApi" version="1.0.0-beta009" targetFramework="net461" />
</packages>

2
src/OoasUtil/OpenApiGenerator.cs
View file

@ -55,7 +55,7 @@ namespace OoasUtil
using (FileStream fs = File.Create(Output))
{
OpenApiDocument document = edmModel.ConvertToOpenApi(settings);
document.Serialize(fs, OpenApiSpecVersion.OpenApi3_0_0, Format);
document.Serialize(fs, OpenApiSpecVersion.OpenApi3_0, Format);
fs.Flush();
}
}

6
test/Microsoft.OpenAPI.OData.Reader.Tests/EdmModelOpenApiExtensionsTest.cs
View file

@ -73,7 +73,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.Equal(Resources.GetString("Basic.OpenApi.json").ChangeLineBreaks(), json);
}
[Fact]
[Fact(Skip = "See: https://github.com/Microsoft/OpenAPI.NET/issues/157")]
public void BasicEdmModelToOpenApiYamlWorks()
{
// Arrange
@ -87,7 +87,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.Equal(Resources.GetString("Basic.OpenApi.yaml").ChangeLineBreaks(), yaml);
}
[Fact]
[Fact(Skip = "See: https://github.com/Microsoft/OpenAPI.NET/issues/157")]
public void TripServiceMetadataToOpenApiJsonWorks()
{
// Arrange
@ -134,7 +134,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(document); // guard
MemoryStream stream = new MemoryStream();
document.Serialize(stream, OpenApiSpecVersion.OpenApi3_0_0, target);
document.Serialize(stream, OpenApiSpecVersion.OpenApi3_0, target);
stream.Flush();
stream.Position = 0;
return new StreamReader(stream).ReadToEnd();

14
test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiEdmTypeSchemaGeneratorTest.cs
View file

@ -55,7 +55,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreateEdmTypeSchema(collectionType);
Assert.NotNull(schema);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// & Assert
Assert.Equal(@"{
@ -84,7 +84,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreateEdmTypeSchema(collectionType);
Assert.NotNull(schema);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// & Assert
Assert.Equal(@"{
@ -107,7 +107,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreateEdmTypeSchema(collectionType);
Assert.NotNull(schema);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// & Assert
Assert.Equal(@"{
@ -130,7 +130,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreateEdmTypeSchema(collectionType);
Assert.NotNull(schema);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// & Assert
Assert.Equal(@"{
@ -261,7 +261,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreateEdmTypeSchema(edmTypeReference);
Assert.NotNull(schema); // guard
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// & Assert
if (isNullable)
@ -292,7 +292,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreateEdmTypeSchema(edmTypeReference);
Assert.NotNull(schema); // guard
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// & Assert
if (isNullable)
@ -405,7 +405,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreateEdmTypeSchema(edmTypeReference);
Assert.NotNull(schema); // guard
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// & Assert
if (isNullable)

2
test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiParameterGeneratorTests.cs
View file

@ -56,7 +56,7 @@ namespace Microsoft.OpenApi.OData.Generator.Tests
Assert.Contains("skip", parameters.Select(p => p.Key));
var skip = parameters.First(c => c.Key == "skip").Value;
string yaml = skip.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0_0);
string yaml = skip.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
Assert.Equal(
@"name: $skip
in: query

2
test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiRequestBodyGeneratorTests.cs
View file

@ -103,7 +103,7 @@ namespace Microsoft.OpenApi.OData.Generator.Tests
var requestBody = context.CreateRequestBody(_actionImport);
// Assert
string json = requestBody.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = requestBody.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
Assert.Equal(@"{
""description"": ""Action parameters"",

2
test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiResponseGeneratorTests.cs
View file

@ -82,7 +82,7 @@ namespace Microsoft.OpenApi.OData.Generator.Tests
// Assert
var response = Assert.Single(responses).Value;
string json = response.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = response.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
Assert.Equal(@"{
""description"": ""error"",

22
test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSchemaGeneratorTests.cs
View file

@ -78,7 +78,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.Equal("Address", schema.Title);
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.NotNull(json);
@ -148,7 +148,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.Equal("Tree", declaredSchema.Title);
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.NotNull(json);
@ -205,7 +205,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.Equal("Zoo", schema.Title);
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.NotNull(json);
@ -275,7 +275,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.Equal("Human", declaredSchema.Title);
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
_output.WriteLine(json);
// Assert
Assert.NotNull(json);
@ -344,7 +344,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.Equal(new string[] { "Blue", "White" }, schema.Enum.Select(e => ((OpenApiString)e).Value));
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.NotNull(json);
@ -374,7 +374,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreatePropertySchema(property);
Assert.NotNull(schema);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -400,7 +400,7 @@ namespace Microsoft.OpenApi.OData.Tests
// Act
var schema = context.CreatePropertySchema(property);
Assert.NotNull(schema);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
_output.WriteLine(json);
// Assert
Assert.Equal(@"{
@ -431,7 +431,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema);
Assert.Equal("boolean", schema.Type);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
Assert.Equal(@"{
""type"": ""boolean"",
""default"": false
@ -456,7 +456,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema);
Assert.Equal("string", schema.Type);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
Assert.Equal(@"{
""maxLength"": 44,
""type"": ""string"",
@ -481,7 +481,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema);
Assert.Equal("integer", schema.Type);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
Assert.Equal(@"{
""maximum"": 2147483647,
""minimum"": -2147483648,
@ -507,7 +507,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema);
Assert.Null(schema.Type);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
Assert.Equal(@"{
""oneOf"": [

34
test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSpatialTypeSchemaGeneratorTest.cs
View file

@ -88,7 +88,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -104,7 +104,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -120,7 +120,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -136,7 +136,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -152,7 +152,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -168,7 +168,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -184,7 +184,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -200,7 +200,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -216,7 +216,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -255,7 +255,7 @@ namespace Microsoft.OpenApi.OData.Tests
Assert.NotNull(schema); // guard
// Act
string yaml = schema.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0_0);
string yaml = schema.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(
@ -281,7 +281,7 @@ properties:
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -315,7 +315,7 @@ properties:
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -352,7 +352,7 @@ properties:
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -385,7 +385,7 @@ properties:
Assert.NotNull(schema); // guard
// Act
string yaml = schema.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0_0);
string yaml = schema.SerializeAsYaml(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"required:
@ -413,7 +413,7 @@ properties:
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -453,7 +453,7 @@ properties:
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{
@ -486,7 +486,7 @@ properties:
Assert.NotNull(schema); // guard
// Act
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0_0);
string json = schema.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
// Assert
Assert.Equal(@"{

2
test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
View file

@ -32,7 +32,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta008" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta009" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>

2
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.json
View file

@ -1,5 +1,5 @@
{
"openapi": "3.0.0",
"openapi": "3.0.1",
"info": {
"title": "OData Service for namespace DefaultNs",
"description": "This OData service is located at http://localhost",

2
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.json
View file

@ -1,5 +1,5 @@
{
"openapi": "3.0.0",
"openapi": "3.0.1",
"info": {
"title": "OData Service for namespace ",
"description": "This OData service is located at http://localhost",

2
test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.yaml
View file

@ -1,4 +1,4 @@
openapi: 3.0.0
openapi: 3.0.1
info:
title: 'OData Service for namespace '
description: This OData service is located at http://localhost

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

@ -1,5 +1,5 @@
{
"openapi": "3.0.0",
"openapi": "3.0.1",
"info": {
"title": "OData Service for namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models",
"description": "This OData service is located at http://services.odata.org/TrippinRESTierService",

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

@ -1,4 +1,4 @@
openapi: 3.0.0
openapi: 3.0.1
info:
title: OData Service for namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
description: This OData service is located at http://services.odata.org/TrippinRESTierService
@ -1468,22 +1468,14 @@ components:
- Feature3
- Feature4
type: string
Edm.Geography:
$ref: '#/components/schemas/Edm.Geometry'
Edm.GeographyPoint:
$ref: '#/components/schemas/Edm.GeometryPoint'
Edm.GeographyLineString:
$ref: '#/components/schemas/Edm.GeometryLineString'
Edm.GeographyPolygon:
$ref: '#/components/schemas/Edm.GeometryPolygon'
Edm.GeographyMultiPoint:
$ref: '#/components/schemas/Edm.GeometryMultiPoint'
Edm.GeographyMultiLineString:
$ref: '#/components/schemas/Edm.GeometryMultiLineString'
Edm.GeographyMultiPolygon:
$ref: '#/components/schemas/Edm.GeometryMultiPolygon'
Edm.GeographyCollection:
$ref: '#/components/schemas/Edm.GeometryCollection'
Edm.Geography: { }
Edm.GeographyPoint: { }
Edm.GeographyLineString: { }
Edm.GeographyPolygon: { }
Edm.GeographyMultiPoint: { }
Edm.GeographyMultiLineString: { }
Edm.GeographyMultiPolygon: { }
Edm.GeographyCollection: { }
Edm.Geometry:
type: object
anyOf: