handle composed schemas in InlineModelResolver (#2112)

* handle composed schemas in InlineModelResolver

* fix unit test -> TestUtils.parseSpec

* update samples

* fix samples

* update samples

* update samples

* add new files

.gitignore

@@ -39,6 +39,7 @@ packages/
 
 /target
 /generated-files
+test-output/
 nbactions.xml
 test-output/
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

@@ -312,6 +312,35 @@ public class InlineModelResolver {
         }
     }
 
+    private void flattenComposedChildren(OpenAPI openAPI, String key, List<Schema> children) {
+        if (children == null || children.isEmpty()) {
+            return;
+        }
+        ListIterator<Schema> listIterator = children.listIterator();
+        while (listIterator.hasNext()) {
+            Schema component = listIterator.next();
+            if (component instanceof ObjectSchema) {
+                ObjectSchema op = (ObjectSchema) component;
+                if (op.get$ref() == null && op.getProperties() != null && op.getProperties().size() > 0) {
+                    String innerModelName = resolveModelName(op.getTitle(), key);
+                    Schema innerModel = modelFromProperty(op, innerModelName);
+                    String existing = matchGenerated(innerModel);
+                    if (existing == null) {
+                        openAPI.getComponents().addSchemas(innerModelName, innerModel);
+                        addGenerated(innerModelName, innerModel);
+                        Schema schema = new Schema().$ref(innerModelName);
+                        schema.setRequired(op.getRequired());
+                        listIterator.set(schema);
+                    } else {
+                        Schema schema = new Schema().$ref(existing);
+                        schema.setRequired(op.getRequired());
+                        listIterator.set(schema);
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Flatten inline models in components
      *
@@ -326,7 +355,13 @@ public class InlineModelResolver {
         List<String> modelNames = new ArrayList<String>(models.keySet());
         for (String modelName : modelNames) {
             Schema model = models.get(modelName);
-            if (model instanceof Schema) {
+            if (ModelUtils.isComposedSchema(model)) {
+                ComposedSchema m = (ComposedSchema) model;
+                // inline child schemas
+                flattenComposedChildren(openAPI, modelName + "_allOf", m.getAllOf());
+                flattenComposedChildren(openAPI, modelName + "_anyOf", m.getAnyOf());
+                flattenComposedChildren(openAPI, modelName + "_oneOf", m.getOneOf());
+            } else if (model instanceof Schema) {
                 Schema m = (Schema) model;
                 Map<String, Schema> properties = m.getProperties();
                 flattenProperties(properties, modelName);
@@ -353,20 +388,6 @@ public class InlineModelResolver {
                         }
                     }
                 }
-            } else if (ModelUtils.isComposedSchema(model)) {
-                ComposedSchema m = (ComposedSchema) model;
-                if (m.getAllOf() != null && !m.getAllOf().isEmpty()) {
-                    Schema child = null;
-                    for (Schema component : m.getAllOf()) {
-                        if (component.get$ref() == null) {
-                            child = component;
-                        }
-                    }
-                    if (child != null) {
-                        Map<String, Schema> properties = child.getProperties();
-                        flattenProperties(properties, modelName);
-                    }
-                }
             }
         }
     }

modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

@@ -32,6 +32,7 @@ import org.testng.annotations.Test;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
 
 import static org.testng.AssertJUnit.*;
 
@@ -714,6 +715,30 @@ public class InlineModelResolverTest {
         assertNull(itemsProperty.getProperties());
     }
 
+
+    private void checkComposedChildren(OpenAPI openAPI, List<Schema> children, String key) {
+        assertNotNull(children);
+        Schema inlined = children.get(0);
+        assertEquals("#/components/schemas/ComposedObjectModelInline_" + key, inlined.get$ref());
+        Schema child = ModelUtils.getReferencedSchema(openAPI, inlined);
+        assertNotNull(child.getProperties());
+        assertNotNull(child.getProperties().get("composed_object_model_inline_" + key));
+    }
+
+    @Test
+    public void objectComposedWithInline() {
+        OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
+        new InlineModelResolver().flatten(openAPI);
+
+        assertTrue(openAPI.getComponents().getSchemas().get("ComposedObjectModelInline") instanceof ComposedSchema);
+
+        ComposedSchema schema = (ComposedSchema) openAPI.getComponents().getSchemas().get("ComposedObjectModelInline");
+
+        checkComposedChildren(openAPI, schema.getAllOf(), "allOf");
+        checkComposedChildren(openAPI, schema.getAnyOf(), "anyOf");
+        checkComposedChildren(openAPI, schema.getOneOf(), "oneOf");
+    }
+
     @Test
     public void arbitraryObjectModelWithArrayInlineWithTitle() {
         OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");

modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml

@@ -305,6 +305,31 @@ components:
             type: string
           city:
             type: string
+    ComposedObjectModelInline:
+      allOf:
+      - type: object
+        properties:
+          composed_object_model_inline_allOf:
+            type: object
+            properties:
+              prop1:
+                type: string
+      anyOf:
+      - type: object
+        properties:
+          composed_object_model_inline_anyOf:
+            type: object
+            properties:
+              prop1:
+                type: string
+      oneOf:
+      - type: object
+        properties:
+          composed_object_model_inline_oneOf:
+            type: object
+            properties:
+              prop1:
+                type: string
     ArbitraryObjectModelInline:
       type: object
       properties:

samples/client/petstore/csharp-netcore/OpenAPIClient/README.md

@@ -143,9 +143,11 @@ Class | Method | HTTP request | Description
  - [Model.ArrayTest](docs/ArrayTest.md)
  - [Model.Capitalization](docs/Capitalization.md)
  - [Model.Cat](docs/Cat.md)
+ - [Model.CatAllOf](docs/CatAllOf.md)
  - [Model.Category](docs/Category.md)
  - [Model.ClassModel](docs/ClassModel.md)
  - [Model.Dog](docs/Dog.md)
+ - [Model.DogAllOf](docs/DogAllOf.md)
  - [Model.EnumArrays](docs/EnumArrays.md)
  - [Model.EnumClass](docs/EnumClass.md)
  - [Model.EnumTest](docs/EnumTest.md)

samples/client/petstore/csharp-netcore/OpenAPIClient/docs/CatAllOf.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.CatAllOf
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Declawed** | **bool** |  | [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)
+

samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DogAllOf.md

@@ -0,0 +1,9 @@
+# Org.OpenAPITools.Model.DogAllOf
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Breed** | **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)
+

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs

@@ -0,0 +1,71 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing CatAllOf
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class CatAllOfTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for CatAllOf
+        //private CatAllOf instance;
+
+        public CatAllOfTests()
+        {
+            // TODO uncomment below to create an instance of CatAllOf
+            //instance = new CatAllOf();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of CatAllOf
+        /// </summary>
+        [Fact]
+        public void CatAllOfInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" CatAllOf
+            //Assert.IsInstanceOfType<CatAllOf> (instance, "variable 'instance' is a CatAllOf");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Declawed'
+        /// </summary>
+        [Fact]
+        public void DeclawedTest()
+        {
+            // TODO unit test for the property 'Declawed'
+        }
+
+    }
+
+}

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs

@@ -0,0 +1,71 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing DogAllOf
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class DogAllOfTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for DogAllOf
+        //private DogAllOf instance;
+
+        public DogAllOfTests()
+        {
+            // TODO uncomment below to create an instance of DogAllOf
+            //instance = new DogAllOf();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of DogAllOf
+        /// </summary>
+        [Fact]
+        public void DogAllOfInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" DogAllOf
+            //Assert.IsInstanceOfType<DogAllOf> (instance, "variable 'instance' is a DogAllOf");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Breed'
+        /// </summary>
+        [Fact]
+        public void BreedTest()
+        {
+            // TODO unit test for the property 'Breed'
+        }
+
+    }
+
+}

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs

@@ -0,0 +1,118 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// CatAllOf
+    /// </summary>
+    [DataContract]
+    public partial class CatAllOf :  IEquatable<CatAllOf>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CatAllOf" /> class.
+        /// </summary>
+        /// <param name="declawed">declawed.</param>
+        public CatAllOf(bool declawed = default(bool))
+        {
+            this.Declawed = declawed;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Declawed
+        /// </summary>
+        [DataMember(Name="declawed", EmitDefaultValue=false)]
+        public bool Declawed { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CatAllOf {\n");
+            sb.Append("  Declawed: ").Append(Declawed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input as CatAllOf).AreEqual;
+        }
+
+        /// <summary>
+        /// Returns true if CatAllOf instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CatAllOf to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CatAllOf input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual;
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Declawed != null)
+                    hashCode = hashCode * 59 + this.Declawed.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs

@@ -0,0 +1,118 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// DogAllOf
+    /// </summary>
+    [DataContract]
+    public partial class DogAllOf :  IEquatable<DogAllOf>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DogAllOf" /> class.
+        /// </summary>
+        /// <param name="breed">breed.</param>
+        public DogAllOf(string breed = default(string))
+        {
+            this.Breed = breed;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Breed
+        /// </summary>
+        [DataMember(Name="breed", EmitDefaultValue=false)]
+        public string Breed { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class DogAllOf {\n");
+            sb.Append("  Breed: ").Append(Breed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input as DogAllOf).AreEqual;
+        }
+
+        /// <summary>
+        /// Returns true if DogAllOf instances are equal
+        /// </summary>
+        /// <param name="input">Instance of DogAllOf to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(DogAllOf input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual;
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Breed != null)
+                    hashCode = hashCode * 59 + this.Breed.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/README.md

@@ -157,9 +157,11 @@ Class | Method | HTTP request | Description
  - [Model.ArrayTest](docs/ArrayTest.md)
  - [Model.Capitalization](docs/Capitalization.md)
  - [Model.Cat](docs/Cat.md)
+ - [Model.CatAllOf](docs/CatAllOf.md)
  - [Model.Category](docs/Category.md)
  - [Model.ClassModel](docs/ClassModel.md)
  - [Model.Dog](docs/Dog.md)
+ - [Model.DogAllOf](docs/DogAllOf.md)
  - [Model.EnumArrays](docs/EnumArrays.md)
  - [Model.EnumClass](docs/EnumClass.md)
  - [Model.EnumTest](docs/EnumTest.md)

samples/client/petstore/csharp/OpenAPIClient/docs/CatAllOf.md

@@ -0,0 +1,13 @@
+
+# Org.OpenAPITools.Model.CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Declawed** | **bool?** |  | [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)
+

samples/client/petstore/csharp/OpenAPIClient/docs/DogAllOf.md

@@ -0,0 +1,13 @@
+
+# Org.OpenAPITools.Model.DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Breed** | **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)
+

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/CatAllOfTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing CatAllOf
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class CatAllOfTests
+    {
+        // TODO uncomment below to declare an instance variable for CatAllOf
+        //private CatAllOf instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of CatAllOf
+            //instance = new CatAllOf();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of CatAllOf
+        /// </summary>
+        [Test]
+        public void CatAllOfInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" CatAllOf
+            //Assert.IsInstanceOfType<CatAllOf> (instance, "variable 'instance' is a CatAllOf");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Declawed'
+        /// </summary>
+        [Test]
+        public void DeclawedTest()
+        {
+            // TODO unit test for the property 'Declawed'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/DogAllOfTests.cs

@@ -0,0 +1,80 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing DogAllOf
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    [TestFixture]
+    public class DogAllOfTests
+    {
+        // TODO uncomment below to declare an instance variable for DogAllOf
+        //private DogAllOf instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of DogAllOf
+            //instance = new DogAllOf();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of DogAllOf
+        /// </summary>
+        [Test]
+        public void DogAllOfInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOfType" DogAllOf
+            //Assert.IsInstanceOfType<DogAllOf> (instance, "variable 'instance' is a DogAllOf");
+        }
+
+
+        /// <summary>
+        /// Test the property 'Breed'
+        /// </summary>
+        [Test]
+        public void BreedTest()
+        {
+            // TODO unit test for the property 'Breed'
+        }
+
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/CatAllOf.cs

@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// CatAllOf
+    /// </summary>
+    [DataContract]
+    public partial class CatAllOf :  IEquatable<CatAllOf>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CatAllOf" /> class.
+        /// </summary>
+        /// <param name="declawed">declawed.</param>
+        public CatAllOf(bool? declawed = default(bool?))
+        {
+            this.Declawed = declawed;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Declawed
+        /// </summary>
+        [DataMember(Name="declawed", EmitDefaultValue=false)]
+        public bool? Declawed { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class CatAllOf {\n");
+            sb.Append("  Declawed: ").Append(Declawed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as CatAllOf);
+        }
+
+        /// <summary>
+        /// Returns true if CatAllOf instances are equal
+        /// </summary>
+        /// <param name="input">Instance of CatAllOf to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(CatAllOf input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Declawed == input.Declawed ||
+                    (this.Declawed != null &&
+                    this.Declawed.Equals(input.Declawed))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Declawed != null)
+                    hashCode = hashCode * 59 + this.Declawed.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/DogAllOf.cs

@@ -0,0 +1,124 @@
+/* 
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// DogAllOf
+    /// </summary>
+    [DataContract]
+    public partial class DogAllOf :  IEquatable<DogAllOf>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DogAllOf" /> class.
+        /// </summary>
+        /// <param name="breed">breed.</param>
+        public DogAllOf(string breed = default(string))
+        {
+            this.Breed = breed;
+        }
+        
+        /// <summary>
+        /// Gets or Sets Breed
+        /// </summary>
+        [DataMember(Name="breed", EmitDefaultValue=false)]
+        public string Breed { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class DogAllOf {\n");
+            sb.Append("  Breed: ").Append(Breed).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+  
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return JsonConvert.SerializeObject(this, Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as DogAllOf);
+        }
+
+        /// <summary>
+        /// Returns true if DogAllOf instances are equal
+        /// </summary>
+        /// <param name="input">Instance of DogAllOf to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(DogAllOf input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Breed == input.Breed ||
+                    (this.Breed != null &&
+                    this.Breed.Equals(input.Breed))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Breed != null)
+                    hashCode = hashCode * 59 + this.Breed.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged/src/Org.OpenAPITools/Model/AdditionalPropertiesClass.cs

@@ -184,49 +184,41 @@ namespace Org.OpenAPITools.Model
                 (
                     this.MapString == input.MapString ||
                     this.MapString != null &&
-                    input.MapString != null &&
                     this.MapString.SequenceEqual(input.MapString)
                 ) && 
                 (
                     this.MapNumber == input.MapNumber ||
                     this.MapNumber != null &&
-                    input.MapNumber != null &&
                     this.MapNumber.SequenceEqual(input.MapNumber)
                 ) && 
                 (
                     this.MapInteger == input.MapInteger ||
                     this.MapInteger != null &&
-                    input.MapInteger != null &&
                     this.MapInteger.SequenceEqual(input.MapInteger)
                 ) && 
                 (
                     this.MapBoolean == input.MapBoolean ||
                     this.MapBoolean != null &&
-                    input.MapBoolean != null &&
                     this.MapBoolean.SequenceEqual(input.MapBoolean)
                 ) && 
                 (
                     this.MapArrayInteger == input.MapArrayInteger ||
                     this.MapArrayInteger != null &&
-                    input.MapArrayInteger != null &&
                     this.MapArrayInteger.SequenceEqual(input.MapArrayInteger)
                 ) && 
                 (
                     this.MapArrayAnytype == input.MapArrayAnytype ||
                     this.MapArrayAnytype != null &&
-                    input.MapArrayAnytype != null &&
                     this.MapArrayAnytype.SequenceEqual(input.MapArrayAnytype)
                 ) && 
                 (
                     this.MapMapString == input.MapMapString ||
                     this.MapMapString != null &&
-                    input.MapMapString != null &&
                     this.MapMapString.SequenceEqual(input.MapMapString)
                 ) && 
                 (
                     this.MapMapAnytype == input.MapMapAnytype ||
                     this.MapMapAnytype != null &&
-                    input.MapMapAnytype != null &&
                     this.MapMapAnytype.SequenceEqual(input.MapMapAnytype)
                 ) && 
                 (

samples/client/petstore/elixir/lib/openapi_petstore/model/cat_all_of.ex

@@ -0,0 +1,25 @@
+# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+# https://openapi-generator.tech
+# Do not edit the class manually.
+
+defmodule OpenapiPetstore.Model.CatAllOf do
+  @moduledoc """
+  
+  """
+
+  @derive [Poison.Encoder]
+  defstruct [
+    :"declawed"
+  ]
+
+  @type t :: %__MODULE__{
+    :"declawed" => boolean() | nil
+  }
+end
+
+defimpl Poison.Decoder, for: OpenapiPetstore.Model.CatAllOf do
+  def decode(value, _options) do
+    value
+  end
+end
+

samples/client/petstore/elixir/lib/openapi_petstore/model/dog_all_of.ex

@@ -0,0 +1,25 @@
+# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+# https://openapi-generator.tech
+# Do not edit the class manually.
+
+defmodule OpenapiPetstore.Model.DogAllOf do
+  @moduledoc """
+  
+  """
+
+  @derive [Poison.Encoder]
+  defstruct [
+    :"breed"
+  ]
+
+  @type t :: %__MODULE__{
+    :"breed" => String.t | nil
+  }
+end
+
+defimpl Poison.Decoder, for: OpenapiPetstore.Model.DogAllOf do
+  def decode(value, _options) do
+    value
+  end
+end
+

samples/client/petstore/go/go-petstore/README.md

@@ -87,10 +87,12 @@ Class | Method | HTTP request | Description
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)

samples/client/petstore/go/go-petstore/api/openapi.yaml

@@ -1363,17 +1363,11 @@ components:
     Dog:
       allOf:
       - $ref: '#/components/schemas/Animal'
-      - properties:
-          breed:
-            type: string
-        type: object
+      - $ref: '#/components/schemas/Dog_allOf'
     Cat:
       allOf:
       - $ref: '#/components/schemas/Animal'
-      - properties:
-          declawed:
-            type: boolean
-        type: object
+      - $ref: '#/components/schemas/Cat_allOf'
     Animal:
       discriminator:
         propertyName: className
@@ -2022,6 +2016,14 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    Dog_allOf:
+      properties:
+        breed:
+          type: string
+    Cat_allOf:
+      properties:
+        declawed:
+          type: boolean
   securitySchemes:
     petstore_auth:
       flows:

samples/client/petstore/go/go-petstore/docs/CatAllOf.md

@@ -0,0 +1,11 @@
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Declawed** | **bool** |  | [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)
+
+

samples/client/petstore/go/go-petstore/docs/DogAllOf.md

@@ -0,0 +1,11 @@
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Breed** | **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)
+
+

samples/client/petstore/go/go-petstore/model_cat_all_of.go

@@ -0,0 +1,14 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * API version: 1.0.0
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
+ */
+
+package petstore
+
+type CatAllOf struct {
+	Declawed bool `json:"declawed,omitempty"`
+}

samples/client/petstore/go/go-petstore/model_dog_all_of.go

@@ -0,0 +1,14 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * API version: 1.0.0
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
+ */
+
+package petstore
+
+type DogAllOf struct {
+	Breed string `json:"breed,omitempty"`
+}

samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/Model.hs

@@ -723,6 +723,34 @@ mkCat catClassName =
   , catDeclawed = Nothing
   }
 
+-- ** CatAllOf
+-- | CatAllOf
+data CatAllOf = CatAllOf
+  { catAllOfDeclawed :: !(Maybe Bool) -- ^ "declawed"
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON CatAllOf
+instance A.FromJSON CatAllOf where
+  parseJSON = A.withObject "CatAllOf" $ \o ->
+    CatAllOf
+      <$> (o .:? "declawed")
+
+-- | ToJSON CatAllOf
+instance A.ToJSON CatAllOf where
+  toJSON CatAllOf {..} =
+   _omitNulls
+      [ "declawed" .= catAllOfDeclawed
+      ]
+
+
+-- | Construct a value of type 'CatAllOf' (by applying it's required fields, if any)
+mkCatAllOf
+  :: CatAllOf
+mkCatAllOf =
+  CatAllOf
+  { catAllOfDeclawed = Nothing
+  }
+
 -- ** Category
 -- | Category
 data Category = Category
@@ -850,6 +878,34 @@ mkDog dogClassName =
   , dogBreed = Nothing
   }
 
+-- ** DogAllOf
+-- | DogAllOf
+data DogAllOf = DogAllOf
+  { dogAllOfBreed :: !(Maybe Text) -- ^ "breed"
+  } deriving (P.Show, P.Eq, P.Typeable)
+
+-- | FromJSON DogAllOf
+instance A.FromJSON DogAllOf where
+  parseJSON = A.withObject "DogAllOf" $ \o ->
+    DogAllOf
+      <$> (o .:? "breed")
+
+-- | ToJSON DogAllOf
+instance A.ToJSON DogAllOf where
+  toJSON DogAllOf {..} =
+   _omitNulls
+      [ "breed" .= dogAllOfBreed
+      ]
+
+
+-- | Construct a value of type 'DogAllOf' (by applying it's required fields, if any)
+mkDogAllOf
+  :: DogAllOf
+mkDogAllOf =
+  DogAllOf
+  { dogAllOfBreed = Nothing
+  }
+
 -- ** EnumArrays
 -- | EnumArrays
 data EnumArrays = EnumArrays

samples/client/petstore/haskell-http-client/lib/OpenAPIPetstore/ModelLens.hs

@@ -281,6 +281,15 @@ catDeclawedL f Cat{..} = (\catDeclawed -> Cat { catDeclawed, ..} ) <$> f catDecl
 
 
 
+-- * CatAllOf
+
+-- | 'catAllOfDeclawed' Lens
+catAllOfDeclawedL :: Lens_' CatAllOf (Maybe Bool)
+catAllOfDeclawedL f CatAllOf{..} = (\catAllOfDeclawed -> CatAllOf { catAllOfDeclawed, ..} ) <$> f catAllOfDeclawed
+{-# INLINE catAllOfDeclawedL #-}
+
+
+
 -- * Category
 
 -- | 'categoryId' Lens
@@ -332,6 +341,15 @@ dogBreedL f Dog{..} = (\dogBreed -> Dog { dogBreed, ..} ) <$> f dogBreed
 
 
 
+-- * DogAllOf
+
+-- | 'dogAllOfBreed' Lens
+dogAllOfBreedL :: Lens_' DogAllOf (Maybe Text)
+dogAllOfBreedL f DogAllOf{..} = (\dogAllOfBreed -> DogAllOf { dogAllOfBreed, ..} ) <$> f dogAllOfBreed
+{-# INLINE dogAllOfBreedL #-}
+
+
+
 -- * EnumArrays
 
 -- | 'enumArraysJustSymbol' Lens

samples/client/petstore/haskell-http-client/openapi.yaml

@@ -1363,17 +1363,11 @@ components:
     Dog:
       allOf:
       - $ref: '#/components/schemas/Animal'
-      - properties:
-          breed:
-            type: string
-        type: object
+      - $ref: '#/components/schemas/Dog_allOf'
     Cat:
       allOf:
       - $ref: '#/components/schemas/Animal'
-      - properties:
-          declawed:
-            type: boolean
-        type: object
+      - $ref: '#/components/schemas/Cat_allOf'
     Animal:
       discriminator:
         propertyName: className
@@ -2022,6 +2016,14 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    Dog_allOf:
+      properties:
+        breed:
+          type: string
+    Cat_allOf:
+      properties:
+        declawed:
+          type: boolean
   securitySchemes:
     petstore_auth:
       flows:

samples/client/petstore/haskell-http-client/tests/Instances.hs

@@ -246,6 +246,14 @@ genCat n =
     <*> arbitraryReducedMaybe n -- catColor :: Maybe Text
     <*> arbitraryReducedMaybe n -- catDeclawed :: Maybe Bool
   
+instance Arbitrary CatAllOf where
+  arbitrary = sized genCatAllOf
+
+genCatAllOf :: Int -> Gen CatAllOf
+genCatAllOf n =
+  CatAllOf
+    <$> arbitraryReducedMaybe n -- catAllOfDeclawed :: Maybe Bool
+  
 instance Arbitrary Category where
   arbitrary = sized genCategory
 
@@ -281,6 +289,14 @@ genDog n =
     <*> arbitraryReducedMaybe n -- dogColor :: Maybe Text
     <*> arbitraryReducedMaybe n -- dogBreed :: Maybe Text
   
+instance Arbitrary DogAllOf where
+  arbitrary = sized genDogAllOf
+
+genDogAllOf :: Int -> Gen DogAllOf
+genDogAllOf n =
+  DogAllOf
+    <$> arbitraryReducedMaybe n -- dogAllOfBreed :: Maybe Text
+  
 instance Arbitrary EnumArrays where
   arbitrary = sized genEnumArrays
 

samples/client/petstore/haskell-http-client/tests/Test.hs

@@ -35,10 +35,12 @@ main =
       propMimeEq MimeJSON (Proxy :: Proxy ArrayTest)
       propMimeEq MimeJSON (Proxy :: Proxy Capitalization)
       propMimeEq MimeJSON (Proxy :: Proxy Cat)
+      propMimeEq MimeJSON (Proxy :: Proxy CatAllOf)
       propMimeEq MimeJSON (Proxy :: Proxy Category)
       propMimeEq MimeJSON (Proxy :: Proxy ClassModel)
       propMimeEq MimeJSON (Proxy :: Proxy Client)
       propMimeEq MimeJSON (Proxy :: Proxy Dog)
+      propMimeEq MimeJSON (Proxy :: Proxy DogAllOf)
       propMimeEq MimeJSON (Proxy :: Proxy EnumArrays)
       propMimeEq MimeJSON (Proxy :: Proxy EnumClass)
       propMimeEq MimeJSON (Proxy :: Proxy EnumTest)

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/feign/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/feign10x/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/google-api-client/docs/CatAllOf.md

@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/google-api-client/docs/DogAllOf.md

@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/jersey1/docs/CatAllOf.md

@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/docs/DogAllOf.md

@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/jersey2-java6/docs/CatAllOf.md

@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey2-java6/docs/DogAllOf.md

@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,89 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.apache.commons.lang3.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean isDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return ObjectUtils.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java

@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,89 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.apache.commons.lang3.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return ObjectUtils.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/jersey2-java6/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/jersey2-java8/docs/CatAllOf.md

@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey2-java8/docs/DogAllOf.md

@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/jersey2/docs/CatAllOf.md

@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey2/docs/DogAllOf.md

@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java

@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md

@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md

@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 import android.os.Parcelable;
 import android.os.Parcel;
 

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,119 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import android.os.Parcelable;
+import android.os.Parcel;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf implements Parcelable {
+  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
+  @SerializedName(SERIALIZED_NAME_DECLAWED)
+  private Boolean declawed;
+
+  public CatAllOf() {
+  }
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+
+  public void writeToParcel(Parcel out, int flags) {
+    out.writeValue(declawed);
+  }
+
+  CatAllOf(Parcel in) {
+    declawed = (Boolean)in.readValue(null);
+  }
+
+  public int describeContents() {
+    return 0;
+  }
+
+  public static final Parcelable.Creator<CatAllOf> CREATOR = new Parcelable.Creator<CatAllOf>() {
+    public CatAllOf createFromParcel(Parcel in) {
+      return new CatAllOf(in);
+    }
+    public CatAllOf[] newArray(int size) {
+      return new CatAllOf[size];
+    }
+  };
+}
+

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 import android.os.Parcelable;
 import android.os.Parcel;
 

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,119 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import android.os.Parcelable;
+import android.os.Parcel;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf implements Parcelable {
+  public static final String SERIALIZED_NAME_BREED = "breed";
+  @SerializedName(SERIALIZED_NAME_BREED)
+  private String breed;
+
+  public DogAllOf() {
+  }
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+
+  public void writeToParcel(Parcel out, int flags) {
+    out.writeValue(breed);
+  }
+
+  DogAllOf(Parcel in) {
+    breed = (String)in.readValue(null);
+  }
+
+  public int describeContents() {
+    return 0;
+  }
+
+  public static final Parcelable.Creator<DogAllOf> CREATOR = new Parcelable.Creator<DogAllOf>() {
+    public DogAllOf createFromParcel(Parcel in) {
+      return new DogAllOf(in);
+    }
+    public DogAllOf[] newArray(int size) {
+      return new DogAllOf[size];
+    }
+  };
+}
+

samples/client/petstore/java/okhttp-gson-parcelableModel/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/okhttp-gson-parcelableModel/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}

samples/client/petstore/java/okhttp-gson/docs/CatAllOf.md

@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+

samples/client/petstore/java/okhttp-gson/docs/DogAllOf.md

@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
 
 /**
  * Cat

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java

@@ -0,0 +1,94 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  public static final String SERIALIZED_NAME_DECLAWED = "declawed";
+  @SerializedName(SERIALIZED_NAME_DECLAWED)
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
 
 /**
  * Dog

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java

@@ -0,0 +1,94 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  public static final String SERIALIZED_NAME_BREED = "breed";
+  @SerializedName(SERIALIZED_NAME_BREED)
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/CatAllOfTest.java

@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/DogAllOfTest.java

@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}