Skip to content

Commit f1ec883

Browse files
frantumafrantuma
committed
OAS 3.1 - minor tweaks and tests
1 parent 03b9c03 commit f1ec883

File tree

26 files changed

+898
-56
lines changed

26 files changed

+898
-56
lines changed

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/info/Info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
/**
7373
* A short API summary.
7474
*
75-
* @since 2.2.4 / OpenAPI 3.1
75+
* @since 2.2.12 / OpenAPI 3.1
7676
* @return API summary
7777
**/
7878
@OpenAPI31

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/info/License.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
/**
4343
* An identifier for a License instance.
4444
*
45-
* @since 2.2.4 / OpenAPI 3.1
45+
* @since 2.2.12 / OpenAPI 3.1
4646
* @return the identifier of the license
4747
**/
4848
@OpenAPI31

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/ArraySchema.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
/**
3838
* The schemas of the items in the array
3939
*
40-
* @since 2.2.4
40+
* @since 2.2.12
4141
*
4242
* @return items
4343
*/
@@ -92,7 +92,7 @@
9292
/**
9393
* Specifies contains constrictions expressions.
9494
*
95-
* @since 2.2.4 / OpenAPI 3.1
95+
* @since 2.2.12 / OpenAPI 3.1
9696
* @return contains expression.
9797
*/
9898
@OpenAPI31
@@ -101,7 +101,7 @@
101101
/**
102102
* Provides max contains related to this schema
103103
*
104-
* @since 2.2.4 / OpenAPI 3.1
104+
* @since 2.2.12 / OpenAPI 3.1
105105
* @return max contains
106106
*/
107107
@OpenAPI31
@@ -110,7 +110,7 @@
110110
/**
111111
* Provides min contains related to this schema
112112
*
113-
* @since 2.2.4 / OpenAPI 3.1
113+
* @since 2.2.12 / OpenAPI 3.1
114114
* @return min contains
115115
*/
116116
@OpenAPI31
@@ -119,7 +119,7 @@
119119
/**
120120
* Provides unevaluted items to this schema
121121
*
122-
* @since 2.2.4 / OpenAPI 3.1
122+
* @since 2.2.12 / OpenAPI 3.1
123123
* @return unevaluated items
124124
*/
125125
@OpenAPI31
@@ -128,7 +128,7 @@
128128
/**
129129
* Provides prefix items to this schema
130130
*
131-
* @since 2.2.4 / OpenAPI 3.1
131+
* @since 2.2.12 / OpenAPI 3.1
132132
* @return prefixItems
133133
*/
134134
@OpenAPI31

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/Content.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
/**
8989
* Subschemas to be applied for a given condition.
9090
*
91-
* @since 2.2.4 / OpenAPI 3.1
91+
* @since 2.2.12 / OpenAPI 3.1
9292
* @return list of dependent schemas.
9393
*/
9494
@OpenAPI31
@@ -97,7 +97,7 @@
9797
/**
9898
* Provides the content schema related to this schema
9999
*
100-
* @since 2.2.4 / OpenAPI 3.1
100+
* @since 2.2.12 / OpenAPI 3.1
101101
* @return content schema
102102
*/
103103
@OpenAPI31
@@ -106,7 +106,7 @@
106106
/**
107107
* Provides property names related to this schema
108108
*
109-
* @since 2.2.4 / OpenAPI 3.1
109+
* @since 2.2.12 / OpenAPI 3.1
110110
* @return proeprty names
111111
*/
112112
@OpenAPI31
@@ -115,7 +115,7 @@
115115
/**
116116
* Provides the if sub schema related to this schema
117117
*
118-
* @since 2.2.4 / OpenAPI 3.1
118+
* @since 2.2.12 / OpenAPI 3.1
119119
* @return if schema
120120
*/
121121
@OpenAPI31
@@ -124,7 +124,7 @@
124124
/**
125125
* Provides the then sub schema related to this schema
126126
*
127-
* @since 2.2.4 / OpenAPI 3.1
127+
* @since 2.2.12 / OpenAPI 3.1
128128
* @return then schema
129129
*/
130130
@OpenAPI31
@@ -133,7 +133,7 @@
133133
/**
134134
* Provides the else sub schema related to this schema
135135
*
136-
* @since 2.2.4 / OpenAPI 3.1
136+
* @since 2.2.12 / OpenAPI 3.1
137137
* @return else schema
138138
*/
139139
@OpenAPI31
@@ -142,31 +142,31 @@
142142
/**
143143
* Set schemas to validate according a given condition.
144144
*
145-
* @since 2.2.4 / OpenAPI 3.1
145+
* @since 2.2.12 / OpenAPI 3.1
146146
* @return not schema to be validated
147147
**/
148148
Schema not() default @Schema();
149149

150150
/**
151151
* Provides the oneOf sub schemas related to this schema.
152152
*
153-
* @since 2.2.4 / OpenAPI 3.1
153+
* @since 2.2.12 / OpenAPI 3.1
154154
* @return oneOf sub schemas
155155
**/
156156
Schema[] oneOf() default {};
157157

158158
/**
159159
* Provides the anyOf sub schemas related to this schema.
160160
*
161-
* @since 2.2.4 / OpenAPI 3.1
161+
* @since 2.2.12 / OpenAPI 3.1
162162
* @return anyOf sub schemas
163163
**/
164164
Schema[] anyOf() default {};
165165

166166
/**
167167
* Provides the allOf sub schemas related to this schema..
168168
*
169-
* @since 2.2.4 / OpenAPI 3.1
169+
* @since 2.2.12 / OpenAPI 3.1
170170
* @return allOf sub schemas
171171
**/
172172
Schema[] allOf() default {};

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/DependentRequired.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @see Schema
2121
*
22-
* @since 2.2.4 / OpenAPI 3.1
22+
* @since 2.2.12 / OpenAPI 3.1
2323
**/
2424
@Target({FIELD, METHOD, PARAMETER, TYPE, ANNOTATION_TYPE})
2525
@Retention(RetentionPolicy.RUNTIME)

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/DependentRequiredMap.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* Container for repeatable {@link DependentRequired} annotation
1818
*
19-
* @since 2.2.4 / OpenAPI 3.1
19+
* @since 2.2.12 / OpenAPI 3.1
2020
* @see DependentRequired
2121
*/
2222
@Target({FIELD, METHOD, PARAMETER, TYPE, ANNOTATION_TYPE})

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/DependentSchema.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @see Schema
2121
*
22-
* @since 2.2.4 / OpenAPI 3.1
22+
* @since 2.2.12 / OpenAPI 3.1
2323
**/
2424
@Target({FIELD, METHOD, PARAMETER, TYPE, ANNOTATION_TYPE})
2525
@Retention(RetentionPolicy.RUNTIME)

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/DiscriminatorMapping.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
/**
4242
* The list of optional extensions
4343
*
44-
* @since 2.2.4 / OpenAPI 3.1
44+
* @since 2.2.12 / OpenAPI 3.1
4545
* @return an optional array of extensions
4646
*/
4747
@OpenAPI31

‎modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/Schema.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -340,14 +340,14 @@
340340
/**
341341
* List of schema types
342342
*
343-
* @since 2.2.4 / OpenAPI 3.1
343+
* @since 2.2.12 / OpenAPI 3.1
344344
* @return array of types
345345
*/
346346
@OpenAPI31
347347
String[] types() default {};
348348

349349
/**
350-
* @since 2.2.4 / OpenAPI 3.1
350+
* @since 2.2.12 / OpenAPI 3.1
351351
*
352352
* OAS 3.1 version of `exclusiveMaximum`, accepting a numeric value
353353
*
@@ -359,7 +359,7 @@
359359
/**
360360
* Provides an exclusive minimum for a expressing exclusive range.
361361
*
362-
* @since 2.2.4 / OpenAPI 3.1
362+
* @since 2.2.12 / OpenAPI 3.1
363363
* @return an exclusive minimum.
364364
*/
365365
@OpenAPI31
@@ -375,7 +375,7 @@
375375
/**
376376
* Provides the $id related to this schema.
377377
*
378-
* @since 2.2.4 / OpenAPI 3.1
378+
* @since 2.2.12 / OpenAPI 3.1
379379
* @return the $id of schema
380380
*/
381381
@OpenAPI31
@@ -384,7 +384,7 @@
384384
/**
385385
* Provides Json Schema dialect where the schema is valid.
386386
*
387-
* @since 2.2.4 / OpenAPI 3.1
387+
* @since 2.2.12 / OpenAPI 3.1
388388
* @return json schema dialect
389389
*/
390390
@OpenAPI31
@@ -393,7 +393,7 @@
393393
/**
394394
* Provides the $anchor related to schema
395395
*
396-
* @since 2.2.4 / OpenAPI 3.1
396+
* @since 2.2.12 / OpenAPI 3.1
397397
* @return $anchor schema
398398
*/
399399
@OpenAPI31
@@ -402,7 +402,7 @@
402402
/**
403403
* Provides the content encoding related to this schema
404404
*
405-
* @since 2.2.4 / OpenAPI 3.1
405+
* @since 2.2.12 / OpenAPI 3.1
406406
* @return content encoding
407407
*/
408408
@OpenAPI31
@@ -411,7 +411,7 @@
411411
/**
412412
* Provides the content media type related to this schema
413413
*
414-
* @since 2.2.4 / OpenAPI 3.1
414+
* @since 2.2.12 / OpenAPI 3.1
415415
* @return content media type
416416
*/
417417
@OpenAPI31
@@ -420,7 +420,7 @@
420420
/**
421421
* Provides the content schema related to this schema
422422
*
423-
* @since 2.2.4 / OpenAPI 3.1
423+
* @since 2.2.12 / OpenAPI 3.1
424424
* @return content schema
425425
*/
426426
@OpenAPI31
@@ -429,7 +429,7 @@
429429
/**
430430
* Provides property names related to this schema
431431
*
432-
* @since 2.2.4 / OpenAPI 3.1
432+
* @since 2.2.12 / OpenAPI 3.1
433433
* @return property names
434434
*/
435435
@OpenAPI31
@@ -464,7 +464,7 @@
464464
/**
465465
* Provides the if sub schema related to this schema
466466
*
467-
* @since 2.2.4 / OpenAPI 3.1
467+
* @since 2.2.12 / OpenAPI 3.1
468468
* @return if sub schema
469469
*/
470470
@OpenAPI31
@@ -473,7 +473,7 @@
473473
/**
474474
* Provides the else sub schema related to this schema
475475
*
476-
* @since 2.2.4 / OpenAPI 3.1
476+
* @since 2.2.12 / OpenAPI 3.1
477477
* @return else sub schema
478478
*/
479479
@OpenAPI31
@@ -482,7 +482,7 @@
482482
/**
483483
* Provides the then sub schema related to this schema
484484
*
485-
* @since 2.2.4 / OpenAPI 3.1
485+
* @since 2.2.12 / OpenAPI 3.1
486486
* @return then sub schema
487487
*/
488488
@OpenAPI31
@@ -491,7 +491,7 @@
491491
/**
492492
* Provides $comment related to this schema
493493
*
494-
* @since 2.2.4 / OpenAPI 3.1
494+
* @since 2.2.12 / OpenAPI 3.1
495495
* @return $comment related to schema
496496
*/
497497
@OpenAPI31
@@ -501,7 +501,7 @@
501501
* Provides a list of examples related to this schema
502502
* @return list of examples
503503
*/
504-
Class<?>[] examples() default {};
504+
Class<?>[] exampleClasses() default {};
505505

506506
/**
507507
* Allows to specify the additionalProperties value
@@ -539,7 +539,7 @@ enum RequiredMode {
539539
/**
540540
* Allows to specify the dependentRequired value
541541
**
542-
* @since 2.2.4 / OpenAPI 3.1
542+
* @since 2.2.12 / OpenAPI 3.1
543543
* @return the list of DependentRequire annotations
544544
*
545545
*/
@@ -549,7 +549,7 @@ enum RequiredMode {
549549
/**
550550
* Allows to specify the dependentSchemas value providing a Class to be resolved into a Schema
551551
*
552-
* @since 2.2.4 / OpenAPI 3.1
552+
* @since 2.2.12 / OpenAPI 3.1
553553
* @return the list of dependentSchemas annotations
554554
*
555555
*/
@@ -559,7 +559,7 @@ enum RequiredMode {
559559
/**
560560
* Provides pattern properties to this schema
561561
*
562-
* @since 2.2.4 / OpenAPI 3.1
562+
* @since 2.2.12 / OpenAPI 3.1
563563
* @return pattern properties
564564
*/
565565
@OpenAPI31
@@ -575,7 +575,7 @@ enum RequiredMode {
575575
/**
576576
* Provides unevaluated properties to this schema
577577
*
578-
* @since 2.2.4 / OpenAPI 3.1
578+
* @since 2.2.12 / OpenAPI 3.1
579579
* @return unevaluated properties
580580
*/
581581
@OpenAPI31
@@ -593,7 +593,7 @@ enum RequiredMode {
593593
/**
594594
* Provides value restricted to this schema.
595595
*
596-
* @since 2.2.4 / OpenAPI 3.1
596+
* @since 2.2.12 / OpenAPI 3.1
597597
* @return const value
598598
*/
599599
@OpenAPI31

‎modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import io.swagger.v3.core.util.ReferenceTypeUtils;
4040
import io.swagger.v3.core.util.PrimitiveType;
4141
import io.swagger.v3.core.util.ReflectionUtils;
42-
import io.swagger.v3.core.util.Yaml31;
4342
import io.swagger.v3.oas.annotations.Hidden;
4443
import io.swagger.v3.oas.annotations.StringToClassMapItem;
4544
import io.swagger.v3.oas.annotations.media.DependentRequired;

0 commit comments

Comments
 (0)