Merge remote-tracking branch 'origin/master' into 5.2.x

This commit is contained in:
William Cheng
2021-03-26 10:20:36 +08:00
669 changed files with 1327 additions and 41749 deletions

View File

@@ -1957,6 +1957,8 @@ components:
$special[property.name]:
format: int64
type: integer
_special_model.name_:
type: string
xml:
name: $special[model.name]
HealthCheckResult:

View File

@@ -8,6 +8,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**$specialPropertyName** | **Long** | | [optional]
**specialModelName** | **String** | | [optional]

View File

@@ -53,13 +53,13 @@ import org.openapitools.client.JSON;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Drawing {
public static final String JSON_PROPERTY_MAIN_SHAPE = "mainShape";
private Shape mainShape = null;
private Shape mainShape;
public static final String JSON_PROPERTY_SHAPE_OR_NULL = "shapeOrNull";
private ShapeOrNull shapeOrNull = null;
private ShapeOrNull shapeOrNull;
public static final String JSON_PROPERTY_NULLABLE_SHAPE = "nullableShape";
private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>of(null);
private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>undefined();
public static final String JSON_PROPERTY_SHAPES = "shapes";
private List<Shape> shapes = null;

View File

@@ -32,13 +32,17 @@ import org.openapitools.client.JSON;
* SpecialModelName
*/
@JsonPropertyOrder({
SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME,
SpecialModelName.JSON_PROPERTY_SPECIAL_MODEL_NAME
})
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class SpecialModelName {
public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
private Long $specialPropertyName;
public static final String JSON_PROPERTY_SPECIAL_MODEL_NAME = "_special_model.name_";
private String specialModelName;
public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
this.$specialPropertyName = $specialPropertyName;
@@ -64,6 +68,30 @@ public class SpecialModelName {
}
public SpecialModelName specialModelName(String specialModelName) {
this.specialModelName = specialModelName;
return this;
}
/**
* Get specialModelName
* @return specialModelName
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")
@JsonProperty(JSON_PROPERTY_SPECIAL_MODEL_NAME)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public String getSpecialModelName() {
return specialModelName;
}
public void setSpecialModelName(String specialModelName) {
this.specialModelName = specialModelName;
}
/**
* Return true if this _special_model.name_ object is equal to o.
*/
@@ -76,12 +104,13 @@ public class SpecialModelName {
return false;
}
SpecialModelName specialModelName = (SpecialModelName) o;
return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName);
return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName) &&
Objects.equals(this.specialModelName, specialModelName.specialModelName);
}
@Override
public int hashCode() {
return Objects.hash($specialPropertyName);
return Objects.hash($specialPropertyName, specialModelName);
}
@Override
@@ -89,6 +118,7 @@ public class SpecialModelName {
StringBuilder sb = new StringBuilder();
sb.append("class SpecialModelName {\n");
sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
sb.append(" specialModelName: ").append(toIndentedString(specialModelName)).append("\n");
sb.append("}");
return sb.toString();
}