[Java] Update templates not to add @pattern on byte array property (O…

…penAPITools#7153) * Update Java templates to skip generating @pattern on byte array properties * Revert separator changes * Revert separator changes
wbt-solutions · Aug 12, 2020 · a1484da · a1484da
1 parent 6653ced
commit a1484da
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 28 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/Java/beanValidationCore.mustache
@@ -1,4 +1,4 @@
-{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{!
+{{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
 minLength && maxLength set
 }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
 minLength set, maxLength not

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/beanValidationCore.mustache
@@ -1,4 +1,4 @@
-{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{!
+{{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
 minLength && maxLength set
 }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
 minLength set, maxLength not

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/beanValidationCore.mustache
@@ -1,4 +1,4 @@
-{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{!
+{{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
 minLength && maxLength set
 }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
 minLength set, maxLength not

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/beanValidationCore.mustache
@@ -1,4 +1,4 @@
-{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{!
+{{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
 minLength && maxLength set
 }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
 minLength set, maxLength not

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/beanValidationCore.mustache
@@ -1,4 +1,4 @@
-{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{!
+{{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
 minLength && maxLength set
 }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
 minLength set, maxLength not

diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/beanValidationCore.mustache
@@ -1,4 +1,4 @@
-{{#pattern}} @Pattern(regexp="{{{pattern}}}"){{/pattern}}{{!
+{{#pattern}}{{^isByteArray}} @Pattern(regexp="{{{pattern}}}"){{/isByteArray}}{{/pattern}}{{!
 minLength && maxLength set
 }}{{#minLength}}{{#maxLength}} @Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{!
 minLength set, maxLength not

diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/beanValidationCore.mustache
@@ -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}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/beanValidationCore.mustache
@@ -1,4 +1,4 @@
-{{#pattern}}@Pattern(regexp="{{{pattern}}}") {{/pattern}}{{!
+{{#pattern}}{{^isByteArray}}@Pattern(regexp="{{{pattern}}}") {{/isByteArray}}{{/pattern}}{{!
 minLength && maxLength set
 }}{{#minLength}}{{#maxLength}}@Size(min={{minLength}},max={{maxLength}}) {{/maxLength}}{{/minLength}}{{!
 minLength set, maxLength not

diff --git a/...ore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java b/...ore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -294,7 +294,7 @@ public FormatTest _byte(byte[] _byte) {
    * @return _byte
   **/
   @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)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 

diff --git a/...nt/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/...nt/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -277,7 +277,7 @@ public FormatTest _byte(byte[] _byte) {
    * @return _byte
   **/
   @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() {
     return _byte;

diff --git a/...etstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/...etstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -293,7 +293,7 @@ public FormatTest _byte(byte[] _byte) {
    * @return _byte
   **/
   @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)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 

diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
@@ -205,7 +205,7 @@ public FormatTest string(String string) {
   **/
   @JsonProperty("byte")
   @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;
   }
 

diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
@@ -266,7 +266,7 @@ public FormatTest _byte(byte[] _byte) {
    **/
   @JsonProperty("byte")
   @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() {
     return _byte;
   }

diff --git a/...server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/...server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/FormatTest.java
@@ -264,7 +264,7 @@ public FormatTest _byte(byte[] _byte) {
    **/
   @JsonProperty("byte")
   @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() {
     return _byte;
   }

diff --git a/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey1/src/gen/java/org/openapitools/model/FormatTest.java
@@ -264,7 +264,7 @@ public FormatTest _byte(byte[] _byte) {
    **/
   @JsonProperty("byte")
   @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() {
     return _byte;
   }

diff --git a/...server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/...server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
@@ -264,7 +264,7 @@ public FormatTest _byte(byte[] _byte) {
    **/
   @JsonProperty("byte")
   @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() {
     return _byte;
   }

diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
@@ -264,7 +264,7 @@ public FormatTest _byte(byte[] _byte) {
    **/
   @JsonProperty("byte")
   @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() {
     return _byte;
   }

diff --git a/.../server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java b/.../server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/...petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java b/...petstore/spring-mvc-j8-localdatetime/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/...r/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/...r/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/...rver/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/...rver/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/.../server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/.../server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/.../petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/.../petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/.../server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/.../server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/...rver/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/...rver/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/...store/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/...store/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }

diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTest.java
@@ -227,7 +227,7 @@ public FormatTest _byte(byte[] _byte) {
   @ApiModelProperty(required = true, value = "")
   @NotNull
 
-@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") 
+
   public byte[] getByte() {
     return _byte;
   }
Original file line number	Diff line number	Diff line change
		@@ -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}}