From 917b8f6d9d24aaec63b34ad9883a67269e46d0da Mon Sep 17 00:00:00 2001 From: Hugo Mercado Date: Fri, 25 Jan 2019 12:59:39 -0500 Subject: [PATCH] ported changes from codegen issue 5643. --- .../resources/handlebars/JavaSpring/beanValidationCore.mustache | 2 +- .../resources/mustache/JavaSpring/beanValidationCore.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/handlebars/JavaSpring/beanValidationCore.mustache b/src/main/resources/handlebars/JavaSpring/beanValidationCore.mustache index 4b7b561ce7..29d043cc77 100644 --- a/src/main/resources/handlebars/JavaSpring/beanValidationCore.mustache +++ b/src/main/resources/handlebars/JavaSpring/beanValidationCore.mustache @@ -1,4 +1,4 @@ -{{#pattern}}@Pattern(regexp="{{{pattern}}}") {{/pattern}}{{! +{{#pattern}}@Pattern(regexp="{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}) {{/pattern}}{{! minLength && maxLength set }}{{#minLength}}{{#maxLength}}@Size(min={{minLength}},max={{maxLength}}) {{/maxLength}}{{/minLength}}{{! minLength set, maxLength not diff --git a/src/main/resources/mustache/JavaSpring/beanValidationCore.mustache b/src/main/resources/mustache/JavaSpring/beanValidationCore.mustache index 4b7b561ce7..29d043cc77 100644 --- a/src/main/resources/mustache/JavaSpring/beanValidationCore.mustache +++ b/src/main/resources/mustache/JavaSpring/beanValidationCore.mustache @@ -1,4 +1,4 @@ -{{#pattern}}@Pattern(regexp="{{{pattern}}}") {{/pattern}}{{! +{{#pattern}}@Pattern(regexp="{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}) {{/pattern}}{{! minLength && maxLength set }}{{#minLength}}{{#maxLength}}@Size(min={{minLength}},max={{maxLength}}) {{/maxLength}}{{/minLength}}{{! minLength set, maxLength not