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

This commit is contained in:
William Cheng
2020-02-04 15:31:10 +08:00
1179 changed files with 58478 additions and 9334 deletions

View File

@@ -34,7 +34,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
})
@javax.annotation.concurrent.Immutable
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -562,7 +562,7 @@ public class ApiClient {
entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
} else {
// We let jersey handle the serialization
entity = Entity.entity(obj, contentType);
entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
}
return entity;
}
@@ -716,7 +716,7 @@ public class ApiClient {
}
}
Entity<?> entity = (body == null) ? Entity.json("") : serialize(body, formParams, contentType);
Entity<?> entity = serialize(body, formParams, contentType);
Response response = null;

View File

@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -563,7 +563,7 @@ public class ApiClient {
entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
} else {
// We let jersey handle the serialization
entity = Entity.entity(obj, contentType);
entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
}
return entity;
}
@@ -716,7 +716,7 @@ public class ApiClient {
}
}
Entity<?> entity = (body == null) ? Entity.json("") : serialize(body, formParams, contentType);
Entity<?> entity = serialize(body, formParams, contentType);
Response response = null;

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -563,7 +563,7 @@ public class ApiClient {
entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
} else {
// We let jersey handle the serialization
entity = Entity.entity(obj, contentType);
entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
}
return entity;
}
@@ -716,7 +716,7 @@ public class ApiClient {
}
}
Entity<?> entity = (body == null) ? Entity.json("") : serialize(body, formParams, contentType);
Entity<?> entity = serialize(body, formParams, contentType);
Response response = null;

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -19,4 +19,8 @@ Name | Type | Description | Notes
**anytype3** | [**Object**](.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**color** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**arrayArrayNumber** | [**List&lt;List&lt;BigDecimal&gt;&gt;**](List.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**arrayNumber** | [**List&lt;BigDecimal&gt;**](BigDecimal.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -11,4 +11,8 @@ Name | Type | Description | Notes
**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -20,4 +20,8 @@ LEOPARDS | &quot;leopards&quot;
JAGUARS | &quot;jaguars&quot;
## Implemented Interfaces
* Parcelable

View File

@@ -20,4 +20,8 @@ LEOPARDS | &quot;leopards&quot;
JAGUARS | &quot;jaguars&quot;
## Implemented Interfaces
* Parcelable

View File

@@ -14,4 +14,8 @@ Name | Type | Description | Notes
**ATT_NAME** | **String** | Name of the pet | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**declawed** | **Boolean** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**declawed** | **Boolean** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**name** | **String** | |
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**propertyClass** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**client** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**breed** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**breed** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -28,4 +28,8 @@ FISH | &quot;fish&quot;
CRAB | &quot;crab&quot;
## Implemented Interfaces
* Parcelable

View File

@@ -51,4 +51,8 @@ NUMBER_1_DOT_1 | 1.1
NUMBER_MINUS_1_DOT_2 | -1.2
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**files** | [**List&lt;java.io.File&gt;**](java.io.File.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -22,4 +22,8 @@ Name | Type | Description | Notes
**bigDecimal** | [**BigDecimal**](BigDecimal.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**foo** | **String** | | [optional] [readonly]
## Implemented Interfaces
* Parcelable

View File

@@ -21,4 +21,8 @@ UPPER | &quot;UPPER&quot;
LOWER | &quot;lower&quot;
## Implemented Interfaces
* Parcelable

View File

@@ -11,4 +11,8 @@ Name | Type | Description | Notes
**map** | [**Map&lt;String, Animal&gt;**](Animal.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -11,4 +11,8 @@ Name | Type | Description | Notes
**propertyClass** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -11,4 +11,8 @@ Name | Type | Description | Notes
**message** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**_return** | **Integer** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -13,4 +13,8 @@ Name | Type | Description | Notes
**_123number** | **Integer** | | [optional] [readonly]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**justNumber** | [**BigDecimal**](BigDecimal.md) | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -24,4 +24,8 @@ APPROVED | &quot;approved&quot;
DELIVERED | &quot;delivered&quot;
## Implemented Interfaces
* Parcelable

View File

@@ -11,4 +11,8 @@ Name | Type | Description | Notes
**myBoolean** | **Boolean** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -24,4 +24,8 @@ PENDING | &quot;pending&quot;
SOLD | &quot;sold&quot;
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**baz** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
**$specialPropertyName** | **Long** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
**name** | **String** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -13,4 +13,8 @@ Name | Type | Description | Notes
**arrayItem** | **List&lt;Integer&gt;** | |
## Implemented Interfaces
* Parcelable

View File

@@ -14,4 +14,8 @@ Name | Type | Description | Notes
**arrayItem** | **List&lt;Integer&gt;** | |
## Implemented Interfaces
* Parcelable

View File

@@ -16,4 +16,8 @@ Name | Type | Description | Notes
**userStatus** | **Integer** | User Status | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -37,4 +37,8 @@ Name | Type | Description | Notes
**prefixNsWrappedArray** | **List&lt;Integer&gt;** | | [optional]
## Implemented Interfaces
* Parcelable

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -35,7 +35,7 @@ import javax.xml.bind.annotation.*;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -35,7 +35,7 @@ import javax.validation.Valid;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -35,7 +35,7 @@ import javax.validation.Valid;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -35,7 +35,7 @@ import javax.validation.Valid;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),

View File

@@ -121,7 +121,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.22</swagger-annotations-version>
<spring-web-version>5.0.8.RELEASE</spring-web-version>
<spring-web-version>5.0.16.RELEASE</spring-web-version>
<jackson-version>2.10.1</jackson-version>
<jackson-databind-version>2.10.1</jackson-databind-version>
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>

View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),