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

2025-12-10 12:52:49 +00:00 · 2021-07-27 11:33:35 +08:00
parent 39fbf53150 2f18bbe1c7
commit 56aafe30d9
1011 changed files with 34058 additions and 5848 deletions
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/PetApi.java
@@ -306,7 +306,10 @@ public class PetApi {
    * @param tags Tags to filter by
    * @return Set&lt;Pet&gt;
    * @throws IOException if an error occurs while attempting to invoke the API
+    * @deprecated
+
    **/
+    @Deprecated
    public Set<Pet> findPetsByTags(Set<String> tags) throws IOException {
        HttpResponse response = findPetsByTagsForHttpResponse(tags);
        TypeReference<Set<Pet>> typeRef = new TypeReference<Set<Pet>>() {};
@@ -322,13 +325,17 @@ public class PetApi {
    * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
    * @return Set&lt;Pet&gt;
    * @throws IOException if an error occurs while attempting to invoke the API
+    * @deprecated
+
    **/
+    @Deprecated
    public Set<Pet> findPetsByTags(Set<String> tags, Map<String, Object> params) throws IOException {
        HttpResponse response = findPetsByTagsForHttpResponse(tags, params);
        TypeReference<Set<Pet>> typeRef = new TypeReference<Set<Pet>>() {};
        return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
    }

+    @Deprecated
    public HttpResponse findPetsByTagsForHttpResponse(Set<String> tags) throws IOException {
        // verify the required parameter 'tags' is set
        if (tags == null) {
@@ -354,6 +361,7 @@ public class PetApi {
        return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.GET, genericUrl, content).execute();
    }

+    @Deprecated
    public HttpResponse findPetsByTagsForHttpResponse(Set<String> tags, Map<String, Object> params) throws IOException {
        // verify the required parameter 'tags' is set
        if (tags == null) {
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
@@ -63,6 +63,7 @@ public class Animal {
   * Get className
   * @return className
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
@@ -78,6 +78,7 @@ public class Category {
   * Get name
   * @return name
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_NAME)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -235,6 +235,7 @@ public class EnumTest {
   * Get enumStringRequired
   * @return enumStringRequired
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -191,6 +191,7 @@ public class FormatTest {
   * maximum: 543.2
   * @return number
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_NUMBER)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -302,6 +303,7 @@ public class FormatTest {
   * Get _byte
   * @return _byte
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_BYTE)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -355,6 +357,7 @@ public class FormatTest {
   * Get date
   * @return date
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_DATE)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -435,6 +438,7 @@ public class FormatTest {
   * Get password
   * @return password
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_PASSWORD)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
@@ -60,6 +60,7 @@ public class Name {
   * Get name
   * @return name
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_NAME)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -164,6 +164,7 @@ public class Pet {
   * Get name
   * @return name
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(example = "doggie", required = true, value = "")
  @JsonProperty(JSON_PROPERTY_NAME)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -195,6 +196,7 @@ public class Pet {
   * Get photoUrls
   * @return photoUrls
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -66,6 +66,7 @@ public class TypeHolderDefault {
   * Get stringItem
   * @return stringItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -92,6 +93,7 @@ public class TypeHolderDefault {
   * Get numberItem
   * @return numberItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -118,6 +120,7 @@ public class TypeHolderDefault {
   * Get integerItem
   * @return integerItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -144,6 +147,7 @@ public class TypeHolderDefault {
   * Get boolItem
   * @return boolItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -175,6 +179,7 @@ public class TypeHolderDefault {
   * Get arrayItem
   * @return arrayItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(required = true, value = "")
  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -70,6 +70,7 @@ public class TypeHolderExample {
   * Get stringItem
   * @return stringItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(example = "what", required = true, value = "")
  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -96,6 +97,7 @@ public class TypeHolderExample {
   * Get numberItem
   * @return numberItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(example = "1.234", required = true, value = "")
  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -122,6 +124,7 @@ public class TypeHolderExample {
   * Get floatItem
   * @return floatItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(example = "1.234", required = true, value = "")
  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -148,6 +151,7 @@ public class TypeHolderExample {
   * Get integerItem
   * @return integerItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(example = "-2", required = true, value = "")
  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -174,6 +178,7 @@ public class TypeHolderExample {
   * Get boolItem
   * @return boolItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(example = "true", required = true, value = "")
  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -205,6 +210,7 @@ public class TypeHolderExample {
   * Get arrayItem
   * @return arrayItem
  **/
+  @javax.annotation.Nonnull
  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
  @JsonInclude(value = JsonInclude.Include.ALWAYS)