loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Add nullable support to JAXRS-CXF parameters (#1679)

Browse Source 
* add nullable support to jaxrs cxf parameters

* remove end of file line break

* fix default value for list

* update samples
This commit is contained in:
William Cheng 2018-12-20 16:07:45 +08:00 committed by GitHub
parent f188fa08e5
commit b6e80e86b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidationHeaderParams.mustache
View File

@ -1 +1 @@
{{#required}} @NotNull{{/required}}{{>beanValidationCore}}
{{#isNullable}} @Nullable{{/isNullable}}{{^isNullable}}{{#required}} @NotNull {{/required}}{{/isNullable}}{{>beanValidationCore}}

2
modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidationQueryParams.mustache
View File

@ -1 +1 @@
{{#required}} @NotNull{{/required}}{{>beanValidationCore}}
{{#isNullable}} @Nullable {{/isNullable}}{{^isNullable}}{{#required}} @NotNull {{/required}}{{/isNullable}}{{>beanValidationCore}}

2
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/beanValidationHeaderParams.mustache
View File

@ -1 +1 @@
{{#required}} @NotNull{{/required}}{{>beanValidationCore}}
{{#isNullable}} @Nullable {{/isNullable}}{{^isNullable}}{{#required}} @NotNull {{/required}}{{/isNullable}}{{>beanValidationCore}}

2
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/beanValidationQueryParams.mustache
View File

@ -1 +1 @@
{{#required}} @NotNull{{/required}}{{>beanValidationCore}}
{{#isNullable}} @Nullable {{/isNullable}}{{^isNullable}}{{#required}} @NotNull {{/required}}{{/isNullable}}{{>beanValidationCore}}

2
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/queryParams.mustache
View File

@ -1 +1 @@
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#defaultValue}}@DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}) {{/defaultValue}}{{{dataType}}} {{paramName}}{{/isQueryParam}}
{{#isQueryParam}}@QueryParam("{{baseName}}"){{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}} {{^isContainer}}{{#defaultValue}}@DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}) {{/defaultValue}}{{/isContainer}}{{{dataType}}} {{paramName}}{{/isQueryParam}}

2
samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
View File

@ -1 +1 @@
3.3.0-SNAPSHOT
4.0.0-SNAPSHOT

4
samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Category.java
View File

@ -19,10 +19,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class Category {
@ApiModelProperty(value = "")
private Long id = null;
private Long id;
@ApiModelProperty(value = "")
private String name = null;
private String name;
/**
* Get id
* @return id

6
samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/ModelApiResponse.java
View File

@ -19,13 +19,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class ModelApiResponse {
@ApiModelProperty(value = "")
private Integer code = null;
private Integer code;
@ApiModelProperty(value = "")
private String type = null;
private String type;
@ApiModelProperty(value = "")
private String message = null;
private String message;
/**
* Get code
* @return code

10
samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Order.java
View File

@ -20,16 +20,16 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class Order {
@ApiModelProperty(value = "")
private Long id = null;
private Long id;
@ApiModelProperty(value = "")
private Long petId = null;
private Long petId;
@ApiModelProperty(value = "")
private Integer quantity = null;
private Integer quantity;
@ApiModelProperty(value = "")
private Date shipDate = null;
private Date shipDate;
@XmlType(name="StatusEnum")
@XmlEnum(String.class)
@ -67,7 +67,7 @@ public enum StatusEnum {
/**
* Order Status
**/
private StatusEnum status = null;
private StatusEnum status;
@ApiModelProperty(value = "")
private Boolean complete = false;

6
samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Pet.java
View File

@ -23,13 +23,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class Pet {
@ApiModelProperty(value = "")
private Long id = null;
private Long id;
@ApiModelProperty(value = "")
private Category category = null;
@ApiModelProperty(example = "doggie", required = true, value = "")
private String name = null;
private String name;
@ApiModelProperty(required = true, value = "")
private List<String> photoUrls = new ArrayList<String>();
@ -73,7 +73,7 @@ public enum StatusEnum {
/**
* pet status in the store
**/
private StatusEnum status = null;
private StatusEnum status;
/**
* Get id
* @return id

4
samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/Tag.java
View File

@ -19,10 +19,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class Tag {
@ApiModelProperty(value = "")
private Long id = null;
private Long id;
@ApiModelProperty(value = "")
private String name = null;
private String name;
/**
* Get id
* @return id

16
samples/client/petstore/jaxrs-cxf-client/src/gen/java/org/openapitools/model/User.java
View File

@ -19,31 +19,31 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class User {
@ApiModelProperty(value = "")
private Long id = null;
private Long id;
@ApiModelProperty(value = "")
private String username = null;
private String username;
@ApiModelProperty(value = "")
private String firstName = null;
private String firstName;
@ApiModelProperty(value = "")
private String lastName = null;
private String lastName;
@ApiModelProperty(value = "")
private String email = null;
private String email;
@ApiModelProperty(value = "")
private String password = null;
private String password;
@ApiModelProperty(value = "")
private String phone = null;
private String phone;
@ApiModelProperty(value = "User Status")
/**
* User Status
**/
private Integer userStatus = null;
private Integer userStatus;
/**
* Get id
* @return id

4
samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/api/PetApi.java
View File

@ -67,7 +67,7 @@ public interface PetApi {
@ApiResponses(value = {
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@ApiResponse(code = 400, message = "Invalid status value") })
public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull @DefaultValue("new ArrayList<String>()") List<String> status);
public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull List<String> status);
/**
* Finds Pets by tags
@ -82,7 +82,7 @@ public interface PetApi {
@ApiResponses(value = {
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@ApiResponse(code = 400, message = "Invalid tag value") })
public List<Pet> findPetsByTags(@QueryParam("tags") @NotNull @DefaultValue("new ArrayList<String>()") List<String> tags);
public List<Pet> findPetsByTags(@QueryParam("tags") @NotNull List<String> tags);
/**
* Find pet by ID

4
samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/api/PetApi.java
View File

@ -67,7 +67,7 @@ public interface PetApi {
@ApiResponses(value = {
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@ApiResponse(code = 400, message = "Invalid status value") })
public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull @DefaultValue("new ArrayList<String>()") List<String> status);
public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull List<String> status);
/**
* Finds Pets by tags
@ -82,7 +82,7 @@ public interface PetApi {
@ApiResponses(value = {
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@ApiResponse(code = 400, message = "Invalid tag value") })
public List<Pet> findPetsByTags(@QueryParam("tags") @NotNull @DefaultValue("new ArrayList<String>()") List<String> tags);
public List<Pet> findPetsByTags(@QueryParam("tags") @NotNull List<String> tags);
/**
* Find pet by ID

2
samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java
View File

@ -128,7 +128,7 @@ public interface FakeApi {
@ApiResponses(value = {
@ApiResponse(code = 400, message = "Invalid request"),
@ApiResponse(code = 404, message = "Not found") })
public void testEnumParameters(@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") @DefaultValue("new ArrayList<String>()") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @Multipart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString);
public void testEnumParameters(@HeaderParam("enum_header_string_array") List<String> enumHeaderStringArray, @HeaderParam("enum_header_string") String enumHeaderString, @QueryParam("enum_query_string_array") List<String> enumQueryStringArray, @QueryParam("enum_query_string") @DefaultValue("-efg") String enumQueryString, @QueryParam("enum_query_integer") Integer enumQueryInteger, @QueryParam("enum_query_double") Double enumQueryDouble, @Multipart(value = "enum_form_string_array", required = false) List<String> enumFormStringArray, @Multipart(value = "enum_form_string", required = false) String enumFormString);
/**
* Fake endpoint to test group parameters (optional)

4
samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/PetApi.java
View File

@ -67,7 +67,7 @@ public interface PetApi {
@ApiResponses(value = {
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@ApiResponse(code = 400, message = "Invalid status value") })
public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull @DefaultValue("new ArrayList<String>()") List<String> status);
public List<Pet> findPetsByStatus(@QueryParam("status") @NotNull List<String> status);
/**
* Finds Pets by tags
@ -82,7 +82,7 @@ public interface PetApi {
@ApiResponses(value = {
@ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
@ApiResponse(code = 400, message = "Invalid tag value") })
public List<Pet> findPetsByTags(@QueryParam("tags") @NotNull @DefaultValue("new ArrayList<String>()") List<String> tags);
public List<Pet> findPetsByTags(@QueryParam("tags") @NotNull List<String> tags);
/**
* Find pet by ID