Skip to content

Commit be86411

Browse files
jianyexijianye xi
andauthored
bugfix fo xmsEnumChange (#246)
* bugfix fo xmsEnumChange * bump version Co-authored-by: jianye xi <[email protected]>
1 parent 6d8024e commit be86411

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

openapi-diff/src/modeler/AutoRest.Swagger.Tests/Resource/Swagger/new/enum_as_string.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
"C"
4545
],
4646
"x-ms-enum": {
47-
"name": "ResourceIdentityType",
48-
"modelAsString": true
47+
"name": "ResourceIdentityType"
4948
},
5049
"description": "This property shows the number of databases returned."
5150
}

openapi-diff/src/modeler/AutoRest.Swagger.Tests/Resource/Swagger/old/xms_enum_changed.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@
4444
"C"
4545
],
4646
"x-ms-enum": {
47-
"name": "ResourceIdentityType",
48-
"modelAsString": true
47+
"name": "ResourceIdentityType"
4948
},
5049
"description": "This property shows the number of databases returned."
5150
}

openapi-diff/src/modeler/AutoRest.Swagger/Model/SwaggerObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private void CompareXmsEnum(ComparisonContext<ServiceDefinition> context, T prio
228228
{
229229
context.LogError(ComparisonMessages.XmsEnumChanged, "name");
230230
}
231-
if (this.XmsEnum != null && prior.XmsEnum != null && !prior.XmsEnum.ModelAsString != prior.XmsEnum.ModelAsString)
231+
if (this.XmsEnum != null && prior.XmsEnum != null && this.XmsEnum.ModelAsString != prior.XmsEnum.ModelAsString)
232232
{
233233
context.LogError(ComparisonMessages.XmsEnumChanged, "modelAsString");
234234
}

openapi-diff/src/modeler/AutoRest.Swagger/Model/XmsEnumExtension.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See License.txt in the project root for license information.
33

4+
using Newtonsoft.Json;
45
using System;
56
using System.Collections.Generic;
7+
using System.ComponentModel;
68

79
namespace AutoRest.Swagger.Model
810
{
@@ -22,7 +24,9 @@ public class XmsEnumValue
2224
public class XmsEnumExtension
2325
{
2426
public string Name { get; set; }
25-
27+
28+
[DefaultValue(true)]
29+
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
2630
public Boolean ModelAsString { get; set; }
2731

2832
public IList<XmsEnumValue> values { get; set; }

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure/oad",
3-
"version": "0.10.0",
3+
"version": "0.10.1",
44
"author": {
55
"name": "Microsoft Corporation",
66
"email": "[email protected]",

0 commit comments

Comments
 (0)