loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-05 15:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Update templates not to add @Pattern on byte array property (#7153)

Browse Source 
* Update Java templates to skip generating @Pattern on byte array properties

* Revert separator changes

* Revert separator changes
This commit is contained in:
beytun 2020-08-12 08:29:50 +02:00 committed by GitHub
parent 6653cedcc7
commit a1484dac77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/Java/beanValidationCore.mustache vendored
View File

@ -1,4 +1,4 @@
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{! {{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set minLength && maxLength set
}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{! }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not minLength set, maxLength not

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

@ -1,4 +1,4 @@
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{! {{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set minLength && maxLength set
}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{! }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not minLength set, maxLength not

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

@ -1,4 +1,4 @@
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{! {{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set minLength && maxLength set
}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{! }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not minLength set, maxLength not

2
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/beanValidationCore.mustache vendored
View File

@ -1,4 +1,4 @@
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{! {{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set minLength && maxLength set
}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{! }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not minLength set, maxLength not

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

@ -1,4 +1,4 @@
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{! {{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set minLength && maxLength set
}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{! }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not minLength set, maxLength not

2
modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/beanValidationCore.mustache vendored
View File

@ -1,4 +1,4 @@
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{! {{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set minLength && maxLength set
}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{! }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not minLength set, maxLength not

2
modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidationCore.mustache vendored
View File

@ -1 +1 @@
{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} @Size(min={{minLength}}){{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} @Size(max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minItems}}{{#maxItems}} @Size(min={{minItems}},max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minItems}}{{^maxItems}} @Size(min={{minItems}}){{/maxItems}}{{/minItems}}{{^minItems}}{{#maxItems}} @Size(max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minimum}} @Min({{minimum}}){{/minimum}}{{#maximum}} @Max({{maximum}}){{/maximum}} {{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}} @Size(min={{minLength}}){{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}} @Size(max={{maxLength}}){{/maxLength}}{{/minLength}}{{#minItems}}{{#maxItems}} @Size(min={{minItems}},max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minItems}}{{^maxItems}} @Size(min={{minItems}}){{/maxItems}}{{/minItems}}{{^minItems}}{{#maxItems}} @Size(max={{maxItems}}){{/maxItems}}{{/minItems}}{{#minimum}} @Min({{minimum}}){{/minimum}}{{#maximum}} @Max({{maximum}}){{/maximum}}

2
modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache vendored
View File

@ -1,4 +1,4 @@
{{#pattern}}@Pattern(regexp="{{{pattern}}}") {{/pattern}}{{! {{#pattern}}{{^isByteArray}}@Pattern(regexp="{{{pattern}}}") {{/isByteArray}}{{/pattern}}{{!
minLength && maxLength set minLength && maxLength set
}}{{#minLength}}{{#maxLength}}@Size(min={{minLength}},max={{maxLength}}) {{/maxLength}}{{/minLength}}{{! }}{{#minLength}}{{#maxLength}}@Size(min={{minLength}},max={{maxLength}}) {{/maxLength}}{{/minLength}}{{!
minLength set, maxLength not minLength set, maxLength not

2
samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
View File

@ -294,7 +294,7 @@ public class FormatTest {
* @return _byte * @return _byte
**/ **/
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@JsonProperty(JSON_PROPERTY_BYTE) @JsonProperty(JSON_PROPERTY_BYTE)
@JsonInclude(value = JsonInclude.Include.ALWAYS) @JsonInclude(value = JsonInclude.Include.ALWAYS)

2
samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
View File

@ -277,7 +277,7 @@ public class FormatTest {
* @return _byte * @return _byte
**/ **/
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;

2
samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
View File

@ -293,7 +293,7 @@ public class FormatTest {
* @return _byte * @return _byte
**/ **/
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@JsonProperty(JSON_PROPERTY_BYTE) @JsonProperty(JSON_PROPERTY_BYTE)
@JsonInclude(value = JsonInclude.Include.ALWAYS) @JsonInclude(value = JsonInclude.Include.ALWAYS)

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

@ -205,7 +205,7 @@ public class FormatTest {
**/ **/
@JsonProperty("byte") @JsonProperty("byte")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -266,7 +266,7 @@ public class FormatTest implements Serializable {
**/ **/
@JsonProperty("byte") @JsonProperty("byte")
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @NotNull
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -264,7 +264,7 @@ public class FormatTest {
**/ **/
@JsonProperty("byte") @JsonProperty("byte")
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @NotNull
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -264,7 +264,7 @@ public class FormatTest {
**/ **/
@JsonProperty("byte") @JsonProperty("byte")
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @NotNull
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -264,7 +264,7 @@ public class FormatTest {
**/ **/
@JsonProperty("byte") @JsonProperty("byte")
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @NotNull
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -264,7 +264,7 @@ public class FormatTest {
**/ **/
@JsonProperty("byte") @JsonProperty("byte")
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") @NotNull
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }

2
samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
View File

@ -227,7 +227,7 @@ public class FormatTest {
@ApiModelProperty(required = true, value = "") @ApiModelProperty(required = true, value = "")
@NotNull @NotNull
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
public byte[] getByte() { public byte[] getByte() {
return _byte; return _byte;
} }