diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
index 3ee8d9477ab5..b99daf9706dc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -30,6 +30,8 @@
 
 import static org.openapitools.codegen.CodegenConstants.*;
 import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
+import static org.openapitools.codegen.utils.EnumUtils.BUNGIE_X_ENUM_VALUES;
+import static org.openapitools.codegen.utils.EnumUtils.getBungieEnumValues;
 import static org.openapitools.codegen.utils.StringUtils.*;
 
 public abstract class AbstractDartCodegen extends DefaultCodegen {
@@ -852,21 +854,19 @@ private List<Map<String, String>> prioritizeContentTypes(List<Map<String, String
 
     @Override
     protected void updateEnumVarsWithExtensions(List<Map<String, Object>> enumVars, Map<String, Object> vendorExtensions, String dataType) {
-        if (vendorExtensions != null && useEnumExtension && vendorExtensions.containsKey("x-enum-values")) {
+        if (vendorExtensions != null && useEnumExtension && vendorExtensions.containsKey(BUNGIE_X_ENUM_VALUES)) {
             // Use the x-enum-values extension for this enum
             // Existing enumVars added by the default handling need to be removed first
             enumVars.clear();
 
-            Object extension = vendorExtensions.get("x-enum-values");
-            List<Map<String, Object>> values = (List<Map<String, Object>>) extension;
-            for (Map<String, Object> value : values) {
-                Map<String, Object> enumVar = new HashMap<>();
-                enumVar.put(ENUM_NAME, toEnumVarName((String) value.get("identifier"), dataType));
-                enumVar.put(ENUM_VALUE, toEnumValue(value.get("numericValue").toString(), dataType));
-                enumVar.put(ENUM_IS_STRING, isDataTypeString(dataType));
-                if (value.containsKey("description")) {
-                    enumVar.put("description", value.get("description").toString());
-                }
+            List<Map<String, String>> bungieEnumValues = getBungieEnumValues((List<Map<String, Object>>) vendorExtensions.get(BUNGIE_X_ENUM_VALUES));
+
+            boolean isString = isDataTypeString(dataType);
+            for (Map<String, String> value : bungieEnumValues) {
+                Map<String, Object> enumVar = new HashMap<>(value);
+                enumVar.put(ENUM_NAME, toEnumVarName(value.get(ENUM_NAME), dataType));
+                enumVar.put(ENUM_VALUE, toEnumValue(value.get(ENUM_VALUE), dataType));
+                enumVar.put(ENUM_IS_STRING, isString);
                 enumVars.add(enumVar);
             }
         } else {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/EnumUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/EnumUtils.java
index 9ea2e1e7656e..0cd4d5e8b536 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/EnumUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/EnumUtils.java
@@ -11,6 +11,11 @@
 
 public class EnumUtils {
 
+    public static final String BUNGIE_X_ENUM_VALUES = "x-enum-values";
+    private static final String BUNGIE_ENUM_DESCRIPTION = "description";
+    private static final String BUNGIE_ENUM_IDENTIFIER = "identifier";
+    private static final String BUNGIE_ENUM_NUMERIC_VALUE = "numericValue";
+
     public static final String ONE_OF = "oneOf";
     public static final String ANY_OF = "anyOf";
 
@@ -76,6 +81,30 @@ public static List<String> getEnumValuesAsString(Map<String, Object> allowableVa
         return enumValues;
     }
 
+    /**
+     * Bungie has defined their own enum extension to describe enum values.
+     * See <a href="https://github.com/Bungie-net/api?tab=readme-ov-file">documentation</a> and the section with
+     * {@code x-enum-values} for more information.
+     *
+     * @param xEnumValues The {@code x-enum-values} Bungie extension map
+     * @return A list of {@code enumVars} extracted from the {@code x-enum-values} extension
+     */
+    public static List<Map<String, String>> getBungieEnumValues(List<Map<String, Object>> xEnumValues) {
+        List<Map<String, String>> enumVars = new ArrayList<>();
+        for (Map<String, Object> enumValue : xEnumValues) {
+            Map<String, String> enumVar = new HashMap<>();
+            enumVar.put(ENUM_NAME, (String) enumValue.get(BUNGIE_ENUM_IDENTIFIER));
+            if (enumValue.containsKey(BUNGIE_ENUM_NUMERIC_VALUE) && enumValue.get(BUNGIE_ENUM_NUMERIC_VALUE) != null) {
+                enumVar.put(ENUM_VALUE, enumValue.get(BUNGIE_ENUM_NUMERIC_VALUE).toString());
+            }
+            if (enumValue.containsKey(BUNGIE_ENUM_DESCRIPTION) && enumValue.get(BUNGIE_ENUM_DESCRIPTION) != null) {
+                enumVar.put(ENUM_DESCRIPTION, enumValue.get(BUNGIE_ENUM_DESCRIPTION).toString());
+            }
+            enumVars.add(enumVar);
+        }
+        return enumVars;
+    }
+
     /**
      * Simplifies a composed schema (oneOf/anyOf) where all sub-schemas are enums
      * to a single enum schema containing all the values.
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum.mustache
index 2c076da6661c..be35f3619462 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum.mustache
@@ -4,6 +4,9 @@ import 'package:built_value/serializer.dart';
 
 part '{{classFilename}}.g.dart';
 
+{{#description}}
+/// {{{description}}}
+{{/description}}
 {{#isDeprecated}}
 @Deprecated('{{{classname}}} has been deprecated')
 {{/isDeprecated}}
@@ -11,9 +14,9 @@ class {{classname}} extends EnumClass {
 
   {{#allowableValues}}
     {{#enumVars}}
-      {{#description}}
+      {{#enumDescription}}
   /// {{{.}}}
-      {{/description}}
+      {{/enumDescription}}
   @BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isLong}}wireNumber: {{{value}}}{{/isLong}}{{^isInteger}}{{^isLong}}wireName: r{{{value}}}{{/isLong}}{{/isInteger}}{{#enumUnknownDefaultCase}}{{#-last}}, fallback: true{{/-last}}{{/enumUnknownDefaultCase}})
   static const {{classname}} {{name}} = _${{name}};
     {{/enumVars}}
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum_inline.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum_inline.mustache
index 98345b6d9d6a..e19a8533eb32 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum_inline.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum_inline.mustache
@@ -1,3 +1,6 @@
+{{#description}}
+/// {{{description}}}
+{{/description}}
 {{#isDeprecated}}
 @Deprecated('{{{enumName}}} has been deprecated')
 {{/isDeprecated}}
@@ -5,9 +8,9 @@ class {{{enumName}}} extends EnumClass {
 
   {{#allowableValues}}
     {{#enumVars}}
-      {{#description}}
+      {{#enumDescription}}
   /// {{{.}}}
-      {{/description}}
+      {{/enumDescription}}
   @BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isLong}}wireNumber: {{{value}}}{{/isLong}}{{^isInteger}}{{^isLong}}wireName: r{{{value}}}{{/isLong}}{{/isInteger}}{{#enumUnknownDefaultCase}}{{#-last}}, fallback: true{{/-last}}{{/enumUnknownDefaultCase}})
   static const {{{enumName}}} {{name}} = _${{#lambda.camelcase}}{{{enumName}}}{{/lambda.camelcase}}_{{name}};
     {{/enumVars}}
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache
index 6446c73972fa..da7aaf7ecf91 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache
@@ -1,6 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-{{#description}}/// {{{description}}}{{/description}}
+{{#description}}
+/// {{{description}}}
+{{/description}}
 {{#isDeprecated}}
 @Deprecated('{{{classname}}} has been deprecated')
 {{/isDeprecated}}
@@ -8,9 +10,9 @@ enum {{{classname}}} {
 {{#allowableValues}}
 {{#enumVars}}
   {{^isNull}}
-      {{#description}}
+      {{#enumDescription}}
           /// {{{.}}}
-      {{/description}}
+      {{/enumDescription}}
       @JsonValue({{#isString}}r{{/isString}}{{{value}}})
       {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
   {{/isNull}}
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache
index 3b441c237c90..ae71524d2a56 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache
@@ -1,5 +1,7 @@
 {{#enumName}}
-{{#description}}/// {{{description}}}{{/description}}
+{{#description}}
+/// {{{description}}}
+{{/description}}
 {{#isDeprecated}}
 @Deprecated('{{{enumName}}} has been deprecated')
 {{/isDeprecated}}
@@ -7,9 +9,9 @@ enum {{{ enumName }}} {
 {{#allowableValues}}
 {{#enumVars}}
 {{^isNull}}
-{{#description}}
+{{#enumDescription}}
     /// {{{.}}}
-{{/description}}
+{{/enumDescription}}
 @JsonValue({{#isString}}r{{/isString}}{{{value}}})
 {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
 {{/isNull}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java
index d54e9273c6a0..d8d69643dd0c 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java
@@ -550,12 +550,12 @@ public void testXEnumValuesExtension() {
         Assert.assertEquals(enumVars.get(0).get("name"), "foo");
         Assert.assertEquals(enumVars.get(0).get("value"), "1");
         Assert.assertEquals(enumVars.get(0).get("isString"), false);
-        Assert.assertEquals(enumVars.get(0).get("description"), "the foo");
+        Assert.assertEquals(enumVars.get(0).get("enumDescription"), "the foo");
 
         Assert.assertEquals(enumVars.get(1).get("name"), "bar");
         Assert.assertEquals(enumVars.get(1).get("value"), "2");
         Assert.assertEquals(enumVars.get(1).get("isString"), false);
-        Assert.assertEquals(enumVars.get(1).get("description"), "the bar");
+        Assert.assertEquals(enumVars.get(1).get("enumDescription"), "the bar");
     }
 
     // datetime (or primitive type) not yet supported in HTTP request body
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/order.dart
index f60f75b9195e..910f03a5de4b 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/order.dart
@@ -207,18 +207,15 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
   }
 }
 
+/// Order Status
 class OrderStatusEnum extends EnumClass {
 
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'placed')
   static const OrderStatusEnum placed = _$orderStatusEnum_placed;
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'approved')
   static const OrderStatusEnum approved = _$orderStatusEnum_approved;
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'delivered')
   static const OrderStatusEnum delivered = _$orderStatusEnum_delivered;
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
   static const OrderStatusEnum unknownDefaultOpenApi = _$orderStatusEnum_unknownDefaultOpenApi;
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/pet.dart b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/pet.dart
index f018b90b047f..331f5853efb2 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/pet.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/lib/src/model/pet.dart
@@ -202,18 +202,15 @@ class _$PetSerializer implements PrimitiveSerializer<Pet> {
   }
 }
 
+/// pet status in the store
 class PetStatusEnum extends EnumClass {
 
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'available')
   static const PetStatusEnum available = _$petStatusEnum_available;
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'pending')
   static const PetStatusEnum pending = _$petStatusEnum_pending;
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'sold')
   static const PetStatusEnum sold = _$petStatusEnum_sold;
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
   static const PetStatusEnum unknownDefaultOpenApi = _$petStatusEnum_unknownDefaultOpenApi;
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart
index b1d9f2942b1d..70551bb1d4e6 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart
@@ -74,7 +74,6 @@ class EnumArrays {
 
 }
 
-
 enum EnumArraysJustSymbolEnum {
 @JsonValue(r'>=')
 greaterThanEqual(r'>='),
@@ -92,7 +91,6 @@ String toString() => value;
 }
 
 
-
 enum EnumArraysArrayEnumEnum {
 @JsonValue(r'fish')
 fish(r'fish'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart
index 1563c30bece7..44b6a697942e 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart
@@ -180,7 +180,6 @@ class EnumTest {
 
 }
 
-
 enum EnumTestEnumStringEnum {
 @JsonValue(r'UPPER')
 UPPER(r'UPPER'),
@@ -200,7 +199,6 @@ String toString() => value;
 }
 
 
-
 enum EnumTestEnumStringRequiredEnum {
 @JsonValue(r'UPPER')
 UPPER(r'UPPER'),
@@ -220,7 +218,6 @@ String toString() => value;
 }
 
 
-
 enum EnumTestEnumIntegerEnum {
 @JsonValue(1)
 number1('1'),
@@ -238,7 +235,6 @@ String toString() => value;
 }
 
 
-
 enum EnumTestEnumNumberEnum {
 @JsonValue('1.1')
 number1Period1(''1.1''),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart
index 4a84fa85524f..7549af37b88b 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart
@@ -105,7 +105,6 @@ class MapTest {
 
 }
 
-
 enum MapTestMapOfEnumStringEnum {
 @JsonValue(r'UPPER')
 UPPER(r'UPPER'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart
index 7ff6301e9edf..35564388689f 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart
@@ -5,7 +5,6 @@
 // ignore_for_file: unused_element
 import 'package:json_annotation/json_annotation.dart';
 
-
 enum ModelEnumClass {
       @JsonValue(r'_abc')
       abc(r'_abc'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_duplicate_inline_enum.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_duplicate_inline_enum.dart
index 4734312e79e2..6b4bfc6b4b59 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_duplicate_inline_enum.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_duplicate_inline_enum.dart
@@ -58,7 +58,6 @@ class ObjectWithDuplicateInlineEnum {
 
 }
 
-
 enum ObjectWithDuplicateInlineEnumAttributeEnum {
 @JsonValue(r'value_one')
 valueOne(r'value_one'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum.dart
index 48e01ea5d998..70d144a01c15 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum.dart
@@ -58,7 +58,6 @@ class ObjectWithInlineEnum {
 
 }
 
-
 enum ObjectWithInlineEnumAttributeEnum {
 @JsonValue(r'value_one')
 valueOne(r'value_one'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum_default_value.dart
index 289025e07a44..62f72a5e0f7d 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum_default_value.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum_default_value.dart
@@ -60,13 +60,10 @@ class ObjectWithInlineEnumDefaultValue {
 
 /// Object one attribute enum with default value
 enum ObjectWithInlineEnumDefaultValueAttributeEnum {
-    /// Object one attribute enum with default value
 @JsonValue(r'value_one')
 valueOne(r'value_one'),
-    /// Object one attribute enum with default value
 @JsonValue(r'value_two')
 valueTwo(r'value_two'),
-    /// Object one attribute enum with default value
 @JsonValue(r'unknown_default_open_api')
 unknownDefaultOpenApi(r'unknown_default_open_api');
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
index e50a3e70e819..5bbce9d703d6 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
@@ -140,16 +140,12 @@ class Order {
 
 /// Order Status
 enum OrderStatusEnum {
-    /// Order Status
 @JsonValue(r'placed')
 placed(r'placed'),
-    /// Order Status
 @JsonValue(r'approved')
 approved(r'approved'),
-    /// Order Status
 @JsonValue(r'delivered')
 delivered(r'delivered'),
-    /// Order Status
 @JsonValue(r'unknown_default_open_api')
 unknownDefaultOpenApi(r'unknown_default_open_api');
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart
index e7687f47c55b..9fbe1de714fb 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart
@@ -5,7 +5,6 @@
 // ignore_for_file: unused_element
 import 'package:json_annotation/json_annotation.dart';
 
-
 enum OuterEnum {
       @JsonValue(r'placed')
       placed(r'placed'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart
index e232c230492f..815caeecdcef 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart
@@ -5,7 +5,6 @@
 // ignore_for_file: unused_element
 import 'package:json_annotation/json_annotation.dart';
 
-
 enum OuterEnumDefaultValue {
       @JsonValue(r'placed')
       placed(r'placed'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart
index 304ecf5f51ff..0e1078369bad 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart
@@ -5,7 +5,6 @@
 // ignore_for_file: unused_element
 import 'package:json_annotation/json_annotation.dart';
 
-
 enum OuterEnumInteger {
       @JsonValue(0)
       number0('0'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart
index 6483e0b837fe..d0bdad588d11 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart
@@ -5,7 +5,6 @@
 // ignore_for_file: unused_element
 import 'package:json_annotation/json_annotation.dart';
 
-
 enum OuterEnumIntegerDefaultValue {
       @JsonValue(0)
       number0('0'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart
index b2674ae99fc6..a7a095ee8a7c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart
@@ -142,16 +142,12 @@ class Pet {
 
 /// pet status in the store
 enum PetStatusEnum {
-    /// pet status in the store
 @JsonValue(r'available')
 available(r'available'),
-    /// pet status in the store
 @JsonValue(r'pending')
 pending(r'pending'),
-    /// pet status in the store
 @JsonValue(r'sold')
 sold(r'sold'),
-    /// pet status in the store
 @JsonValue(r'unknown_default_open_api')
 unknownDefaultOpenApi(r'unknown_default_open_api');
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart
index 3ea636c76a1e..4518989a80d7 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart
@@ -5,7 +5,6 @@
 // ignore_for_file: unused_element
 import 'package:json_annotation/json_annotation.dart';
 
-
 enum SingleRefType {
       @JsonValue(r'admin')
       admin(r'admin'),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_enum.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_enum.dart
index 29a25d1942f4..e0f755ec4bab 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_enum.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_enum.dart
@@ -5,7 +5,6 @@
 // ignore_for_file: unused_element
 import 'package:json_annotation/json_annotation.dart';
 
-
 enum TestEnum {
       @JsonValue(r'')
       empty(r''),
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/object_with_inline_enum_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/object_with_inline_enum_default_value.dart
index 6934b2f78c62..478f242f5d6f 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/object_with_inline_enum_default_value.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/object_with_inline_enum_default_value.dart
@@ -111,15 +111,13 @@ class _$ObjectWithInlineEnumDefaultValueSerializer implements PrimitiveSerialize
   }
 }
 
+/// Object one attribute enum with default value
 class ObjectWithInlineEnumDefaultValueAttributeEnum extends EnumClass {
 
-  /// Object one attribute enum with default value
   @BuiltValueEnumConst(wireName: r'value_one')
   static const ObjectWithInlineEnumDefaultValueAttributeEnum valueOne = _$objectWithInlineEnumDefaultValueAttributeEnum_valueOne;
-  /// Object one attribute enum with default value
   @BuiltValueEnumConst(wireName: r'value_two')
   static const ObjectWithInlineEnumDefaultValueAttributeEnum valueTwo = _$objectWithInlineEnumDefaultValueAttributeEnum_valueTwo;
-  /// Object one attribute enum with default value
   @BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
   static const ObjectWithInlineEnumDefaultValueAttributeEnum unknownDefaultOpenApi = _$objectWithInlineEnumDefaultValueAttributeEnum_unknownDefaultOpenApi;
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
index a5b21bb76cb5..6437db026a69 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/order.dart
@@ -206,18 +206,15 @@ class _$OrderSerializer implements PrimitiveSerializer<Order> {
   }
 }
 
+/// Order Status
 class OrderStatusEnum extends EnumClass {
 
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'placed')
   static const OrderStatusEnum placed = _$orderStatusEnum_placed;
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'approved')
   static const OrderStatusEnum approved = _$orderStatusEnum_approved;
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'delivered')
   static const OrderStatusEnum delivered = _$orderStatusEnum_delivered;
-  /// Order Status
   @BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
   static const OrderStatusEnum unknownDefaultOpenApi = _$orderStatusEnum_unknownDefaultOpenApi;
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/pet.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/pet.dart
index e9ff64f9a546..a64990e6dcde 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/pet.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/pet.dart
@@ -201,18 +201,15 @@ class _$PetSerializer implements PrimitiveSerializer<Pet> {
   }
 }
 
+/// pet status in the store
 class PetStatusEnum extends EnumClass {
 
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'available')
   static const PetStatusEnum available = _$petStatusEnum_available;
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'pending')
   static const PetStatusEnum pending = _$petStatusEnum_pending;
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'sold')
   static const PetStatusEnum sold = _$petStatusEnum_sold;
-  /// pet status in the store
   @BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
   static const PetStatusEnum unknownDefaultOpenApi = _$petStatusEnum_unknownDefaultOpenApi;