Adds spec additionalProperties + nullable examples (#2405)

* Adds v2 spec additionalproperties examples, adds v3 spec nulllable model example, updates samples

* Remaining samples updates

* Adds csharp generator update to handle models with multilevel parent types, which works for the AdditionalPropertiesObject model, samples updated

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -0,0 +1,82 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.openapitools.jackson.nullable.JsonNullable;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * AdditionalPropertiesAnyType
+ */
+
+public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesAnyType name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Get name
+   * @return name
+  */
+  @ApiModelProperty(value = "")
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
+    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesAnyType {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).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/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -0,0 +1,83 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.openapitools.jackson.nullable.JsonNullable;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * AdditionalPropertiesArray
+ */
+
+public class AdditionalPropertiesArray extends HashMap<String, List>  {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesArray name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Get name
+   * @return name
+  */
+  @ApiModelProperty(value = "")
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
+    return Objects.equals(this.name, additionalPropertiesArray.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesArray {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).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/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -0,0 +1,82 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.openapitools.jackson.nullable.JsonNullable;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * AdditionalPropertiesBoolean
+ */
+
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesBoolean name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Get name
+   * @return name
+  */
+  @ApiModelProperty(value = "")
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
+    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesBoolean {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).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/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,69 +18,337 @@ import javax.validation.constraints.*;
  */
 
 public class AdditionalPropertiesClass   {
-  @JsonProperty("map_property")
+  @JsonProperty("map_string")
   @Valid
-  private Map<String, String> mapProperty = null;
+  private Map<String, String> mapString = null;
 
-  @JsonProperty("map_of_map_property")
+  @JsonProperty("map_number")
   @Valid
-  private Map<String, Map<String, String>> mapOfMapProperty = null;
+  private Map<String, BigDecimal> mapNumber = null;
 
-  public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
-    this.mapProperty = mapProperty;
+  @JsonProperty("map_integer")
+  @Valid
+  private Map<String, Integer> mapInteger = null;
+
+  @JsonProperty("map_boolean")
+  @Valid
+  private Map<String, Boolean> mapBoolean = null;
+
+  @JsonProperty("map_array_integer")
+  @Valid
+  private Map<String, List<Integer>> mapArrayInteger = null;
+
+  @JsonProperty("map_array_anytype")
+  @Valid
+  private Map<String, List<Object>> mapArrayAnytype = null;
+
+  @JsonProperty("map_map_string")
+  @Valid
+  private Map<String, Map<String, String>> mapMapString = null;
+
+  @JsonProperty("map_map_anytype")
+  @Valid
+  private Map<String, Map<String, Object>> mapMapAnytype = null;
+
+  @JsonProperty("anytype_1")
+  private Object anytype1 = null;
+
+  @JsonProperty("anytype_2")
+  private Object anytype2 = null;
+
+  @JsonProperty("anytype_3")
+  private Object anytype3 = null;
+
+  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
+    this.mapString = mapString;
     return this;
   }
 
-  public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
-    if (this.mapProperty == null) {
-      this.mapProperty = new HashMap<>();
+  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
+    if (this.mapString == null) {
+      this.mapString = new HashMap<>();
     }
-    this.mapProperty.put(key, mapPropertyItem);
+    this.mapString.put(key, mapStringItem);
     return this;
   }
 
   /**
-   * Get mapProperty
-   * @return mapProperty
+   * Get mapString
+   * @return mapString
   */
   @ApiModelProperty(value = "")
 
 
-  public Map<String, String> getMapProperty() {
-    return mapProperty;
+  public Map<String, String> getMapString() {
+    return mapString;
   }
 
-  public void setMapProperty(Map<String, String> mapProperty) {
-    this.mapProperty = mapProperty;
+  public void setMapString(Map<String, String> mapString) {
+    this.mapString = mapString;
   }
 
-  public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
-    this.mapOfMapProperty = mapOfMapProperty;
+  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
+    this.mapNumber = mapNumber;
     return this;
   }
 
-  public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
-    if (this.mapOfMapProperty == null) {
-      this.mapOfMapProperty = new HashMap<>();
+  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
+    if (this.mapNumber == null) {
+      this.mapNumber = new HashMap<>();
     }
-    this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
+    this.mapNumber.put(key, mapNumberItem);
     return this;
   }
 
   /**
-   * Get mapOfMapProperty
-   * @return mapOfMapProperty
+   * Get mapNumber
+   * @return mapNumber
   */
   @ApiModelProperty(value = "")
 
   @Valid
 
-  public Map<String, Map<String, String>> getMapOfMapProperty() {
-    return mapOfMapProperty;
+  public Map<String, BigDecimal> getMapNumber() {
+    return mapNumber;
   }
 
-  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
-    this.mapOfMapProperty = mapOfMapProperty;
+  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
+    this.mapNumber = mapNumber;
+  }
+
+  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
+    this.mapInteger = mapInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
+    if (this.mapInteger == null) {
+      this.mapInteger = new HashMap<>();
+    }
+    this.mapInteger.put(key, mapIntegerItem);
+    return this;
+  }
+
+  /**
+   * Get mapInteger
+   * @return mapInteger
+  */
+  @ApiModelProperty(value = "")
+
+
+  public Map<String, Integer> getMapInteger() {
+    return mapInteger;
+  }
+
+  public void setMapInteger(Map<String, Integer> mapInteger) {
+    this.mapInteger = mapInteger;
+  }
+
+  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
+    this.mapBoolean = mapBoolean;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
+    if (this.mapBoolean == null) {
+      this.mapBoolean = new HashMap<>();
+    }
+    this.mapBoolean.put(key, mapBooleanItem);
+    return this;
+  }
+
+  /**
+   * Get mapBoolean
+   * @return mapBoolean
+  */
+  @ApiModelProperty(value = "")
+
+
+  public Map<String, Boolean> getMapBoolean() {
+    return mapBoolean;
+  }
+
+  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
+    this.mapBoolean = mapBoolean;
+  }
+
+  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    this.mapArrayInteger = mapArrayInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
+    if (this.mapArrayInteger == null) {
+      this.mapArrayInteger = new HashMap<>();
+    }
+    this.mapArrayInteger.put(key, mapArrayIntegerItem);
+    return this;
+  }
+
+  /**
+   * Get mapArrayInteger
+   * @return mapArrayInteger
+  */
+  @ApiModelProperty(value = "")
+
+  @Valid
+
+  public Map<String, List<Integer>> getMapArrayInteger() {
+    return mapArrayInteger;
+  }
+
+  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    this.mapArrayInteger = mapArrayInteger;
+  }
+
+  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    this.mapArrayAnytype = mapArrayAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
+    if (this.mapArrayAnytype == null) {
+      this.mapArrayAnytype = new HashMap<>();
+    }
+    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
+    return this;
+  }
+
+  /**
+   * Get mapArrayAnytype
+   * @return mapArrayAnytype
+  */
+  @ApiModelProperty(value = "")
+
+  @Valid
+
+  public Map<String, List<Object>> getMapArrayAnytype() {
+    return mapArrayAnytype;
+  }
+
+  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    this.mapArrayAnytype = mapArrayAnytype;
+  }
+
+  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
+    this.mapMapString = mapMapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
+    if (this.mapMapString == null) {
+      this.mapMapString = new HashMap<>();
+    }
+    this.mapMapString.put(key, mapMapStringItem);
+    return this;
+  }
+
+  /**
+   * Get mapMapString
+   * @return mapMapString
+  */
+  @ApiModelProperty(value = "")
+
+  @Valid
+
+  public Map<String, Map<String, String>> getMapMapString() {
+    return mapMapString;
+  }
+
+  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
+    this.mapMapString = mapMapString;
+  }
+
+  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    this.mapMapAnytype = mapMapAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
+    if (this.mapMapAnytype == null) {
+      this.mapMapAnytype = new HashMap<>();
+    }
+    this.mapMapAnytype.put(key, mapMapAnytypeItem);
+    return this;
+  }
+
+  /**
+   * Get mapMapAnytype
+   * @return mapMapAnytype
+  */
+  @ApiModelProperty(value = "")
+
+  @Valid
+
+  public Map<String, Map<String, Object>> getMapMapAnytype() {
+    return mapMapAnytype;
+  }
+
+  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    this.mapMapAnytype = mapMapAnytype;
+  }
+
+  public AdditionalPropertiesClass anytype1(Object anytype1) {
+    this.anytype1 = anytype1;
+    return this;
+  }
+
+  /**
+   * Get anytype1
+   * @return anytype1
+  */
+  @ApiModelProperty(value = "")
+
+  @Valid
+
+  public Object getAnytype1() {
+    return anytype1;
+  }
+
+  public void setAnytype1(Object anytype1) {
+    this.anytype1 = anytype1;
+  }
+
+  public AdditionalPropertiesClass anytype2(Object anytype2) {
+    this.anytype2 = anytype2;
+    return this;
+  }
+
+  /**
+   * Get anytype2
+   * @return anytype2
+  */
+  @ApiModelProperty(value = "")
+
+  @Valid
+
+  public Object getAnytype2() {
+    return anytype2;
+  }
+
+  public void setAnytype2(Object anytype2) {
+    this.anytype2 = anytype2;
+  }
+
+  public AdditionalPropertiesClass anytype3(Object anytype3) {
+    this.anytype3 = anytype3;
+    return this;
+  }
+
+  /**
+   * Get anytype3
+   * @return anytype3
+  */
+  @ApiModelProperty(value = "")
+
+  @Valid
+
+  public Object getAnytype3() {
+    return anytype3;
+  }
+
+  public void setAnytype3(Object anytype3) {
+    this.anytype3 = anytype3;
   }
 
 
@@ -92,13 +361,22 @@ public class AdditionalPropertiesClass   {
       return false;
     }
     AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
-    return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
-        Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
+    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
+        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
+        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
+        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
+        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
+        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
+        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
+        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
+        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
+        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
+        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapProperty, mapOfMapProperty);
+    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
   }
 
   @Override
@@ -106,8 +384,17 @@ public class AdditionalPropertiesClass   {
     StringBuilder sb = new StringBuilder();
     sb.append("class AdditionalPropertiesClass {\n");
     
-    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
-    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).append("\n");
+    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
+    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
+    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
+    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
+    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
+    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
+    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
+    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
+    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
+    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
+    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -0,0 +1,82 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.openapitools.jackson.nullable.JsonNullable;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * AdditionalPropertiesInteger
+ */
+
+public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesInteger name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Get name
+   * @return name
+  */
+  @ApiModelProperty(value = "")
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
+    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesInteger {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).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/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -0,0 +1,83 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import org.openapitools.jackson.nullable.JsonNullable;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * AdditionalPropertiesNumber
+ */
+
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesNumber name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Get name
+   * @return name
+  */
+  @ApiModelProperty(value = "")
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
+    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesNumber {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).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/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -0,0 +1,82 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.openapitools.jackson.nullable.JsonNullable;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * AdditionalPropertiesObject
+ */
+
+public class AdditionalPropertiesObject extends HashMap<String, Map>  {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesObject name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Get name
+   * @return name
+  */
+  @ApiModelProperty(value = "")
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
+    return Objects.equals(this.name, additionalPropertiesObject.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesObject {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).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/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -0,0 +1,82 @@
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.openapitools.jackson.nullable.JsonNullable;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * AdditionalPropertiesString
+ */
+
+public class AdditionalPropertiesString extends HashMap<String, String>  {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesString name(String name) {
+    this.name = name;
+    return this;
+  }
+
+  /**
+   * Get name
+   * @return name
+  */
+  @ApiModelProperty(value = "")
+
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
+    return Objects.equals(this.name, additionalPropertiesString.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesString {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).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/server/petstore/springboot-reactive/src/main/resources/openapi.yaml

@@ -1608,16 +1608,112 @@ components:
       type: object
     AdditionalPropertiesClass:
       properties:
-        map_property:
+        map_string:
           additionalProperties:
             type: string
           type: object
-        map_of_map_property:
+        map_number:
+          additionalProperties:
+            type: number
+          type: object
+        map_integer:
+          additionalProperties:
+            type: integer
+          type: object
+        map_boolean:
+          additionalProperties:
+            type: boolean
+          type: object
+        map_array_integer:
+          additionalProperties:
+            items:
+              type: integer
+            type: array
+          type: object
+        map_array_anytype:
+          additionalProperties:
+            items:
+              properties: {}
+              type: object
+            type: array
+          type: object
+        map_map_string:
           additionalProperties:
             additionalProperties:
               type: string
             type: object
           type: object
+        map_map_anytype:
+          additionalProperties:
+            additionalProperties:
+              properties: {}
+              type: object
+            type: object
+          type: object
+        anytype_1:
+          properties: {}
+          type: object
+        anytype_2:
+          type: object
+        anytype_3:
+          properties: {}
+          type: object
+      type: object
+    AdditionalPropertiesString:
+      additionalProperties:
+        type: string
+      properties:
+        name:
+          type: string
+      type: object
+    AdditionalPropertiesInteger:
+      additionalProperties:
+        type: integer
+      properties:
+        name:
+          type: string
+      type: object
+    AdditionalPropertiesNumber:
+      additionalProperties:
+        type: number
+      properties:
+        name:
+          type: string
+      type: object
+    AdditionalPropertiesBoolean:
+      additionalProperties:
+        type: boolean
+      properties:
+        name:
+          type: string
+      type: object
+    AdditionalPropertiesArray:
+      additionalProperties:
+        items:
+          properties: {}
+          type: object
+        type: array
+      properties:
+        name:
+          type: string
+      type: object
+    AdditionalPropertiesObject:
+      additionalProperties:
+        additionalProperties:
+          properties: {}
+          type: object
+        type: object
+      properties:
+        name:
+          type: string
+      type: object
+    AdditionalPropertiesAnyType:
+      additionalProperties:
+        properties: {}
+        type: object
+      properties:
+        name:
+          type: string
       type: object
     MixedPropertiesAndAdditionalPropertiesClass:
       properties: