diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java
index 8872a74c2c..cb0822fbbf 100644
--- a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java
+++ b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java
@@ -110,7 +110,7 @@ public void setSpecVersion(SpecVersion specVersion) {
         this.specVersion = specVersion;
     }
 
-    public Schema specVersion(SpecVersion specVersion) {
+    public Schema<T> specVersion(SpecVersion specVersion) {
         this.setSpecVersion(specVersion);
         return this;
     }
@@ -383,7 +383,7 @@ public void setExclusiveMaximumValue(BigDecimal exclusiveMaximumValue) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema exclusiveMaximumValue(BigDecimal exclusiveMaximumValue) {
+    public Schema<T> exclusiveMaximumValue(BigDecimal exclusiveMaximumValue) {
         this.exclusiveMaximumValue = exclusiveMaximumValue;
         return this;
     }
@@ -414,7 +414,7 @@ public void setExclusiveMinimumValue(BigDecimal exclusiveMinimumValue) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema exclusiveMinimumValue(BigDecimal exclusiveMinimumValue) {
+    public Schema<T> exclusiveMinimumValue(BigDecimal exclusiveMinimumValue) {
         this.exclusiveMinimumValue = exclusiveMinimumValue;
         return this;
     }
@@ -444,7 +444,7 @@ public void setPatternProperties(Map<String, Schema> patternProperties) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema patternProperties(Map<String, Schema> patternProperties) {
+    public Schema<T> patternProperties(Map<String, Schema> patternProperties) {
         this.patternProperties = patternProperties;
         return this;
     }
@@ -454,7 +454,7 @@ public Schema patternProperties(Map<String, Schema> patternProperties) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema addPatternProperty(String key, Schema patternPropertiesItem) {
+    public Schema<T> addPatternProperty(String key, Schema patternPropertiesItem) {
         if (this.patternProperties == null) {
             this.patternProperties = new LinkedHashMap<>();
         }
@@ -467,7 +467,7 @@ public Schema addPatternProperty(String key, Schema patternPropertiesItem) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema contains(Schema contains) {
+    public Schema<T> contains(Schema contains) {
         this.contains = contains;
         return this;
     }
@@ -477,7 +477,7 @@ public Schema contains(Schema contains) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema $id(String $id) {
+    public Schema<T> $id(String $id) {
         this.$id = $id;
         return this;
     }
@@ -517,7 +517,7 @@ public boolean addType(String type) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema $schema(String $schema) {
+    public Schema<T> $schema(String $schema) {
         this.$schema = $schema;
         return this;
     }
@@ -545,7 +545,7 @@ public boolean addType(String type) {
      * @since 2.2.8 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema $vocabulary(String $vocabulary) {
+    public Schema<T> $vocabulary(String $vocabulary) {
         this.$vocabulary = $vocabulary;
         return this;
     }
@@ -573,7 +573,7 @@ public boolean addType(String type) {
      * @since 2.2.8 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema $dynamicAnchor(String $dynamicAnchor) {
+    public Schema<T> $dynamicAnchor(String $dynamicAnchor) {
         this.$dynamicAnchor = $dynamicAnchor;
         return this;
     }
@@ -583,7 +583,7 @@ public boolean addType(String type) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema $anchor(String $anchor) {
+    public Schema<T> $anchor(String $anchor) {
         this.$anchor = $anchor;
         return this;
     }
@@ -593,7 +593,7 @@ public boolean addType(String type) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema types(Set<String> types) {
+    public Schema<T> types(Set<String> types) {
         this.types = types;
         return this;
     }
@@ -628,7 +628,7 @@ public void setJsonSchema(Map<String, Object> jsonSchema) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema jsonSchema(Map<String, Object> jsonSchema) {
+    public Schema<T> jsonSchema(Map<String, Object> jsonSchema) {
         this.jsonSchema = jsonSchema;
         return this;
     }
@@ -659,7 +659,7 @@ public void setJsonSchemaImpl(Object jsonSchemaImpl) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema jsonSchemaImpl(Object jsonSchemaImpl) {
+    public Schema<T> jsonSchemaImpl(Object jsonSchemaImpl) {
         setJsonSchemaImpl(jsonSchemaImpl);
         return this;
     }
@@ -707,12 +707,12 @@ public void setAllOf(List<Schema> allOf) {
         this.allOf = allOf;
     }
 
-    public Schema allOf(List<Schema> allOf) {
+    public Schema<T> allOf(List<Schema> allOf) {
         this.allOf = allOf;
         return this;
     }
 
-    public Schema addAllOfItem(Schema allOfItem) {
+    public Schema<T> addAllOfItem(Schema allOfItem) {
         if (this.allOf == null) {
             this.allOf = new ArrayList<>();
         }
@@ -734,12 +734,12 @@ public void setAnyOf(List<Schema> anyOf) {
         this.anyOf = anyOf;
     }
 
-    public Schema anyOf(List<Schema> anyOf) {
+    public Schema<T> anyOf(List<Schema> anyOf) {
         this.anyOf = anyOf;
         return this;
     }
 
-    public Schema addAnyOfItem(Schema anyOfItem) {
+    public Schema<T> addAnyOfItem(Schema anyOfItem) {
         if (this.anyOf == null) {
             this.anyOf = new ArrayList<>();
         }
@@ -761,12 +761,12 @@ public void setOneOf(List<Schema> oneOf) {
         this.oneOf = oneOf;
     }
 
-    public Schema oneOf(List<Schema> oneOf) {
+    public Schema<T> oneOf(List<Schema> oneOf) {
         this.oneOf = oneOf;
         return this;
     }
 
-    public Schema addOneOfItem(Schema oneOfItem) {
+    public Schema<T> addOneOfItem(Schema oneOfItem) {
         if (this.oneOf == null) {
             this.oneOf = new ArrayList<>();
         }
@@ -789,7 +789,7 @@ public void setItems(Schema<?> items) {
         this.items = items;
     }
 
-    public Schema items(Schema<?> items) {
+    public Schema<T> items(Schema<?> items) {
         this.items = items;
         return this;
     }
@@ -809,7 +809,7 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public Schema name(String name) {
+    public Schema<T> name(String name) {
         this.setName(name);
         return this;
     }
@@ -828,7 +828,7 @@ public void setDiscriminator(Discriminator discriminator) {
         this.discriminator = discriminator;
     }
 
-    public Schema discriminator(Discriminator discriminator) {
+    public Schema<T> discriminator(Discriminator discriminator) {
         this.discriminator = discriminator;
         return this;
     }
@@ -847,7 +847,7 @@ public void setTitle(String title) {
         this.title = title;
     }
 
-    public Schema title(String title) {
+    public Schema<T> title(String title) {
         this.title = title;
         return this;
     }
@@ -902,7 +902,7 @@ public void setMultipleOf(BigDecimal multipleOf) {
         this.multipleOf = multipleOf;
     }
 
-    public Schema multipleOf(BigDecimal multipleOf) {
+    public Schema<T> multipleOf(BigDecimal multipleOf) {
         this.multipleOf = multipleOf;
         return this;
     }
@@ -921,7 +921,7 @@ public void setMaximum(BigDecimal maximum) {
         this.maximum = maximum;
     }
 
-    public Schema maximum(BigDecimal maximum) {
+    public Schema<T> maximum(BigDecimal maximum) {
         this.maximum = maximum;
         return this;
     }
@@ -942,7 +942,7 @@ public void setExclusiveMaximum(Boolean exclusiveMaximum) {
     }
 
     @OpenAPI30
-    public Schema exclusiveMaximum(Boolean exclusiveMaximum) {
+    public Schema<T> exclusiveMaximum(Boolean exclusiveMaximum) {
         this.exclusiveMaximum = exclusiveMaximum;
         return this;
     }
@@ -961,7 +961,7 @@ public void setMinimum(BigDecimal minimum) {
         this.minimum = minimum;
     }
 
-    public Schema minimum(BigDecimal minimum) {
+    public Schema<T> minimum(BigDecimal minimum) {
         this.minimum = minimum;
         return this;
     }
@@ -981,7 +981,7 @@ public void setExclusiveMinimum(Boolean exclusiveMinimum) {
         this.exclusiveMinimum = exclusiveMinimum;
     }
 
-    public Schema exclusiveMinimum(Boolean exclusiveMinimum) {
+    public Schema<T> exclusiveMinimum(Boolean exclusiveMinimum) {
         this.exclusiveMinimum = exclusiveMinimum;
         return this;
     }
@@ -1003,7 +1003,7 @@ public void setMaxLength(Integer maxLength) {
         this.maxLength = maxLength;
     }
 
-    public Schema maxLength(Integer maxLength) {
+    public Schema<T> maxLength(Integer maxLength) {
         this.maxLength = maxLength;
         return this;
     }
@@ -1024,7 +1024,7 @@ public void setMinLength(Integer minLength) {
         this.minLength = minLength;
     }
 
-    public Schema minLength(Integer minLength) {
+    public Schema<T> minLength(Integer minLength) {
         this.minLength = minLength;
         return this;
     }
@@ -1043,7 +1043,7 @@ public void setPattern(String pattern) {
         this.pattern = pattern;
     }
 
-    public Schema pattern(String pattern) {
+    public Schema<T> pattern(String pattern) {
         this.pattern = pattern;
         return this;
     }
@@ -1064,7 +1064,7 @@ public void setMaxItems(Integer maxItems) {
         this.maxItems = maxItems;
     }
 
-    public Schema maxItems(Integer maxItems) {
+    public Schema<T> maxItems(Integer maxItems) {
         this.maxItems = maxItems;
         return this;
     }
@@ -1085,7 +1085,7 @@ public void setMinItems(Integer minItems) {
         this.minItems = minItems;
     }
 
-    public Schema minItems(Integer minItems) {
+    public Schema<T> minItems(Integer minItems) {
         this.minItems = minItems;
         return this;
     }
@@ -1104,7 +1104,7 @@ public void setUniqueItems(Boolean uniqueItems) {
         this.uniqueItems = uniqueItems;
     }
 
-    public Schema uniqueItems(Boolean uniqueItems) {
+    public Schema<T> uniqueItems(Boolean uniqueItems) {
         this.uniqueItems = uniqueItems;
         return this;
     }
@@ -1125,7 +1125,7 @@ public void setMaxProperties(Integer maxProperties) {
         this.maxProperties = maxProperties;
     }
 
-    public Schema maxProperties(Integer maxProperties) {
+    public Schema<T> maxProperties(Integer maxProperties) {
         this.maxProperties = maxProperties;
         return this;
     }
@@ -1146,7 +1146,7 @@ public void setMinProperties(Integer minProperties) {
         this.minProperties = minProperties;
     }
 
-    public Schema minProperties(Integer minProperties) {
+    public Schema<T> minProperties(Integer minProperties) {
         this.minProperties = minProperties;
         return this;
     }
@@ -1177,12 +1177,12 @@ public void setRequired(List<String> required) {
         this.required = list;
     }
 
-    public Schema required(List<String> required) {
+    public Schema<T> required(List<String> required) {
         this.required = required;
         return this;
     }
 
-    public Schema addRequiredItem(String requiredItem) {
+    public Schema<T> addRequiredItem(String requiredItem) {
         if (this.required == null) {
             this.required = new ArrayList<>();
         }
@@ -1209,7 +1209,7 @@ public void setType(String type) {
         this.type = type;
     }
 
-    public Schema type(String type) {
+    public Schema<T> type(String type) {
         this.type = type;
         return this;
     }
@@ -1228,7 +1228,7 @@ public void setNot(Schema not) {
         this.not = not;
     }
 
-    public Schema not(Schema not) {
+    public Schema<T> not(Schema not) {
         this.not = not;
         return this;
     }
@@ -1247,7 +1247,7 @@ public void setProperties(Map<String, Schema> properties) {
         this.properties = properties;
     }
 
-    public Schema properties(Map<String, Schema> properties) {
+    public Schema<T> properties(Map<String, Schema> properties) {
         this.properties = properties;
         return this;
     }
@@ -1261,7 +1261,7 @@ public Schema addProperties(String key, Schema property) {
      *
      * @since 2.2.0
      */
-    public Schema addProperty(String key, Schema property) {
+    public Schema<T> addProperty(String key, Schema property) {
         if (this.properties == null) {
             this.properties = new LinkedHashMap<>();
         }
@@ -1286,7 +1286,7 @@ public void setAdditionalProperties(Object additionalProperties) {
         this.additionalProperties = additionalProperties;
     }
 
-    public Schema additionalProperties(Object additionalProperties) {
+    public Schema<T> additionalProperties(Object additionalProperties) {
         setAdditionalProperties(additionalProperties);
         return this;
     }
@@ -1305,7 +1305,7 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public Schema description(String description) {
+    public Schema<T> description(String description) {
         this.description = description;
         return this;
     }
@@ -1324,7 +1324,7 @@ public void setFormat(String format) {
         this.format = format;
     }
 
-    public Schema format(String format) {
+    public Schema<T> format(String format) {
         this.format = format;
         return this;
     }
@@ -1345,13 +1345,12 @@ public Schema format(String format) {
         this.$ref = $ref;
     }
 
-    public Schema $ref(String $ref) {
-
+    public Schema<T> $ref(String $ref) {
         set$ref($ref);
         return this;
     }
 
-    public Schema raw$ref(String $ref) {
+    public Schema<T> raw$ref(String $ref) {
         this.$ref = $ref;
         return this;
     }
@@ -1372,7 +1371,7 @@ public void setNullable(Boolean nullable) {
     }
 
     @OpenAPI30
-    public Schema nullable(Boolean nullable) {
+    public Schema<T> nullable(Boolean nullable) {
         this.nullable = nullable;
         return this;
     }
@@ -1391,7 +1390,7 @@ public void setReadOnly(Boolean readOnly) {
         this.readOnly = readOnly;
     }
 
-    public Schema readOnly(Boolean readOnly) {
+    public Schema<T> readOnly(Boolean readOnly) {
         this.readOnly = readOnly;
         return this;
     }
@@ -1410,7 +1409,7 @@ public void setWriteOnly(Boolean writeOnly) {
         this.writeOnly = writeOnly;
     }
 
-    public Schema writeOnly(Boolean writeOnly) {
+    public Schema<T> writeOnly(Boolean writeOnly) {
         this.writeOnly = writeOnly;
         return this;
     }
@@ -1432,7 +1431,7 @@ public void setExample(Object example) {
         }
     }
 
-    public Schema example(Object example) {
+    public Schema<T> example(Object example) {
         setExample(example);
         return this;
     }
@@ -1451,7 +1450,7 @@ public void setExternalDocs(ExternalDocumentation externalDocs) {
         this.externalDocs = externalDocs;
     }
 
-    public Schema externalDocs(ExternalDocumentation externalDocs) {
+    public Schema<T> externalDocs(ExternalDocumentation externalDocs) {
         this.externalDocs = externalDocs;
         return this;
     }
@@ -1470,7 +1469,7 @@ public void setDeprecated(Boolean deprecated) {
         this.deprecated = deprecated;
     }
 
-    public Schema deprecated(Boolean deprecated) {
+    public Schema<T> deprecated(Boolean deprecated) {
         this.deprecated = deprecated;
         return this;
     }
@@ -1489,7 +1488,7 @@ public void setXml(XML xml) {
         this.xml = xml;
     }
 
-    public Schema xml(XML xml) {
+    public Schema<T> xml(XML xml) {
         this.xml = xml;
         return this;
     }
@@ -1532,7 +1531,7 @@ public void setPrefixItems(List<Schema> prefixItems) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema prefixItems(List<Schema> prefixItems) {
+    public Schema<T> prefixItems(List<Schema> prefixItems) {
         this.prefixItems = prefixItems;
         return this;
     }
@@ -1542,7 +1541,7 @@ public Schema prefixItems(List<Schema> prefixItems) {
      * @since 2.2.12 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema addPrefixItem(Schema prefixItem) {
+    public Schema<T> addPrefixItem(Schema prefixItem) {
         if (this.prefixItems == null) {
             this.prefixItems = new ArrayList<>();
         }
@@ -1573,7 +1572,7 @@ public void setContentEncoding(String contentEncoding) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema contentEncoding(String contentEncoding) {
+    public Schema<T> contentEncoding(String contentEncoding) {
         this.contentEncoding = contentEncoding;
         return this;
     }
@@ -1601,7 +1600,7 @@ public void setContentMediaType(String contentMediaType) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema contentMediaType(String contentMediaType) {
+    public Schema<T> contentMediaType(String contentMediaType) {
         this.contentMediaType = contentMediaType;
         return this;
     }
@@ -1629,7 +1628,7 @@ public void setContentSchema(Schema contentSchema) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema contentSchema(Schema contentSchema) {
+    public Schema<T> contentSchema(Schema contentSchema) {
         this.contentSchema = contentSchema;
         return this;
     }
@@ -1657,7 +1656,7 @@ public void setPropertyNames(Schema propertyNames) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema propertyNames(Schema propertyNames) {
+    public Schema<T> propertyNames(Schema propertyNames) {
         this.propertyNames = propertyNames;
         return this;
     }
@@ -1685,7 +1684,7 @@ public void setUnevaluatedProperties(Schema unevaluatedProperties) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema unevaluatedProperties(Schema unevaluatedProperties) {
+    public Schema<T> unevaluatedProperties(Schema unevaluatedProperties) {
         this.unevaluatedProperties = unevaluatedProperties;
         return this;
     }
@@ -1713,7 +1712,7 @@ public void setMaxContains(Integer maxContains) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema maxContains(Integer maxContains) {
+    public Schema<T> maxContains(Integer maxContains) {
         this.maxContains = maxContains;
         return this;
     }
@@ -1741,7 +1740,7 @@ public void setMinContains(Integer minContains) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema minContains(Integer minContains) {
+    public Schema<T> minContains(Integer minContains) {
         this.minContains = minContains;
         return this;
     }
@@ -1769,7 +1768,7 @@ public void setAdditionalItems(Schema additionalItems) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema additionalItems(Schema additionalItems) {
+    public Schema<T> additionalItems(Schema additionalItems) {
         this.additionalItems = additionalItems;
         return this;
     }
@@ -1797,7 +1796,7 @@ public void setUnevaluatedItems(Schema unevaluatedItems) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema unevaluatedItems(Schema unevaluatedItems) {
+    public Schema<T> unevaluatedItems(Schema unevaluatedItems) {
         this.unevaluatedItems = unevaluatedItems;
         return this;
     }
@@ -1825,7 +1824,7 @@ public void setIf(Schema _if) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema _if(Schema _if) {
+    public Schema<T> _if(Schema _if) {
         this._if = _if;
         return this;
     }
@@ -1853,7 +1852,7 @@ public void setElse(Schema _else) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema _else(Schema _else) {
+    public Schema<T> _else(Schema _else) {
         this._else = _else;
         return this;
     }
@@ -1881,7 +1880,7 @@ public void setThen(Schema then) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema then(Schema then) {
+    public Schema<T> then(Schema then) {
         this.then = then;
         return this;
     }
@@ -1909,7 +1908,7 @@ public void setDependentSchemas(Map<String, Schema> dependentSchemas) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema dependentSchemas(Map<String, Schema> dependentSchemas) {
+    public Schema<T> dependentSchemas(Map<String, Schema> dependentSchemas) {
         this.dependentSchemas = dependentSchemas;
         return this;
     }
@@ -1937,7 +1936,7 @@ public void setDependentRequired(Map<String, List<String>> dependentRequired) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema dependentRequired(Map<String, List<String>> dependentRequired) {
+    public Schema<T> dependentRequired(Map<String, List<String>> dependentRequired) {
         this.dependentRequired = dependentRequired;
         return this;
     }
@@ -1965,7 +1964,7 @@ public Schema dependentRequired(Map<String, List<String>> dependentRequired) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema $comment(String $comment) {
+    public Schema<T> $comment(String $comment) {
         this.$comment = $comment;
         return this;
     }
@@ -2118,7 +2117,7 @@ public void setExtensions(java.util.Map<String, Object> extensions) {
         this.extensions = extensions;
     }
 
-    public Schema extensions(java.util.Map<String, Object> extensions) {
+    public Schema<T> extensions(java.util.Map<String, Object> extensions) {
         this.extensions = extensions;
         return this;
     }
@@ -2201,17 +2200,17 @@ protected String toIndentedString(java.lang.Object o) {
         return o.toString().replace("\n", "\n    ");
     }
 
-    public Schema _default(T _default) {
+    public Schema<T> _default(T _default) {
         this._default = _default;
         return this;
     }
 
-    public Schema _enum(List<T> _enum) {
+    public Schema<T> _enum(List<T> _enum) {
         this._enum = _enum;
         return this;
     }
 
-    public Schema exampleSetFlag(boolean exampleSetFlag) {
+    public Schema<T> exampleSetFlag(boolean exampleSetFlag) {
         this.exampleSetFlag = exampleSetFlag;
         return this;
     }
@@ -2239,7 +2238,7 @@ public void setConst(Object _const) {
      * @since 2.2.0 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema _const(Object _const) {
+    public Schema<T> _const(Object _const) {
         this._const = cast(_const);
         return this;
     }
@@ -2267,7 +2266,7 @@ public void setBooleanSchemaValue(Boolean booleanSchemaValue) {
      * @since 2.2.2 (OpenAPI 3.1.0)
      */
     @OpenAPI31
-    public Schema booleanSchemaValue(Boolean booleanSchemaValue) {
+    public Schema<T> booleanSchemaValue(Boolean booleanSchemaValue) {
         this.booleanSchemaValue = booleanSchemaValue;
         return this;
     }