Skip to content

Commit 8341e19

Browse files
altro3altro3
authored
Merge pull request #1813 from altro3/min-max-messages
x-min-message -> x-minimum-message
2 parents 1667260 + 62d1fc7 commit 8341e19

7 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎openapi-generator/src/main/java/io/micronaut/openapi/generator/Utils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ private static String genericAnnotations(CodegenProperty prop, boolean isGenerat
159159
var patternMsg = (String) prop.vendorExtensions.get("x-pattern-message");
160160
var sizeMsg = (String) prop.vendorExtensions.get("x-size-message");
161161
var notNullMsg = (String) prop.vendorExtensions.get("x-not-null-message");
162-
var minMsg = (String) prop.vendorExtensions.get("x-min-message");
163-
var maxMsg = (String) prop.vendorExtensions.get("x-max-message");
162+
var minMsg = (String) prop.vendorExtensions.get("x-minimum-message");
163+
var maxMsg = (String) prop.vendorExtensions.get("x-maximum-message");
164164

165165
if (StringUtils.isNotEmpty(prop.pattern) && !prop.isDate && !prop.isDateTime) {
166166
if ("email".equals(type) || "email".equalsIgnoreCase(prop.dataFormat) || prop.isEmail) {

‎openapi-generator/src/main/resources/templates/java-micronaut/common/params/validation.mustache‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,30 +83,30 @@
8383
{{!check for integer or long / all others=decimal type with @Decimal isInteger set}}
8484
{{#isInteger}}
8585
{{#minimum}}
86-
@Min({{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{{.}}}{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
86+
@Min({{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{{.}}}{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
8787
{{/minimum}}
8888
{{#maximum}}
89-
@Max({{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{{.}}}{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
89+
@Max({{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{{.}}}{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
9090
{{/maximum}}
9191
{{/isInteger}}
9292
{{!isLong set}}
9393
{{#isLong}}
9494
{{#minimum}}
95-
@Min({{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{{.}}}L{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
95+
@Min({{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{{.}}}L{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
9696
{{/minimum}}
9797
{{#maximum}}
98-
@Max({{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{{.}}}L{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
98+
@Max({{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{{.}}}L{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
9999
{{/maximum}}
100100
{{/isLong}}
101101
{{!Not Integer, not Long => we have a decimal value!}}
102102
{{^isInteger}}
103103
{{^isLong}}{{!minimum for decimal value}}
104104
{{#minimum}}
105-
@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}{{^exclusiveMinimum}}{{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
105+
@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}{{^exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
106106
{{/minimum}}
107107
{{!maximal for decimal value}}
108108
{{#maximum}}
109-
@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}{{^exclusiveMaximum}}{{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
109+
@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}{{^exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
110110
{{/maximum}}
111111
{{/isLong}}
112112
{{/isInteger}}

‎openapi-generator/src/main/resources/templates/kotlin-micronaut/common/params/validation.mustache‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,30 +63,30 @@
6363
{{!check for integer or long / all others=decimal type with @Decimal isInteger set}}
6464
{{#isInteger}}
6565
{{#minimum}}
66-
@Min({{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{{.}}}{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
66+
@Min({{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{{.}}}{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
6767
{{/minimum}}
6868
{{#maximum}}
69-
@Max({{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{{.}}}{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
69+
@Max({{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{{.}}}{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
7070
{{/maximum}}
7171
{{/isInteger}}
7272
{{!isLong set}}
7373
{{#isLong}}
7474
{{#minimum}}
75-
@Min({{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{{.}}}L{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
75+
@Min({{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{{.}}}L{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
7676
{{/minimum}}
7777
{{#maximum}}
78-
@Max({{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{{.}}}L{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
78+
@Max({{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{{.}}}L{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
7979
{{/maximum}}
8080
{{/isLong}}
8181
{{!Not Integer, not Long => we have a decimal value!}}
8282
{{^isInteger}}
8383
{{^isLong}}{{!minimum for decimal value}}
8484
{{#minimum}}
85-
@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}{{^exclusiveMinimum}}{{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
85+
@DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}{{^exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
8686
{{/minimum}}
8787
{{!maximal for decimal value}}
8888
{{#maximum}}
89-
@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}{{^exclusiveMaximum}}{{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
89+
@DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}{{^exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
9090
{{/maximum}}
9191
{{/isLong}}
9292
{{/isInteger}}

‎openapi-generator/src/main/resources/templates/kotlin-micronaut/common/params/validation_field.mustache‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,30 +63,30 @@
6363
{{!check for integer or long / all others=decimal type with @Decimal isInteger set}}
6464
{{#isInteger}}
6565
{{#minimum}}
66-
@{{{vendorExtensions.fieldAnnPrefix}}}Min({{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{{.}}}{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
66+
@{{{vendorExtensions.fieldAnnPrefix}}}Min({{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{{.}}}{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
6767
{{/minimum}}
6868
{{#maximum}}
69-
@{{{vendorExtensions.fieldAnnPrefix}}}Max({{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{{.}}}{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
69+
@{{{vendorExtensions.fieldAnnPrefix}}}Max({{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{{.}}}{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
7070
{{/maximum}}
7171
{{/isInteger}}
7272
{{!isLong set}}
7373
{{#isLong}}
7474
{{#minimum}}
75-
@{{{vendorExtensions.fieldAnnPrefix}}}Min({{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{{.}}}L{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
75+
@{{{vendorExtensions.fieldAnnPrefix}}}Min({{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{{.}}}L{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
7676
{{/minimum}}
7777
{{#maximum}}
78-
@{{{vendorExtensions.fieldAnnPrefix}}}Max({{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{{.}}}L{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
78+
@{{{vendorExtensions.fieldAnnPrefix}}}Max({{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{{.}}}L{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
7979
{{/maximum}}
8080
{{/isLong}}
8181
{{!Not Integer, not Long => we have a decimal value!}}
8282
{{^isInteger}}
8383
{{^isLong}}{{!minimum for decimal value}}
8484
{{#minimum}}
85-
@{{{vendorExtensions.fieldAnnPrefix}}}DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}{{^exclusiveMinimum}}{{#vendorExtensions.x-min-message}}value = {{/vendorExtensions.x-min-message}}{{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}{{#vendorExtensions.x-min-message}}, message = "{{{.}}}"{{/vendorExtensions.x-min-message}})
85+
@{{{vendorExtensions.fieldAnnPrefix}}}DecimalMin({{#exclusiveMinimum}}value = {{/exclusiveMinimum}}{{^exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}value = {{/vendorExtensions.x-minimum-message}}{{/exclusiveMinimum}}"{{minimum}}"{{#exclusiveMinimum}}, inclusive = false{{/exclusiveMinimum}}{{#vendorExtensions.x-minimum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-minimum-message}})
8686
{{/minimum}}
8787
{{!maximal for decimal value}}
8888
{{#maximum}}
89-
@{{{vendorExtensions.fieldAnnPrefix}}}DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}{{^exclusiveMaximum}}{{#vendorExtensions.x-max-message}}value = {{/vendorExtensions.x-max-message}}{{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}{{#vendorExtensions.x-max-message}}, message = "{{{.}}}"{{/vendorExtensions.x-max-message}})
89+
@{{{vendorExtensions.fieldAnnPrefix}}}DecimalMax({{#exclusiveMaximum}}value = {{/exclusiveMaximum}}{{^exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}value = {{/vendorExtensions.x-maximum-message}}{{/exclusiveMaximum}}"{{maximum}}"{{#exclusiveMaximum}}, inclusive = false{{/exclusiveMaximum}}{{#vendorExtensions.x-maximum-message}}, message = "{{{.}}}"{{/vendorExtensions.x-maximum-message}})
9090
{{/maximum}}
9191
{{/isLong}}
9292
{{/isInteger}}

‎openapi-generator/src/test/resources/3_0/validation-messages.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ paths:
8080
format: int32
8181
minimum: 5
8282
maximum: 10
83-
x-min-message: This is min message
84-
x-max-message: This is max message
83+
x-minimum-message: This is min message
84+
x-maximum-message: This is max message
8585
x-not-null-message: This is required int message
8686

8787
- name: decimalParam
@@ -93,8 +93,8 @@ paths:
9393
type: number
9494
minimum: 5.5
9595
maximum: 10.5
96-
x-min-message: This is decimal min message
97-
x-max-message: This is decimal max message
96+
x-minimum-message: This is decimal min message
97+
x-maximum-message: This is decimal max message
9898
x-not-null-message: This is required decimal message
9999

100100
- name: decimalParam2
@@ -108,8 +108,8 @@ paths:
108108
exclusiveMinimum: true
109109
maximum: 10.5
110110
exclusiveMaximum: true
111-
x-min-message: This is decimal min message
112-
x-max-message: This is decimal max message
111+
x-minimum-message: This is decimal min message
112+
x-maximum-message: This is decimal max message
113113
x-not-null-message: This is required decimal message
114114
x-not-null-message: This is required param message
115115

@@ -123,7 +123,7 @@ paths:
123123
format: int32
124124
minimum: 0
125125
exclusiveMinimum: true
126-
x-min-message: This is positive message
126+
x-minimum-message: This is positive message
127127
x-not-null-message: This is required int message
128128

129129
- name: positiveOrZeroParam
@@ -136,7 +136,7 @@ paths:
136136
format: int32
137137
minimum: 0
138138
exclusiveMinimum: false
139-
x-min-message: This is positive or zero message
139+
x-minimum-message: This is positive or zero message
140140
x-not-null-message: This is required int message
141141

142142
- name: negativeParam
@@ -149,7 +149,7 @@ paths:
149149
format: int32
150150
maximum: 0
151151
exclusiveMaximum: true
152-
x-max-message: This is negative message
152+
x-maximum-message: This is negative message
153153
x-not-null-message: This is required int message
154154

155155
- name: negativeOrZeroParam
@@ -162,7 +162,7 @@ paths:
162162
format: int32
163163
maximum: 0
164164
exclusiveMaximum: false
165-
x-max-message: This is negative or zero message
165+
x-maximum-message: This is negative or zero message
166166
x-not-null-message: This is required int message
167167

168168
requestBody:
@@ -221,52 +221,52 @@ components:
221221
format: int32
222222
minimum: 5
223223
maximum: 10
224-
x-min-message: This is min message
225-
x-max-message: This is max message
224+
x-minimum-message: This is min message
225+
x-maximum-message: This is max message
226226
x-not-null-message: This is required int message
227227
positiveProp:
228228
type: integer
229229
format: int32
230230
minimum: 0
231231
exclusiveMinimum: true
232-
x-min-message: This is positive message
232+
x-minimum-message: This is positive message
233233
x-not-null-message: This is required int message
234234
positiveOrZeroProp:
235235
type: integer
236236
format: int32
237237
minimum: 0
238238
exclusiveMinimum: false
239-
x-min-message: This is positive or zero message
239+
x-minimum-message: This is positive or zero message
240240
x-not-null-message: This is required int message
241241
negativeProp:
242242
type: integer
243243
format: int32
244244
maximum: 0
245245
exclusiveMaximum: true
246-
x-max-message: This is negative message
246+
x-maximum-message: This is negative message
247247
x-not-null-message: This is required int message
248248
negativeOrZeroProp:
249249
type: integer
250250
format: int32
251251
maximum: 0
252252
exclusiveMaximum: false
253-
x-max-message: This is negative or zero message
253+
x-maximum-message: This is negative or zero message
254254
x-not-null-message: This is required int message
255255
decimalProp:
256256
type: number
257257
minimum: 5.5
258258
maximum: 10.5
259-
x-min-message: This is decimal min message
260-
x-max-message: This is decimal max message
259+
x-minimum-message: This is decimal min message
260+
x-maximum-message: This is decimal max message
261261
x-not-null-message: This is required decimal message
262262
decimalProp2:
263263
type: number
264264
minimum: 5.5
265265
exclusiveMinimum: true
266266
maximum: 10.5
267267
exclusiveMaximum: true
268-
x-min-message: This is decimal min message
269-
x-max-message: This is decimal max message
268+
x-minimum-message: This is decimal min message
269+
x-maximum-message: This is decimal max message
270270
x-not-null-message: This is required decimal message
271271
arrayProp1:
272272
type: array

‎openapi/src/main/java/io/micronaut/openapi/visitor/GeneratorExt.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public interface GeneratorExt {
3131
String ENUM_DESCRIPTIONS = "x-enum-descriptions";
3232
String ENUM_DEPRECATED = "x-deprecated";
3333
String DEPRECATED_MESSAGE = "x-deprecated-message";
34-
String MIN_MESSAGE = "x-min-message";
35-
String MAX_MESSAGE = "x-max-message";
34+
String MIN_MESSAGE = "x-minimum-message";
35+
String MAX_MESSAGE = "x-maximum-message";
3636
String SIZE_MESSAGE = "x-size-message";
3737
String PATTERN_MESSAGE = "x-pattern-message";
3838
String NOT_NULL_MESSAGE = "x-not-null-message";

‎src/main/docs/guide/openApiGeneratorExtensions.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Currently, the following extensions are supported:
1919
| `*x-deprecated*` | `Schema` *(only enum)* | List of deprecated enum items
2020
| `*x-type*` | `Schema` | If the variable/parameter has a primitive type that is not in the OpenAPI 3 specification, this field will be filled in. Used for primitive java types `byte`, `short`, `int`, `long`, `float`, `double`, `char`
2121
| `*x-format*` | `Schema` | If the variable/parameter has a type that is not in the OpenAPI 3 specification, this field will be filled in. Used for java types `Byte` (type: integer, `x-format: int8`), `Short` (type: integer, `x-format: int16`), `Char` (type: string, `x-format: char`)
22-
| `*x-min-message*` | `Schema` | Message from `jakarta.validation` annotations: `@Min`, `@DecimalMin`, `@Negative`, `@NegativeOrZero`, `@Positive`, `@PositiveOrZero`
23-
| `*x-max-message*` | `Schema` | Message from `jakarta.validation` annotations: `@Max`, `@DecimalMax`
22+
| `*x-minimum-message*` | `Schema` | Message from `jakarta.validation` annotations: `@Min`, `@DecimalMin`, `@Negative`, `@NegativeOrZero`, `@Positive`, `@PositiveOrZero`
23+
| `*x-maximum-message*` | `Schema` | Message from `jakarta.validation` annotations: `@Max`, `@DecimalMax`
2424
| `*x-size-message*` | `Schema` | Message from `jakarta.validation` annotations: `@NotEmpty`, `@Size`, `@NotBlank`
2525
| `*x-pattern-message*` | `Schema` | Message from `jakarta.validation` annotations: `@Pattern`, `@Email`
2626
| `*x-not-null-message*` | `Schema` | Message from `jakarta.validation` annotation `@NotNull`

0 commit comments

Comments
 (0)