Add AnyType support to Java generators (#6246)

* add anytype support to java * fix test * fix primitive type * update tests * update samples
2020-05-11 15:27:03 +08:00
parent 779b176648
commit 4effa739eb
72 changed files with 221 additions and 264 deletions
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -3110,9 +3110,15 @@ public class DefaultCodegen implements CodegenConfig {
        } else if (ModelUtils.isFreeFormObject(p)) {
            property.isFreeFormObject = true;
            property.baseType = getSchemaType(p);
+            if (languageSpecificPrimitives.contains(property.dataType)) {
+                property.isPrimitiveType = true;
+            }
        } else if (ModelUtils.isAnyTypeSchema(p)) {
            property.isAnyType = true;
            property.baseType = getSchemaType(p);
+            if (languageSpecificPrimitives.contains(property.dataType)) {
+                property.isPrimitiveType = true;
+            }
        } else { // model
            setNonArrayMapProperty(property, type);
            Schema refOrCurrent = ModelUtils.getReferencedSchema(this.openAPI, p);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -23,11 +23,8 @@ import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
-import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
-import java.time.LocalDate;
-import java.time.ZoneId;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -38,6 +35,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.io.File;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.regex.Pattern;

@@ -82,7 +81,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
    protected String licenseUrl = "http://unlicense.org";
    protected String projectFolder = "src/main";
    protected String projectTestFolder = "src/test";
-    protected String sourceFolder = projectFolder + File.separator +"java";
+    protected String sourceFolder = projectFolder + File.separator + "java";
    protected String testFolder = projectTestFolder + "/java";
    protected boolean fullJavaUtil;
    protected boolean discriminatorCaseSensitive = true; // True if the discriminator value lookup should be case-sensitive.
@@ -169,6 +168,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
        instantiationTypes.put("map", "HashMap");
        typeMapping.put("date", "Date");
        typeMapping.put("file", "File");
+        typeMapping.put("AnyType", "Object");

        cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
        cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
@@ -843,12 +843,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
        } else if (ModelUtils.isStringSchema(schema)) {
            if (schema.getDefault() != null) {
                String _default;
-                if (schema.getDefault() instanceof Date){
+                if (schema.getDefault() instanceof Date) {
                    Date date = (Date) schema.getDefault();
                    LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
                    return String.format(Locale.ROOT, localDate.toString(), "");
-                }
-                else{
+                } else {
                    _default = (String) schema.getDefault();
                }
                if (schema.getEnum() == null) {
@@ -1113,7 +1112,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
        }

        // TODO: Setting additionalProperties is not the responsibility of this method. These side-effects should be moved elsewhere to prevent unexpected behaviors.
-        if(artifactVersion == null) {
+        if (artifactVersion == null) {
            // If no artifactVersion is provided in additional properties, version from API specification is used.
            // If none of them is provided then fallbacks to default version
            if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION) && additionalProperties.get(CodegenConstants.ARTIFACT_VERSION) != null) {
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -544,7 +544,7 @@ public class JavaClientCodegenTest {
        codegen.setOpenAPI(openAPI);
        CodegenModel cm1 = codegen.fromModel("MapTest1", test1);
        Assert.assertEquals(cm1.getDataType(), "Map");
-        Assert.assertEquals(cm1.getParent(), "HashMap<String, oas_any_type_not_mapped>");
+        Assert.assertEquals(cm1.getParent(), "HashMap<String, Object>");
        Assert.assertEquals(cm1.getClassname(), "MapTest1");

        Schema test2 = openAPI.getComponents().getSchemas().get("MapTest2");
@@ -683,29 +683,29 @@ public class JavaClientCodegenTest {

        final CodegenProperty property1 = cm1.allVars.get(0);
        Assert.assertEquals(property1.baseName, "any_value");
-        Assert.assertEquals(property1.dataType, "oas_any_type_not_mapped");
+        Assert.assertEquals(property1.dataType, "Object");
        Assert.assertTrue(property1.hasMore);
-        Assert.assertFalse(property1.isPrimitiveType);
+        Assert.assertTrue(property1.isPrimitiveType);
        Assert.assertFalse(property1.isContainer);
        Assert.assertFalse(property1.isFreeFormObject);
        Assert.assertTrue(property1.isAnyType);

        final CodegenProperty property2 = cm1.allVars.get(1);
        Assert.assertEquals(property2.baseName, "any_value_with_desc");
-        Assert.assertEquals(property2.dataType, "oas_any_type_not_mapped");
+        Assert.assertEquals(property2.dataType, "Object");
        Assert.assertTrue(property2.hasMore);
        Assert.assertFalse(property2.required);
-        Assert.assertFalse(property2.isPrimitiveType);
+        Assert.assertTrue(property2.isPrimitiveType);
        Assert.assertFalse(property2.isContainer);
        Assert.assertFalse(property2.isFreeFormObject);
        Assert.assertTrue(property2.isAnyType);

        final CodegenProperty property3 = cm1.allVars.get(2);
        Assert.assertEquals(property3.baseName, "any_value_nullable");
-        Assert.assertEquals(property3.dataType, "oas_any_type_not_mapped");
+        Assert.assertEquals(property3.dataType, "Object");
        Assert.assertFalse(property3.hasMore);
        Assert.assertFalse(property3.required);
-        Assert.assertFalse(property3.isPrimitiveType);
+        Assert.assertTrue(property3.isPrimitiveType);
        Assert.assertFalse(property3.isContainer);
        Assert.assertFalse(property3.isFreeFormObject);
        Assert.assertTrue(property3.isAnyType);
@@ -717,30 +717,30 @@ public class JavaClientCodegenTest {

        final CodegenProperty cp1 = cm2.vars.get(0);
        Assert.assertEquals(cp1.baseName, "any_value");
-        Assert.assertEquals(cp1.dataType, "oas_any_type_not_mapped");
+        Assert.assertEquals(cp1.dataType, "Object");
        Assert.assertTrue(cp1.hasMore);
        Assert.assertFalse(cp1.required);
-        Assert.assertFalse(cp1.isPrimitiveType);
+        Assert.assertTrue(cp1.isPrimitiveType);
        Assert.assertFalse(cp1.isContainer);
        Assert.assertFalse(cp1.isFreeFormObject);
        Assert.assertTrue(cp1.isAnyType);

        final CodegenProperty cp2 = cm2.vars.get(1);
        Assert.assertEquals(cp2.baseName, "any_value_with_desc");
-        Assert.assertEquals(cp2.dataType, "oas_any_type_not_mapped");
+        Assert.assertEquals(cp2.dataType, "Object");
        Assert.assertTrue(cp2.hasMore);
        Assert.assertFalse(cp2.required);
-        Assert.assertFalse(cp2.isPrimitiveType);
+        Assert.assertTrue(cp2.isPrimitiveType);
        Assert.assertFalse(cp2.isContainer);
        Assert.assertFalse(cp2.isFreeFormObject);
        Assert.assertTrue(cp2.isAnyType);

        final CodegenProperty cp3 = cm2.vars.get(2);
        Assert.assertEquals(cp3.baseName, "any_value_nullable");
-        Assert.assertEquals(cp3.dataType, "oas_any_type_not_mapped");
+        Assert.assertEquals(cp3.dataType, "Object");
        Assert.assertTrue(cp3.hasMore);
        Assert.assertFalse(cp3.required);
-        Assert.assertFalse(cp3.isPrimitiveType);
+        Assert.assertTrue(cp3.isPrimitiveType);
        Assert.assertFalse(cp3.isContainer);
        Assert.assertFalse(cp3.isFreeFormObject);
        Assert.assertTrue(cp3.isAnyType);
@@ -748,10 +748,10 @@ public class JavaClientCodegenTest {
        // map
        final CodegenProperty cp4 = cm2.vars.get(3);
        Assert.assertEquals(cp4.baseName, "map_any_value");
-        Assert.assertEquals(cp4.dataType, "Map<String, oas_any_type_not_mapped>");
+        Assert.assertEquals(cp4.dataType, "Map<String, Object>");
        Assert.assertTrue(cp4.hasMore);
        Assert.assertFalse(cp4.required);
-        Assert.assertFalse(cp4.isPrimitiveType);
+        Assert.assertTrue(cp4.isPrimitiveType);
        Assert.assertTrue(cp4.isContainer);
        Assert.assertTrue(cp4.isMapContainer);
        Assert.assertTrue(cp4.isFreeFormObject);
@@ -759,10 +759,10 @@ public class JavaClientCodegenTest {

        final CodegenProperty cp5 = cm2.vars.get(4);
        Assert.assertEquals(cp5.baseName, "map_any_value_with_desc");
-        Assert.assertEquals(cp5.dataType, "Map<String, oas_any_type_not_mapped>");
+        Assert.assertEquals(cp5.dataType, "Map<String, Object>");
        Assert.assertTrue(cp5.hasMore);
        Assert.assertFalse(cp5.required);
-        Assert.assertFalse(cp5.isPrimitiveType);
+        Assert.assertTrue(cp5.isPrimitiveType);
        Assert.assertTrue(cp5.isContainer);
        Assert.assertTrue(cp5.isMapContainer);
        Assert.assertTrue(cp5.isFreeFormObject);
@@ -770,10 +770,10 @@ public class JavaClientCodegenTest {

        final CodegenProperty cp6 = cm2.vars.get(5);
        Assert.assertEquals(cp6.baseName, "map_any_value_nullable");
-        Assert.assertEquals(cp6.dataType, "Map<String, oas_any_type_not_mapped>");
+        Assert.assertEquals(cp6.dataType, "Map<String, Object>");
        Assert.assertTrue(cp6.hasMore);
        Assert.assertFalse(cp6.required);
-        Assert.assertFalse(cp6.isPrimitiveType);
+        Assert.assertTrue(cp6.isPrimitiveType);
        Assert.assertTrue(cp6.isContainer);
        Assert.assertTrue(cp6.isMapContainer);
        Assert.assertTrue(cp6.isFreeFormObject);
@@ -782,10 +782,10 @@ public class JavaClientCodegenTest {
        // array
        final CodegenProperty cp7 = cm2.vars.get(6);
        Assert.assertEquals(cp7.baseName, "array_any_value");
-        Assert.assertEquals(cp7.dataType, "List<oas_any_type_not_mapped>");
+        Assert.assertEquals(cp7.dataType, "List<Object>");
        Assert.assertTrue(cp7.hasMore);
        Assert.assertFalse(cp7.required);
-        Assert.assertFalse(cp7.isPrimitiveType);
+        Assert.assertTrue(cp7.isPrimitiveType);
        Assert.assertTrue(cp7.isContainer);
        Assert.assertTrue(cp7.isListContainer);
        Assert.assertFalse(cp7.isFreeFormObject);
@@ -793,10 +793,10 @@ public class JavaClientCodegenTest {

        final CodegenProperty cp8 = cm2.vars.get(7);
        Assert.assertEquals(cp8.baseName, "array_any_value_with_desc");
-        Assert.assertEquals(cp8.dataType, "List<oas_any_type_not_mapped>");
+        Assert.assertEquals(cp8.dataType, "List<Object>");
        Assert.assertTrue(cp8.hasMore);
        Assert.assertFalse(cp8.required);
-        Assert.assertFalse(cp8.isPrimitiveType);
+        Assert.assertTrue(cp8.isPrimitiveType);
        Assert.assertTrue(cp8.isContainer);
        Assert.assertTrue(cp8.isListContainer);
        Assert.assertFalse(cp8.isFreeFormObject);
@@ -804,10 +804,10 @@ public class JavaClientCodegenTest {

        final CodegenProperty cp9 = cm2.vars.get(8);
        Assert.assertEquals(cp9.baseName, "array_any_value_nullable");
-        Assert.assertEquals(cp9.dataType, "List<oas_any_type_not_mapped>");
+        Assert.assertEquals(cp9.dataType, "List<Object>");
        Assert.assertFalse(cp9.hasMore);
        Assert.assertFalse(cp9.required);
-        Assert.assertFalse(cp9.isPrimitiveType);
+        Assert.assertTrue(cp9.isPrimitiveType);
        Assert.assertTrue(cp9.isContainer);
        Assert.assertTrue(cp9.isListContainer);
        Assert.assertFalse(cp9.isFreeFormObject);
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md
@@ -11,9 +11,9 @@ Name | Type | Description | Notes
 **MapArrayAnytype** | **Dictionary&lt;string, List&lt;Object&gt;&gt;** |  | [optional] 
 **MapMapString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapMapAnytype** | **Dictionary&lt;string, Dictionary&lt;string, Object&gt;&gt;** |  | [optional] 
-**Anytype1** | [**Object**](.md) |  | [optional] 
-**Anytype2** | [**Object**](.md) |  | [optional] 
-**Anytype3** | [**Object**](.md) |  | [optional] 
+**Anytype1** | **Object** |  | [optional] 
+**Anytype2** | **Object** |  | [optional] 
+**Anytype3** | **Object** |  | [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)

--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
@@ -11,9 +11,9 @@ Name | Type | Description | Notes
 **MapArrayAnytype** | **Dictionary&lt;string, List&lt;Object&gt;&gt;** |  | [optional] 
 **MapMapString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapMapAnytype** | **Dictionary&lt;string, Dictionary&lt;string, Object&gt;&gt;** |  | [optional] 
-**Anytype1** | [**Object**](.md) |  | [optional] 
-**Anytype2** | [**Object**](.md) |  | [optional] 
-**Anytype3** | [**Object**](.md) |  | [optional] 
+**Anytype1** | **Object** |  | [optional] 
+**Anytype2** | **Object** |  | [optional] 
+**Anytype3** | **Object** |  | [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)

--- a/samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md
@@ -13,9 +13,9 @@ Name | Type | Description | Notes
 **MapArrayAnytype** | **Dictionary&lt;string, List&lt;Object&gt;&gt;** |  | [optional] 
 **MapMapString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
 **MapMapAnytype** | **Dictionary&lt;string, Dictionary&lt;string, Object&gt;&gt;** |  | [optional] 
-**Anytype1** | [**Object**](.md) |  | [optional] 
-**Anytype2** | [**Object**](.md) |  | [optional] 
-**Anytype3** | [**Object**](.md) |  | [optional] 
+**Anytype1** | **Object** |  | [optional] 
+**Anytype2** | **Object** |  | [optional] 
+**Anytype3** | **Object** |  | [optional] 

 [[Back to Model list]](../README.md#documentation-for-models)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
--- a/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex
@@ -38,12 +38,8 @@ defmodule OpenapiPetstore.Model.AdditionalPropertiesClass do
 end

 defimpl Poison.Decoder, for: OpenapiPetstore.Model.AdditionalPropertiesClass do
-  import OpenapiPetstore.Deserializer
-  def decode(value, options) do
+  def decode(value, _options) do
    value
-    |> deserialize(:"anytype_1", :struct, OpenapiPetstore.Model.Map, options)
-    |> deserialize(:"anytype_2", :struct, OpenapiPetstore.Model.Map, options)
-    |> deserialize(:"anytype_3", :struct, OpenapiPetstore.Model.Map, options)
  end
 end

--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesClass.md
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
 **MapArrayAnytype** | Pointer to [**map[string][]map[string]interface{}**](array.md) |  | [optional] 
 **MapMapString** | Pointer to [**map[string]map[string]string**](map.md) |  | [optional] 
 **MapMapAnytype** | Pointer to [**map[string]map[string]map[string]interface{}**](map.md) |  | [optional] 
-**Anytype1** | Pointer to [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype2** | Pointer to [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype3** | Pointer to [**map[string]interface{}**](.md) |  | [optional] 
+**Anytype1** | Pointer to **map[string]interface{}** |  | [optional] 
+**Anytype2** | Pointer to **map[string]interface{}** |  | [optional] 
+**Anytype3** | Pointer to **map[string]interface{}** |  | [optional] 

 ## Methods

--- a/samples/client/petstore/go/go-petstore-withXml/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/go/go-petstore-withXml/docs/AdditionalPropertiesClass.md
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
 **MapArrayAnytype** | [**map[string][]map[string]interface{}**](array.md) |  | [optional] 
 **MapMapString** | [**map[string]map[string]string**](map.md) |  | [optional] 
 **MapMapAnytype** | [**map[string]map[string]map[string]interface{}**](map.md) |  | [optional] 
-**Anytype1** | [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype2** | [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype3** | [**map[string]interface{}**](.md) |  | [optional] 
+**Anytype1** | **map[string]interface{}** |  | [optional] 
+**Anytype2** | **map[string]interface{}** |  | [optional] 
+**Anytype3** | **map[string]interface{}** |  | [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)

--- a/samples/client/petstore/go/go-petstore/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/go/go-petstore/docs/AdditionalPropertiesClass.md
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
 **MapArrayAnytype** | [**map[string][]map[string]interface{}**](array.md) |  | [optional] 
 **MapMapString** | [**map[string]map[string]string**](map.md) |  | [optional] 
 **MapMapAnytype** | [**map[string]map[string]map[string]interface{}**](map.md) |  | [optional] 
-**Anytype1** | [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype2** | [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype3** | [**map[string]interface{}**](.md) |  | [optional] 
+**Anytype1** | **map[string]interface{}** |  | [optional] 
+**Anytype2** | **map[string]interface{}** |  | [optional] 
+**Anytype3** | **map[string]interface{}** |  | [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)

--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/jersey2-experimental/.openapi-generator/VERSION
+++ b/samples/client/petstore/java/jersey2-experimental/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
+5.0.0-SNAPSHOT
--- a/samples/client/petstore/java/jersey2-experimental/README.md
+++ b/samples/client/petstore/java/jersey2-experimental/README.md
@@ -1,4 +1,4 @@
-# petstore-jersey2
+# petstore-jersey2-exp

 OpenAPI Petstore

@@ -39,7 +39,7 @@ Add this dependency to your project's POM:
 ```xml
 <dependency>
  <groupId>org.openapitools</groupId>
-  <artifactId>petstore-jersey2</artifactId>
+  <artifactId>petstore-jersey2-exp</artifactId>
  <version>1.0.0</version>
  <scope>compile</scope>
 </dependency>
@@ -50,7 +50,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:

 ```groovy
-compile "org.openapitools:petstore-jersey2:1.0.0"
+compile "org.openapitools:petstore-jersey2-exp:1.0.0"
 ```

 ### Others
@@ -63,7 +63,7 @@ mvn clean package

 Then manually install the following JARs:

- `target/petstore-jersey2-1.0.0.jar`
+- `target/petstore-jersey2-exp-1.0.0.jar`
 - `target/lib/*.jar`

 ## Getting Started
@@ -84,9 +84,9 @@ public class AnotherFakeApiExample {
        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
        
        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-        Client body = new Client(); // Client | client model
+        Client client = new Client(); // Client | client model
        try {
-            Client result = apiInstance.call123testSpecialTags(body);
+            Client result = apiInstance.call123testSpecialTags(client);
            System.out.println(result);
        } catch (ApiException e) {
            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
@@ -107,7 +107,9 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
-*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
+*DefaultApi* | [**fooGet**](docs/DefaultApi.md#fooGet) | **GET** /foo | 
+*FakeApi* | [**fakeHealthGet**](docs/FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
+*FakeApi* | [**fakeHttpSignatureTest**](docs/FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
 *FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
@@ -147,20 +149,11 @@ Class | Method | HTTP request | Description

 ## Documentation for Models

- - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
- - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
- - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
 - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
- - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
- - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
- - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
- - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
 - [Animal](docs/Animal.md)
 - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
 - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
 - [ArrayTest](docs/ArrayTest.md)
- - [BigCat](docs/BigCat.md)
- - [BigCatAllOf](docs/BigCatAllOf.md)
 - [Capitalization](docs/Capitalization.md)
 - [Cat](docs/Cat.md)
 - [CatAllOf](docs/CatAllOf.md)
@@ -173,26 +166,36 @@ Class | Method | HTTP request | Description
 - [EnumClass](docs/EnumClass.md)
 - [EnumTest](docs/EnumTest.md)
 - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
+ - [Foo](docs/Foo.md)
 - [FormatTest](docs/FormatTest.md)
 - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
+ - [HealthCheckResult](docs/HealthCheckResult.md)
+ - [InlineObject](docs/InlineObject.md)
+ - [InlineObject1](docs/InlineObject1.md)
+ - [InlineObject2](docs/InlineObject2.md)
+ - [InlineObject3](docs/InlineObject3.md)
+ - [InlineObject4](docs/InlineObject4.md)
+ - [InlineObject5](docs/InlineObject5.md)
+ - [InlineResponseDefault](docs/InlineResponseDefault.md)
 - [MapTest](docs/MapTest.md)
 - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
 - [Model200Response](docs/Model200Response.md)
 - [ModelApiResponse](docs/ModelApiResponse.md)
 - [ModelReturn](docs/ModelReturn.md)
 - [Name](docs/Name.md)
+ - [NullableClass](docs/NullableClass.md)
 - [NumberOnly](docs/NumberOnly.md)
 - [Order](docs/Order.md)
 - [OuterComposite](docs/OuterComposite.md)
 - [OuterEnum](docs/OuterEnum.md)
+ - [OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
+ - [OuterEnumInteger](docs/OuterEnumInteger.md)
+ - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
 - [Pet](docs/Pet.md)
 - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
 - [SpecialModelName](docs/SpecialModelName.md)
 - [Tag](docs/Tag.md)
- - [TypeHolderDefault](docs/TypeHolderDefault.md)
- - [TypeHolderExample](docs/TypeHolderExample.md)
 - [User](docs/User.md)
- - [XmlItem](docs/XmlItem.md)


 ## Documentation for Authorization
@@ -212,9 +215,19 @@ Authentication schemes defined for the API:
 - **API key parameter name**: api_key_query
 - **Location**: URL query string

+### bearer_test
+
+
+- **Type**: HTTP basic authentication
+
 ### http_basic_test


+- **Type**: HTTP basic authentication
+
+### http_signature_test
+
+
 - **Type**: HTTP basic authentication

 ### petstore_auth
--- a/samples/client/petstore/java/jersey2-java6/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java6/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/jersey2/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]


 ## Implemented Interfaces
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -481,9 +481,9 @@ public class AdditionalPropertiesClass implements Parcelable {
    mapArrayAnytype = (Map<String, List<Object>>)in.readValue(List.class.getClassLoader());
    mapMapString = (Map<String, Map<String, String>>)in.readValue(Map.class.getClassLoader());
    mapMapAnytype = (Map<String, Map<String, Object>>)in.readValue(Map.class.getClassLoader());
-    anytype1 = (Object)in.readValue(.class.getClassLoader());
-    anytype2 = (Object)in.readValue(.class.getClassLoader());
-    anytype3 = (Object)in.readValue(.class.getClassLoader());
+    anytype1 = (Object)in.readValue(null);
+    anytype2 = (Object)in.readValue(null);
+    anytype3 = (Object)in.readValue(null);
  }

  public int describeContents() {
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -362,7 +362,6 @@ public class AdditionalPropertiesClass {
   * @return anytype1
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -388,7 +387,6 @@ public class AdditionalPropertiesClass {
   * @return anytype2
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -414,7 +412,6 @@ public class AdditionalPropertiesClass {
   * @return anytype3
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -345,7 +345,6 @@ public class AdditionalPropertiesClass {
   * @return anytype1
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")

  public Object getAnytype1() {
@@ -369,7 +368,6 @@ public class AdditionalPropertiesClass {
   * @return anytype2
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")

  public Object getAnytype2() {
@@ -393,7 +391,6 @@ public class AdditionalPropertiesClass {
   * @return anytype3
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")

  public Object getAnytype3() {
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2-play24/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -361,7 +361,6 @@ public class AdditionalPropertiesClass {
   * @return anytype1
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -387,7 +386,6 @@ public class AdditionalPropertiesClass {
   * @return anytype2
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -413,7 +411,6 @@ public class AdditionalPropertiesClass {
   * @return anytype3
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
--- a/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2-play25/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -361,7 +361,6 @@ public class AdditionalPropertiesClass {
   * @return anytype1
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -387,7 +386,6 @@ public class AdditionalPropertiesClass {
   * @return anytype2
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -413,7 +411,6 @@ public class AdditionalPropertiesClass {
   * @return anytype3
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -361,7 +361,6 @@ public class AdditionalPropertiesClass {
   * @return anytype1
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -387,7 +386,6 @@ public class AdditionalPropertiesClass {
   * @return anytype2
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE2)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -413,7 +411,6 @@ public class AdditionalPropertiesClass {
   * @return anytype3
  **/
  @javax.annotation.Nullable
-  @Valid
  @ApiModelProperty(value = "")
  @JsonProperty(JSON_PROPERTY_ANYTYPE3)
  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesClass.md
@@ -14,9 +14,9 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
 **mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
 **mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
-**anytype1** | [**Object**](.md) |  |  [optional]
-**anytype2** | [**Object**](.md) |  |  [optional]
-**anytype3** | [**Object**](.md) |  |  [optional]
+**anytype1** | **Object** |  |  [optional]
+**anytype2** | **Object** |  |  [optional]
+**anytype3** | **Object** |  |  [optional]



--- a/samples/client/petstore/javascript-es6/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/javascript-es6/docs/AdditionalPropertiesClass.md
@@ -12,8 +12,8 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | **{String: [Object]}** |  | [optional] 
 **mapMapString** | **{String: {String: String}}** |  | [optional] 
 **mapMapAnytype** | **{String: {String: Object}}** |  | [optional] 
-**anytype1** | [**Object**](.md) |  | [optional] 
-**anytype2** | [**Object**](.md) |  | [optional] 
-**anytype3** | [**Object**](.md) |  | [optional] 
+**anytype1** | **Object** |  | [optional] 
+**anytype2** | **Object** |  | [optional] 
+**anytype3** | **Object** |  | [optional] 


--- a/samples/client/petstore/javascript-promise-es6/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/AdditionalPropertiesClass.md
@@ -12,8 +12,8 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | **{String: [Object]}** |  | [optional] 
 **mapMapString** | **{String: {String: String}}** |  | [optional] 
 **mapMapAnytype** | **{String: {String: Object}}** |  | [optional] 
-**anytype1** | [**Object**](.md) |  | [optional] 
-**anytype2** | [**Object**](.md) |  | [optional] 
-**anytype3** | [**Object**](.md) |  | [optional] 
+**anytype1** | **Object** |  | [optional] 
+**anytype2** | **Object** |  | [optional] 
+**anytype3** | **Object** |  | [optional] 


--- a/samples/client/petstore/javascript-promise/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/javascript-promise/docs/AdditionalPropertiesClass.md
@@ -12,8 +12,8 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | **{String: [Object]}** |  | [optional] 
 **mapMapString** | **{String: {String: String}}** |  | [optional] 
 **mapMapAnytype** | **{String: {String: Object}}** |  | [optional] 
-**anytype1** | [**Object**](.md) |  | [optional] 
-**anytype2** | [**Object**](.md) |  | [optional] 
-**anytype3** | [**Object**](.md) |  | [optional] 
+**anytype1** | **Object** |  | [optional] 
+**anytype2** | **Object** |  | [optional] 
+**anytype3** | **Object** |  | [optional] 


--- a/samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/javascript/docs/AdditionalPropertiesClass.md
@@ -12,8 +12,8 @@ Name | Type | Description | Notes
 **mapArrayAnytype** | **{String: [Object]}** |  | [optional] 
 **mapMapString** | **{String: {String: String}}** |  | [optional] 
 **mapMapAnytype** | **{String: {String: Object}}** |  | [optional] 
-**anytype1** | [**Object**](.md) |  | [optional] 
-**anytype2** | [**Object**](.md) |  | [optional] 
-**anytype3** | [**Object**](.md) |  | [optional] 
+**anytype1** | **Object** |  | [optional] 
+**anytype2** | **Object** |  | [optional] 
+**anytype3** | **Object** |  | [optional] 


--- a/samples/client/petstore/perl/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/perl/docs/AdditionalPropertiesClass.md
@@ -16,9 +16,9 @@ Name | Type | Description | Notes
 **map_array_anytype** | **HASH[string,ARRAY[object]]** |  | [optional] 
 **map_map_string** | **HASH[string,HASH[string,string]]** |  | [optional] 
 **map_map_anytype** | **HASH[string,HASH[string,object]]** |  | [optional] 
-**anytype_1** | [**object**](.md) |  | [optional] 
-**anytype_2** | [**object**](.md) |  | [optional] 
-**anytype_3** | [**object**](.md) |  | [optional] 
+**anytype_1** | **object** |  | [optional] 
+**anytype_2** | **object** |  | [optional] 
+**anytype_3** | **object** |  | [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)

--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/AdditionalPropertiesClass.md
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
 **map_array_anytype** | [**map[string,object[]]**](array.md) |  | [optional] 
 **map_map_string** | [**map[string,map[string,string]]**](map.md) |  | [optional] 
 **map_map_anytype** | [**map[string,map[string,object]]**](map.md) |  | [optional] 
-**anytype_1** | [**object**](.md) |  | [optional] 
-**anytype_2** | [**object**](.md) |  | [optional] 
-**anytype_3** | [**object**](.md) |  | [optional] 
+**anytype_1** | **object** |  | [optional] 
+**anytype_2** | **object** |  | [optional] 
+**anytype_3** | **object** |  | [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)

--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
@@ -11,9 +11,9 @@ Name | Type | Description | Notes
 **map_array_anytype** | **dict(str, list[object])** |  | [optional] 
 **map_map_string** | **dict(str, dict(str, str))** |  | [optional] 
 **map_map_anytype** | **dict(str, dict(str, object))** |  | [optional] 
-**anytype_1** | [**object**](.md) |  | [optional] 
-**anytype_2** | [**object**](.md) |  | [optional] 
-**anytype_3** | [**object**](.md) |  | [optional] 
+**anytype_1** | **object** |  | [optional] 
+**anytype_2** | **object** |  | [optional] 
+**anytype_3** | **object** |  | [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)

--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesClass.md
@@ -11,9 +11,9 @@ Name | Type | Description | Notes
 **map_array_anytype** | **dict(str, list[object])** |  | [optional] 
 **map_map_string** | **dict(str, dict(str, str))** |  | [optional] 
 **map_map_anytype** | **dict(str, dict(str, object))** |  | [optional] 
-**anytype_1** | [**object**](.md) |  | [optional] 
-**anytype_2** | [**object**](.md) |  | [optional] 
-**anytype_3** | [**object**](.md) |  | [optional] 
+**anytype_1** | **object** |  | [optional] 
+**anytype_2** | **object** |  | [optional] 
+**anytype_3** | **object** |  | [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)

--- a/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
@@ -11,9 +11,9 @@ Name | Type | Description | Notes
 **map_array_anytype** | **dict(str, list[object])** |  | [optional] 
 **map_map_string** | **dict(str, dict(str, str))** |  | [optional] 
 **map_map_anytype** | **dict(str, dict(str, object))** |  | [optional] 
-**anytype_1** | [**object**](.md) |  | [optional] 
-**anytype_2** | [**object**](.md) |  | [optional] 
-**anytype_3** | [**object**](.md) |  | [optional] 
+**anytype_1** | **object** |  | [optional] 
+**anytype_2** | **object** |  | [optional] 
+**anytype_3** | **object** |  | [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)

--- a/samples/client/petstore/ruby-faraday/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/ruby-faraday/docs/AdditionalPropertiesClass.md
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
 **map_array_anytype** | **Hash&lt;String, Array&lt;Object&gt;&gt;** |  | [optional] 
 **map_map_string** | **Hash&lt;String, Hash&lt;String, String&gt;&gt;** |  | [optional] 
 **map_map_anytype** | **Hash&lt;String, Hash&lt;String, Object&gt;&gt;** |  | [optional] 
-**anytype_1** | [**Object**](.md) |  | [optional] 
-**anytype_2** | [**Object**](.md) |  | [optional] 
-**anytype_3** | [**Object**](.md) |  | [optional] 
+**anytype_1** | **Object** |  | [optional] 
+**anytype_2** | **Object** |  | [optional] 
+**anytype_3** | **Object** |  | [optional] 

 ## Code Sample

--- a/samples/client/petstore/ruby/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/ruby/docs/AdditionalPropertiesClass.md
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
 **map_array_anytype** | **Hash&lt;String, Array&lt;Object&gt;&gt;** |  | [optional] 
 **map_map_string** | **Hash&lt;String, Hash&lt;String, String&gt;&gt;** |  | [optional] 
 **map_map_anytype** | **Hash&lt;String, Hash&lt;String, Object&gt;&gt;** |  | [optional] 
-**anytype_1** | [**Object**](.md) |  | [optional] 
-**anytype_2** | [**Object**](.md) |  | [optional] 
-**anytype_3** | [**Object**](.md) |  | [optional] 
+**anytype_1** | **Object** |  | [optional] 
+**anytype_2** | **Object** |  | [optional] 
+**anytype_3** | **Object** |  | [optional] 

 ## Code Sample

--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/FakeApi.md
@@ -428,7 +428,7 @@ import (

 func main() {
    query := "query_example" // string | 
-    user := openapiclient.User{Id: int64(123), Username: "Username_example", FirstName: "FirstName_example", LastName: "LastName_example", Email: "Email_example", Password: "Password_example", Phone: "Phone_example", UserStatus: 123, ArbitraryObject: "TODO", ArbitraryNullableObject: "TODO", ArbitraryTypeValue: "TODO", ArbitraryNullableTypeValue: "TODO"} // User | 
+    user := openapiclient.User{Id: int64(123), Username: "Username_example", FirstName: "FirstName_example", LastName: "LastName_example", Email: "Email_example", Password: "Password_example", Phone: "Phone_example", UserStatus: 123, ArbitraryObject: 123, ArbitraryNullableObject: 123, ArbitraryTypeValue: 123, ArbitraryNullableTypeValue: 123} // User | 

    configuration := openapiclient.NewConfiguration()
    api_client := openapiclient.NewAPIClient(configuration)
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/User.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/User.md
@@ -12,10 +12,10 @@ Name | Type | Description | Notes
 **Password** | Pointer to **string** |  | [optional] 
 **Phone** | Pointer to **string** |  | [optional] 
 **UserStatus** | Pointer to **int32** | User Status | [optional] 
-**ArbitraryObject** | Pointer to [**map[string]interface{}**](.md) | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
-**ArbitraryNullableObject** | Pointer to [**map[string]interface{}**](.md) | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
-**ArbitraryTypeValue** | Pointer to [**interface{}**](.md) | test code generation for any type Value can be any type - string, number, boolean, array or object. | [optional] 
-**ArbitraryNullableTypeValue** | Pointer to [**interface{}**](.md) | test code generation for any type Value can be any type - string, number, boolean, array, object or the &#39;null&#39; value. | [optional] 
+**ArbitraryObject** | Pointer to **map[string]interface{}** | test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value. | [optional] 
+**ArbitraryNullableObject** | Pointer to **map[string]interface{}** | test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value. | [optional] 
+**ArbitraryTypeValue** | Pointer to **interface{}** | test code generation for any type Value can be any type - string, number, boolean, array or object. | [optional] 
+**ArbitraryNullableTypeValue** | Pointer to **interface{}** | test code generation for any type Value can be any type - string, number, boolean, array, object or the &#39;null&#39; value. | [optional] 

 ## Methods

--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/docs/UserApi.md
@@ -36,7 +36,7 @@ import (
 )

 func main() {
-    user := openapiclient.User{Id: int64(123), Username: "Username_example", FirstName: "FirstName_example", LastName: "LastName_example", Email: "Email_example", Password: "Password_example", Phone: "Phone_example", UserStatus: 123, ArbitraryObject: "TODO", ArbitraryNullableObject: "TODO", ArbitraryTypeValue: "TODO", ArbitraryNullableTypeValue: "TODO"} // User | Created user object
+    user := openapiclient.User{Id: int64(123), Username: "Username_example", FirstName: "FirstName_example", LastName: "LastName_example", Email: "Email_example", Password: "Password_example", Phone: "Phone_example", UserStatus: 123, ArbitraryObject: 123, ArbitraryNullableObject: 123, ArbitraryTypeValue: 123, ArbitraryNullableTypeValue: 123} // User | Created user object

    configuration := openapiclient.NewConfiguration()
    api_client := openapiclient.NewAPIClient(configuration)
@@ -98,7 +98,7 @@ import (
 )

 func main() {
-    user := []User{openapiclient.User{Id: int64(123), Username: "Username_example", FirstName: "FirstName_example", LastName: "LastName_example", Email: "Email_example", Password: "Password_example", Phone: "Phone_example", UserStatus: 123, ArbitraryObject: "TODO", ArbitraryNullableObject: "TODO", ArbitraryTypeValue: "TODO", ArbitraryNullableTypeValue: "TODO"}} // []User | List of user object
+    user := []User{openapiclient.User{Id: int64(123), Username: "Username_example", FirstName: "FirstName_example", LastName: "LastName_example", Email: "Email_example", Password: "Password_example", Phone: "Phone_example", UserStatus: 123, ArbitraryObject: 123, ArbitraryNullableObject: 123, ArbitraryTypeValue: 123, ArbitraryNullableTypeValue: 123}} // []User | List of user object

    configuration := openapiclient.NewConfiguration()
    api_client := openapiclient.NewAPIClient(configuration)
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/AdditionalPropertiesClass.java
@@ -262,7 +262,6 @@ public class AdditionalPropertiesClass   {
   * Get anytype1
   * @return anytype1
  **/
-  @Valid
    public Object getAnytype1() {
    return anytype1;
  }
@@ -280,7 +279,6 @@ public class AdditionalPropertiesClass   {
   * Get anytype2
   * @return anytype2
  **/
-  @Valid
    public Object getAnytype2() {
    return anytype2;
  }
@@ -298,7 +296,6 @@ public class AdditionalPropertiesClass   {
   * Get anytype3
   * @return anytype3
  **/
-  @Valid
    public Object getAnytype3() {
    return anytype3;
  }
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -49,15 +49,12 @@ public class AdditionalPropertiesClass  {
  private Map<String, Map<String, Object>> mapMapAnytype = null;

  @ApiModelProperty(value = "")
-  @Valid
  private Object anytype1;

  @ApiModelProperty(value = "")
-  @Valid
  private Object anytype2;

  @ApiModelProperty(value = "")
-  @Valid
  private Object anytype3;
 /**
   * Get mapString
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -324,7 +324,7 @@ public class AdditionalPropertiesClass  implements Serializable {
   **/
  @JsonProperty("anytype_1")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype1() {
    return anytype1;
  }
@@ -344,7 +344,7 @@ public class AdditionalPropertiesClass  implements Serializable {
   **/
  @JsonProperty("anytype_2")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype2() {
    return anytype2;
  }
@@ -364,7 +364,7 @@ public class AdditionalPropertiesClass  implements Serializable {
   **/
  @JsonProperty("anytype_3")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype3() {
    return anytype3;
  }
--- a/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -323,7 +323,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_1")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype1() {
    return anytype1;
  }
@@ -343,7 +343,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_2")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype2() {
    return anytype2;
  }
@@ -363,7 +363,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_3")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype3() {
    return anytype3;
  }
--- a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -323,7 +323,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_1")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype1() {
    return anytype1;
  }
@@ -343,7 +343,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_2")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype2() {
    return anytype2;
  }
@@ -363,7 +363,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_3")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype3() {
    return anytype3;
  }
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -323,7 +323,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_1")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype1() {
    return anytype1;
  }
@@ -343,7 +343,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_2")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype2() {
    return anytype2;
  }
@@ -363,7 +363,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_3")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype3() {
    return anytype3;
  }
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -323,7 +323,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_1")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype1() {
    return anytype1;
  }
@@ -343,7 +343,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_2")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype2() {
    return anytype2;
  }
@@ -363,7 +363,7 @@ public class AdditionalPropertiesClass   {
   **/
  @JsonProperty("anytype_3")
  @ApiModelProperty(value = "")
-  @Valid 
+  
  public Object getAnytype3() {
    return anytype3;
  }
--- a/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesClass.php
+++ b/samples/server/petstore/php-ze-ph/src/App/DTO/AdditionalPropertiesClass.php
@@ -87,22 +87,19 @@ class AdditionalPropertiesClass
    public $map_map_anytype;
    /**
     * @DTA\Data(field="anytype_1", nullable=true)
-     * @DTA\Strategy(name="Object", options={"type":object::class})
-     * @DTA\Validator(name="Dictionary", options={"type":object::class})
+     * @DTA\Validator(name="Type", options={"type":"object"})
     * @var object
     */
    public $anytype_1;
    /**
     * @DTA\Data(field="anytype_2", nullable=true)
-     * @DTA\Strategy(name="Object", options={"type":object::class})
-     * @DTA\Validator(name="Dictionary", options={"type":object::class})
+     * @DTA\Validator(name="Type", options={"type":"object"})
     * @var object
     */
    public $anytype_2;
    /**
     * @DTA\Data(field="anytype_3", nullable=true)
-     * @DTA\Strategy(name="Object", options={"type":object::class})
-     * @DTA\Validator(name="Dictionary", options={"type":object::class})
+     * @DTA\Validator(name="Type", options={"type":"object"})
     * @var object
     */
    public $anytype_3;
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -299,7 +299,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype1() {
    return anytype1;
@@ -320,7 +319,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype2() {
    return anytype2;
@@ -341,7 +339,6 @@ public class AdditionalPropertiesClass   {
  */
  @ApiModelProperty(value = "")

-  @Valid

  public Object getAnytype3() {
    return anytype3;