Merge pull request #3257 from microsoft/andrueastman/bitwiseEnums

Cleans up style parameter

Author: andrueastman

src/Kiota.Builder/CodeDOM/CodeEnum.cs

@@ -12,11 +12,6 @@ public bool Flags
         get; set;
     }
 
-    public EnumStyle Style
-    {
-        get; init;
-    }
-
     public CodeDocumentation Documentation { get; set; } = new();
     private readonly ConcurrentQueue<CodeEnumOption> OptionsInternal = new(); // this structure is used to maintain the order of the options
 
@@ -42,8 +37,3 @@ public DeprecationInformation? Deprecation
         get; set;
     }
 }
-
-public enum EnumStyle
-{
-    Simple = 0 // Default
-}

src/Kiota.Builder/KiotaBuilder.cs

@@ -1767,7 +1767,6 @@ private CodeElement AddModelDeclarationIfDoesntExist(OpenApiUrlTreeNode currentN
                 {
                     Name = declarationName,
                     Flags = enumFlagsExtension?.IsFlags ?? false,
-                    Style = Enum.TryParse<EnumStyle>(enumFlagsExtension?.Style ?? string.Empty, out var style) ? style : EnumStyle.Simple,
                     Documentation = new()
                     {
                         Description = !string.IsNullOrEmpty(schemaDescription) || !string.IsNullOrEmpty(schema.Reference?.Id) ?

src/Kiota.Builder/OpenApiExtensions/OpenApiEnumFlagsExtension.cs

@@ -28,13 +28,6 @@ public bool IsFlags
     {
         get; set;
     }
-    /// <summary>
-    /// The serialization style of the flagged enum.
-    /// </summary>
-    public string? Style
-    {
-        get; set;
-    }
     /// <inheritdoc />
     public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
     {
@@ -43,7 +36,6 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
 
         writer.WriteStartObject();
         writer.WriteProperty(nameof(IsFlags).ToFirstCharacterLowerCase(), IsFlags);
-        writer.WriteProperty(nameof(Style).ToFirstCharacterLowerCase(), Style);
         writer.WriteEndObject();
     }
 
@@ -55,10 +47,6 @@ public static OpenApiEnumFlagsExtension Parse(IOpenApiAny source)
         {
             extension.IsFlags = isFlags.Value;
         }
-        if (rawObject.TryGetValue("style", out var styleValue) && styleValue is OpenApiString style)
-        {
-            extension.Style = style.Value;
-        }
         return extension;
     }
 }

tests/Kiota.Builder.Tests/KiotaBuilderTests.cs

@@ -210,7 +210,6 @@ public async Task ParsesEnumDescriptions()
         var enumDef = modelsNS.FindChildByName<CodeEnum>("StorageAccountType", false);
         Assert.NotNull(enumDef);
         Assert.False(enumDef.Flags);
-        Assert.Equal(EnumStyle.Simple, enumDef.Style);
         var firstOption = enumDef.Options.First();
         Assert.Equal("+1", firstOption.SerializationName);
         Assert.Equal("plus_1", firstOption.Name);
@@ -275,7 +274,6 @@ public async Task ParsesEnumFlagsInformation()
         var enumDef = modelsNS.FindChildByName<CodeEnum>("StorageAccountType", false);
         Assert.NotNull(enumDef);
         Assert.True(enumDef.Flags);
-        Assert.Equal(EnumStyle.Simple, enumDef.Style);
     }
     [Theory]
     [InlineData("description: 'Represents an Azure Active Directory user.'")]

tests/Kiota.Builder.Tests/OpenApiExtensions/OpenApiEnumFlagsExtensionTests.cs

@@ -40,7 +40,6 @@ public void WritesDefaultValues()
         Assert.Contains("\"isFlags\": false", result);
         Assert.DoesNotContain("\"style\"", result);
         Assert.False(extension.IsFlags);
-        Assert.Null(extension.Style);
     }
 
     [Fact]
@@ -60,9 +59,7 @@ public void WritesAllDefaultValues()
 
         // Assert
         Assert.Contains("\"isFlags\": true", result);
-        Assert.DoesNotContain("\"style\"", result);// writes form for unspecified style.
         Assert.True(extension.IsFlags);
-        Assert.Null(extension.Style);
     }
 
     [Fact]
@@ -71,8 +68,7 @@ public void WritesAllValues()
         // Arrange
         OpenApiEnumFlagsExtension extension = new()
         {
-            IsFlags = true,
-            Style = "form"
+            IsFlags = true
         };
         using TextWriter sWriter = new StringWriter();
         OpenApiJsonWriter writer = new(sWriter);
@@ -83,9 +79,7 @@ public void WritesAllValues()
 
         // Assert
         Assert.True(extension.IsFlags);
-        Assert.NotNull(extension.Style);
         Assert.Contains("\"isFlags\": true", result);
-        Assert.Contains("\"style\": \"form\"", result);
     }
 }