Skip to content

Commit 5dde3b3

Browse files
committed
added fix for issue-1228
1 parent 2e0cffc commit 5dde3b3

File tree

3 files changed

+9
-64
lines changed

3 files changed

+9
-64
lines changed

modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,9 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {
10891089
a.setUniqueItems(sp.isUniqueItems());
10901090
}
10911091

1092+
a.setMaximum(sp.getMaximum());
1093+
a.setMinimum(sp.getMinimum());
1094+
10921095
schema = a;
10931096
} else {
10941097
schema = SchemaTypeUtil.createSchema(sp.getType(), sp.getFormat());

modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,10 @@ private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException,
847847
public void testissue1228() throws Exception {
848848
final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1228_YAML);
849849
assertNotNull(oas);
850-
assertNotNull(oas.getPaths().get("/foobar").getGet().getParameters().get(2).getSchema().getMinimum());
851-
assertNotNull(oas.getPaths().get("/foobar").getGet().getParameters().get(2).getSchema().getMaximum());
850+
assertNotNull(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMinimum());
851+
assertNotNull(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMaximum());
852+
assertTrue(String.valueOf(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMinimum()).equals("1.0"));
853+
assertTrue(String.valueOf(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMaximum()).equals("2.0"));
852854

853855
}
854856
}

modules/swagger-parser-v2-converter/src/test/resources/issue-1228.json

Lines changed: 2 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,6 @@
2323
"*/*"
2424
],
2525
"parameters":[
26-
{
27-
"name":"bar",
28-
"in":"query",
29-
"required":false,
30-
"type":"integer",
31-
"maximum":4.0,
32-
"exclusiveMaximum":false,
33-
"minimum":3.0,
34-
"exclusiveMinimum":false,
35-
"format":"int32"
36-
},
37-
{
38-
"in":"body",
39-
"name":"bar",
40-
"description":"bar",
41-
"required":false,
42-
"schema":{
43-
"type":"integer",
44-
"format":"int32"
45-
}
46-
},
4726
{
4827
"name":"bars",
4928
"in":"query",
@@ -54,52 +33,13 @@
5433
"format":"int32"
5534
},
5635
"collectionFormat":"multi",
57-
"maximum":2,
58-
"minimum":1
59-
},
60-
{
61-
"in":"body",
62-
"name":"bars",
63-
"description":"bars",
64-
"required":true,
65-
"schema":{
66-
"type":"array",
67-
"items":{
68-
"type":"integer",
69-
"format":"int32"
70-
}
71-
}
72-
},
73-
{
74-
"name":"foo",
75-
"in":"query",
76-
"required":false,
77-
"type":"string",
78-
"pattern":"foo"
79-
},
80-
{
81-
"in":"body",
82-
"name":"foo",
83-
"description":"foo",
84-
"required":false,
85-
"pattern":"foo",
86-
"schema":{
87-
"type":"string"
88-
}
36+
"maximum":2.0,
37+
"minimum":1.0
8938
}
9039
],
9140
"responses":{
9241
"200":{
9342
"description":"OK"
94-
},
95-
"401":{
96-
"description":"Unauthorized"
97-
},
98-
"403":{
99-
"description":"Forbidden"
100-
},
101-
"404":{
102-
"description":"Not Found"
10343
}
10444
},
10545
"deprecated":false

0 commit comments

Comments
 (0)