Skip to content

Commit 259355a

Browse files
committed
update unevaluatedProperties type to Schema
1 parent 875b2ca commit 259355a

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

modules/swagger-core/src/test/java/io/swagger/v3/core/serialization/OpenAPI3_1SerializationTest.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,8 @@ public void testComponentPathItemsSerialization() {
545545
" body:\n" +
546546
" content:\n" +
547547
" application/json:\n" +
548-
" schema: {}\n" +
548+
" schema: \n" +
549+
" type: object\n" +
549550
" headers:\n" +
550551
" test-head:\n" +
551552
" description: test header description\n" +
@@ -605,7 +606,9 @@ public void testComponentPathItemsSerialization() {
605606
" \"body\" : {\n" +
606607
" \"content\" : {\n" +
607608
" \"application/json\" : {\n" +
608-
" \"schema\" : { }\n" +
609+
" \"schema\" : {\n" +
610+
" \"type\" : \"object\"\n" +
611+
" }\n" +
609612
" }\n" +
610613
" }\n" +
611614
" }\n" +
@@ -1110,7 +1113,8 @@ public void testRequestBodyRefSerialization() {
11101113
" body:\n" +
11111114
" content:\n" +
11121115
" application/json:\n" +
1113-
" schema: {}");
1116+
" schema: \n" +
1117+
" type: object");
11141118
SerializationMatchers.assertEqualsToJson31(openAPI, "{\n" +
11151119
" \"openapi\" : \"3.1.0\",\n" +
11161120
" \"paths\" : {\n" +
@@ -1130,7 +1134,9 @@ public void testRequestBodyRefSerialization() {
11301134
" \"body\" : {\n" +
11311135
" \"content\" : {\n" +
11321136
" \"application/json\" : {\n" +
1133-
" \"schema\" : { }\n" +
1137+
" \"schema\" : {\n" +
1138+
" \"type\" : \"object\"\n" +
1139+
" }\n" +
11341140
" }\n" +
11351141
" }\n" +
11361142
" }\n" +

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public Schema specVersion(SpecVersion specVersion) {
177177
* @since 2.2.0 (OpenAPI 3.1.0)
178178
*/
179179
@OpenAPI31
180-
private Object unevaluatedProperties;
180+
private Schema unevaluatedProperties;
181181

182182
/**
183183
* @since 2.2.0 (OpenAPI 3.1.0)
@@ -586,6 +586,7 @@ public Schema() {
586586

587587
protected Schema(String type, String format) {
588588
this.type = type;
589+
this.addType(type);
589590
this.format = format;
590591
}
591592

@@ -595,6 +596,7 @@ public Schema(SpecVersion specVersion) {
595596

596597
protected Schema(String type, String format, SpecVersion specVersion) {
597598
this.type = type;
599+
this.addType(type);
598600
this.format = format;
599601
this.specVersion = specVersion;
600602
}
@@ -1560,7 +1562,7 @@ public Schema propertyNames(Schema propertyNames) {
15601562
* @since 2.2.0 (OpenAPI 3.1.0)
15611563
*/
15621564
@OpenAPI31
1563-
public Object getUnevaluatedProperties() {
1565+
public Schema getUnevaluatedProperties() {
15641566
return unevaluatedProperties;
15651567
}
15661568

@@ -1569,7 +1571,7 @@ public Object getUnevaluatedProperties() {
15691571
* @since 2.2.0 (OpenAPI 3.1.0)
15701572
*/
15711573
@OpenAPI31
1572-
public void setUnevaluatedProperties(Object unevaluatedProperties) {
1574+
public void setUnevaluatedProperties(Schema unevaluatedProperties) {
15731575
this.unevaluatedProperties = unevaluatedProperties;
15741576
}
15751577

@@ -1578,7 +1580,7 @@ public void setUnevaluatedProperties(Object unevaluatedProperties) {
15781580
* @since 2.2.0 (OpenAPI 3.1.0)
15791581
*/
15801582
@OpenAPI31
1581-
public Schema unevaluatedProperties(Object unevaluatedProperties) {
1583+
public Schema unevaluatedProperties(Schema unevaluatedProperties) {
15821584
this.unevaluatedProperties = unevaluatedProperties;
15831585
return this;
15841586
}

0 commit comments

Comments
 (0)