OpenAPITools · wing328 · Mar 27, 2024 · Mar 27, 2024 · Jun 26, 2024 · Jun 26, 2024
diff --git a/docs/customization.md b/docs/customization.md
@@ -512,6 +512,7 @@ OpenAPI Normalizer transforms the input OpenAPI doc/spec (which may not perfectl
 
 - SIMPLIFY_ONEOF_ANYOF 
 - SIMPLIFY_BOOLEAN_ENUM
+- REFACTOR_ALLOF_WITH_PROPERTIES_ONLY
 
 (One can use `DISABLE_ALL=true` to disable all the rules)
 

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java
@@ -160,6 +160,7 @@ public OpenAPINormalizer(OpenAPI openAPI, Map<String, String> inputRules) {
         // rules that are default to true
         rules.put(SIMPLIFY_ONEOF_ANYOF, true);
         rules.put(SIMPLIFY_BOOLEAN_ENUM, true);
+        rules.put(REFACTOR_ALLOF_WITH_PROPERTIES_ONLY, true); // default to true since v7.7.0
 
         processRules(inputRules);
 

diff --git a/...enapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/...enapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
@@ -4589,8 +4589,11 @@ public void testMultiInheritanceParentRequiredParams_issue16797() throws IOExcep
         //       public Object4(Type1 pageInfo, String responseType, String requestId, Boolean success) {
         //            super(responseType, requestId, success, pageInfo);
         //        }
+        // UPDATE: with https://github.com/OpenAPITools/openapi-generator/pull/18238
+        // (REFACTOR_ALLOF_WITH_PROPERTIES_ONLY default to true)
+        // public Object4(String responseType, String requestId, Boolean success, Type1 pageInfo)
         JavaFileAssert.assertThat(output.get("Object4.java"))
-                .assertConstructor("Type1", "String", "String", "Boolean")
+                .assertConstructor("String", "String", "Boolean", "Type1")
                 .hasParameter("responseType").toConstructor()
                 .hasParameter("requestId").toConstructor()
                 .hasParameter("success").toConstructor()

diff --git a/samples/client/others/rust/hyper/oneOf/docs/Bar.md b/samples/client/others/rust/hyper/oneOf/docs/Bar.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **String** |  | 
-**bar_prop_a** | Option<**String**> |  | [optional]
-**foo_prop_b** | Option<**String**> |  | [optional]
-**foo** | Option<[**models::FooRefOrValue**](FooRefOrValue.md)> |  | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
+**id** | **String** |  | 
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**bar_prop_a** | Option<**String**> |  | [optional]
+**foo_prop_b** | Option<**String**> |  | [optional]
+**foo** | Option<[**models::FooRefOrValue**](FooRefOrValue.md)> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/docs/BarCreate.md b/samples/client/others/rust/hyper/oneOf/docs/BarCreate.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**bar_prop_a** | Option<**String**> |  | [optional]
-**foo_prop_b** | Option<**String**> |  | [optional]
-**foo** | Option<[**models::FooRefOrValue**](FooRefOrValue.md)> |  | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
 **id** | Option<**String**> | unique identifier | [optional]
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**bar_prop_a** | Option<**String**> |  | [optional]
+**foo_prop_b** | Option<**String**> |  | [optional]
+**foo** | Option<[**models::FooRefOrValue**](FooRefOrValue.md)> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/docs/BarRef.md b/samples/client/others/rust/hyper/oneOf/docs/BarRef.md
@@ -4,13 +4,13 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**name** | Option<**String**> | Name of the related entity. | [optional]
-**at_referred_type** | Option<**String**> | The actual type of the target instance when needed for disambiguation. | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
 **id** | Option<**String**> | unique identifier | [optional]
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**name** | Option<**String**> | Name of the related entity. | [optional]
+**at_referred_type** | Option<**String**> | The actual type of the target instance when needed for disambiguation. | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/docs/Foo.md b/samples/client/others/rust/hyper/oneOf/docs/Foo.md
@@ -4,13 +4,13 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**foo_prop_a** | Option<**String**> |  | [optional]
-**foo_prop_b** | Option<**String**> |  | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
 **id** | Option<**String**> | unique identifier | [optional]
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**foo_prop_a** | Option<**String**> |  | [optional]
+**foo_prop_b** | Option<**String**> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/docs/FooRef.md b/samples/client/others/rust/hyper/oneOf/docs/FooRef.md
@@ -4,14 +4,14 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**fooref_prop_a** | Option<**String**> |  | [optional]
-**name** | Option<**String**> | Name of the related entity. | [optional]
-**at_referred_type** | Option<**String**> | The actual type of the target instance when needed for disambiguation. | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
 **id** | Option<**String**> | unique identifier | [optional]
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**name** | Option<**String**> | Name of the related entity. | [optional]
+**at_referred_type** | Option<**String**> | The actual type of the target instance when needed for disambiguation. | [optional]
+**fooref_prop_a** | Option<**String**> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/docs/Pasta.md b/samples/client/others/rust/hyper/oneOf/docs/Pasta.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**vendor** | Option<**String**> |  | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
 **id** | Option<**String**> | unique identifier | [optional]
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**vendor** | Option<**String**> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/docs/Pizza.md b/samples/client/others/rust/hyper/oneOf/docs/Pizza.md
@@ -4,12 +4,12 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**pizza_size** | Option<**f64**> |  | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
 **id** | Option<**String**> | unique identifier | [optional]
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**pizza_size** | Option<**f64**> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/docs/PizzaSpeziale.md b/samples/client/others/rust/hyper/oneOf/docs/PizzaSpeziale.md
@@ -4,13 +4,13 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**toppings** | Option<**String**> |  | [optional]
-**pizza_size** | Option<**f64**> |  | [optional]
 **href** | Option<**String**> | Hyperlink reference | [optional]
 **id** | Option<**String**> | unique identifier | [optional]
 **at_schema_location** | Option<**String**> | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional]
 **at_base_type** | Option<**String**> | When sub-classing, this defines the super-class | [optional]
 **at_type** | **String** | When sub-classing, this defines the sub-class Extensible name | 
+**pizza_size** | Option<**f64**> |  | [optional]
+**toppings** | Option<**String**> |  | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar.rs
@@ -13,17 +13,11 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Bar {
-    #[serde(rename = "id")]
-    pub id: String,
-    #[serde(rename = "barPropA", skip_serializing_if = "Option::is_none")]
-    pub bar_prop_a: Option<String>,
-    #[serde(rename = "fooPropB", skip_serializing_if = "Option::is_none")]
-    pub foo_prop_b: Option<String>,
-    #[serde(rename = "foo", skip_serializing_if = "Option::is_none")]
-    pub foo: Option<Box<models::FooRefOrValue>>,
     /// Hyperlink reference
     #[serde(rename = "href", skip_serializing_if = "Option::is_none")]
     pub href: Option<String>,
+    #[serde(rename = "id")]
+    pub id: String,
     /// A URI to a JSON-Schema file that defines additional attributes and relationships
     #[serde(rename = "@schemaLocation", skip_serializing_if = "Option::is_none")]
     pub at_schema_location: Option<String>,
@@ -33,19 +27,25 @@ pub struct Bar {
     /// When sub-classing, this defines the sub-class Extensible name
     #[serde(rename = "@type")]
     pub at_type: String,
+    #[serde(rename = "barPropA", skip_serializing_if = "Option::is_none")]
+    pub bar_prop_a: Option<String>,
+    #[serde(rename = "fooPropB", skip_serializing_if = "Option::is_none")]
+    pub foo_prop_b: Option<String>,
+    #[serde(rename = "foo", skip_serializing_if = "Option::is_none")]
+    pub foo: Option<Box<models::FooRefOrValue>>,
 }
 
 impl Bar {
     pub fn new(id: String, at_type: String) -> Bar {
         Bar {
-            id,
-            bar_prop_a: None,
-            foo_prop_b: None,
-            foo: None,
             href: None,
+            id,
             at_schema_location: None,
             at_base_type: None,
             at_type,
+            bar_prop_a: None,
+            foo_prop_b: None,
+            foo: None,
         }
     }
 }

diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs
@@ -13,12 +13,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct BarCreate {
-    #[serde(rename = "barPropA", skip_serializing_if = "Option::is_none")]
-    pub bar_prop_a: Option<String>,
-    #[serde(rename = "fooPropB", skip_serializing_if = "Option::is_none")]
-    pub foo_prop_b: Option<String>,
-    #[serde(rename = "foo", skip_serializing_if = "Option::is_none")]
-    pub foo: Option<Box<models::FooRefOrValue>>,
     /// Hyperlink reference
     #[serde(rename = "href", skip_serializing_if = "Option::is_none")]
     pub href: Option<String>,
@@ -34,19 +28,25 @@ pub struct BarCreate {
     /// When sub-classing, this defines the sub-class Extensible name
     #[serde(rename = "@type")]
     pub at_type: String,
+    #[serde(rename = "barPropA", skip_serializing_if = "Option::is_none")]
+    pub bar_prop_a: Option<String>,
+    #[serde(rename = "fooPropB", skip_serializing_if = "Option::is_none")]
+    pub foo_prop_b: Option<String>,
+    #[serde(rename = "foo", skip_serializing_if = "Option::is_none")]
+    pub foo: Option<Box<models::FooRefOrValue>>,
 }
 
 impl BarCreate {
     pub fn new(at_type: String) -> BarCreate {
         BarCreate {
-            bar_prop_a: None,
-            foo_prop_b: None,
-            foo: None,
             href: None,
             id: None,
             at_schema_location: None,
             at_base_type: None,
             at_type,
+            bar_prop_a: None,
+            foo_prop_b: None,
+            foo: None,
         }
     }
 }

diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs
@@ -13,12 +13,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct BarRef {
-    /// Name of the related entity.
-    #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    /// The actual type of the target instance when needed for disambiguation.
-    #[serde(rename = "@referredType", skip_serializing_if = "Option::is_none")]
-    pub at_referred_type: Option<String>,
     /// Hyperlink reference
     #[serde(rename = "href", skip_serializing_if = "Option::is_none")]
     pub href: Option<String>,
@@ -34,18 +28,24 @@ pub struct BarRef {
     /// When sub-classing, this defines the sub-class Extensible name
     #[serde(rename = "@type")]
     pub at_type: String,
+    /// Name of the related entity.
+    #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    /// The actual type of the target instance when needed for disambiguation.
+    #[serde(rename = "@referredType", skip_serializing_if = "Option::is_none")]
+    pub at_referred_type: Option<String>,
 }
 
 impl BarRef {
     pub fn new(at_type: String) -> BarRef {
         BarRef {
-            name: None,
-            at_referred_type: None,
             href: None,
             id: None,
             at_schema_location: None,
             at_base_type: None,
             at_type,
+            name: None,
+            at_referred_type: None,
         }
     }
 }

diff --git a/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs
@@ -11,18 +11,11 @@
 use crate::models;
 use serde::{Deserialize, Serialize};
 
-/// EntityRef : Entity reference schema to be use for all entityRef class.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(tag = "@type")]
 pub enum EntityRef {
     #[serde(rename="BarRef")]
     BarRef {
-        /// Name of the related entity.
-        #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
-        name: Option<String>,
-        /// The actual type of the target instance when needed for disambiguation.
-        #[serde(rename = "@referredType", skip_serializing_if = "Option::is_none")]
-        at_referred_type: Option<String>,
         /// Hyperlink reference
         #[serde(rename = "href", skip_serializing_if = "Option::is_none")]
         href: Option<String>,
@@ -35,15 +28,15 @@ pub enum EntityRef {
         /// When sub-classing, this defines the super-class
         #[serde(rename = "@baseType", skip_serializing_if = "Option::is_none")]
         at_base_type: Option<String>,
-    },
-    #[serde(rename="FooRef")]
-    FooRef {
         /// Name of the related entity.
         #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
         name: Option<String>,
         /// The actual type of the target instance when needed for disambiguation.
         #[serde(rename = "@referredType", skip_serializing_if = "Option::is_none")]
         at_referred_type: Option<String>,
+    },
+    #[serde(rename="FooRef")]
+    FooRef {
         /// Hyperlink reference
         #[serde(rename = "href", skip_serializing_if = "Option::is_none")]
         href: Option<String>,
@@ -56,18 +49,24 @@ pub enum EntityRef {
         /// When sub-classing, this defines the super-class
         #[serde(rename = "@baseType", skip_serializing_if = "Option::is_none")]
         at_base_type: Option<String>,
+        /// Name of the related entity.
+        #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
+        name: Option<String>,
+        /// The actual type of the target instance when needed for disambiguation.
+        #[serde(rename = "@referredType", skip_serializing_if = "Option::is_none")]
+        at_referred_type: Option<String>,
     },
 }
 
 impl Default for EntityRef {
     fn default() -> Self {
         Self::BarRef {
-            name: Default::default(),
-            at_referred_type: Default::default(),
             href: Default::default(),
             id: Default::default(),
             at_schema_location: Default::default(),
             at_base_type: Default::default(),
+            name: Default::default(),
+            at_referred_type: Default::default(),
         }
 
     }

diff --git a/samples/client/others/rust/hyper/oneOf/src/models/foo.rs b/samples/client/others/rust/hyper/oneOf/src/models/foo.rs
@@ -13,10 +13,6 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Foo {
-    #[serde(rename = "fooPropA", skip_serializing_if = "Option::is_none")]
-    pub foo_prop_a: Option<String>,
-    #[serde(rename = "fooPropB", skip_serializing_if = "Option::is_none")]
-    pub foo_prop_b: Option<String>,
     /// Hyperlink reference
     #[serde(rename = "href", skip_serializing_if = "Option::is_none")]
     pub href: Option<String>,
@@ -32,18 +28,22 @@ pub struct Foo {
     /// When sub-classing, this defines the sub-class Extensible name
     #[serde(rename = "@type")]
     pub at_type: String,
+    #[serde(rename = "fooPropA", skip_serializing_if = "Option::is_none")]
+    pub foo_prop_a: Option<String>,
+    #[serde(rename = "fooPropB", skip_serializing_if = "Option::is_none")]
+    pub foo_prop_b: Option<String>,
 }
 
 impl Foo {
     pub fn new(at_type: String) -> Foo {
         Foo {
-            foo_prop_a: None,
-            foo_prop_b: None,
             href: None,
             id: None,
             at_schema_location: None,
             at_base_type: None,
             at_type,
+            foo_prop_a: None,
+            foo_prop_b: None,
         }
     }
 }