Merge pull request #1231 from r-sreesaran/issue-1228

Issue 1228

Author: gracekarina

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

@@ -1089,6 +1089,9 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {
                     a.setUniqueItems(sp.isUniqueItems());
                 }
 
+                a.setMaximum(sp.getMaximum());
+                a.setMinimum(sp.getMinimum());
+
                 schema = a;
             } else {
                 schema = SchemaTypeUtil.createSchema(sp.getType(), sp.getFormat());

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

@@ -94,6 +94,8 @@ public class V2ConverterTest {
     private static final String ISSUE_1032_YAML = "issue-1032.yaml";
     private static final String ISSUE_1113_YAML = "issue-1113.yaml";
     private static final String ISSUE_1164_YAML = "issue-1164.yaml";
+    private static final String ISSUE_1228_YAML = "issue-1228.json";
+
 
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
@@ -840,4 +842,15 @@ private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException,
         assertNotNull(result);
         return result.getOpenAPI();
     }
+
+    @Test(description = "OpenAPI v2 converter - uses minimum and maximum fields")
+    public void testissue1228() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1228_YAML);
+        assertNotNull(oas);
+        assertNotNull(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMinimum());
+        assertNotNull(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMaximum());
+        assertTrue(String.valueOf(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMinimum()).equals("1.0"));
+        assertTrue(String.valueOf(oas.getPaths().get("/foobar").getGet().getParameters().get(0).getSchema().getMaximum()).equals("2.0"));
+
+    }
 }

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

@@ -0,0 +1,49 @@
+{
+    "swagger":"2.0",
+    "info":{
+
+    },
+    "host":"localhost:51552",
+    "basePath":"/",
+    "tags":[
+        {
+            "name":"foo-controller",
+            "description":"Foo Controller"
+        }
+    ],
+    "paths":{
+        "/foobar":{
+            "get":{
+                "tags":[
+                    "foo-controller"
+                ],
+                "summary":"foo",
+                "operationId":"fooUsingGET",
+                "produces":[
+                    "*/*"
+                ],
+                "parameters":[
+                    {
+                        "name":"bars",
+                        "in":"query",
+                        "required":true,
+                        "type":"array",
+                        "items":{
+                            "type":"integer",
+                            "format":"int32"
+                        },
+                        "collectionFormat":"multi",
+                        "maximum":2.0,
+                        "minimum":1.0
+                    }
+                ],
+                "responses":{
+                    "200":{
+                        "description":"OK"
+                    }
+                },
+                "deprecated":false
+            }
+        }
+    }
+}

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -2375,12 +2375,6 @@ public Schema getSchema(ObjectNode node, String location, ParseResult result){
             schema.setWriteOnly(bool);
         }
 
-        bool = Optional.ofNullable(getBoolean("writeOnly", node, false, location, result)).orElse(false) &&  Optional.ofNullable(getBoolean("readOnly", node, false, location, result)).orElse(false);
-        if(bool == true){
-            result.warning(location," writeOnly and readOnly are both present");
-
-        }
-
         ObjectNode xmlNode = getObject("xml", node, false, location, result);
         if (xmlNode != null) {
             XML xml = getXml(xmlNode, location, result);

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -2192,22 +2192,4 @@ public void testParseOptionsSkipMatchesTrue() {
     private static int getDynamicPort() {
         return new Random().ints(10000, 20000).findFirst().getAsInt();
     }
-
-    @Test
-    public void testSampleParser() {
-        final String location = "src/test/resources/issue-1211.json";
-
-        final ParseOptions options = new ParseOptions();
-        options.setResolve(true);
-
-        final OpenAPIV3Parser parser = new OpenAPIV3Parser();
-        final SwaggerParseResult result = parser.readLocation(location, null, options);
-        System.out.println(result.getMessages());
-        OpenAPI openAPI = result.getOpenAPI();
-
-        assertNotNull(result.getOpenAPI());
-        assertTrue(result.getMessages().size() > 0);
-        assertEquals(result.getMessages().get(0).contains("attribute components.schemas.Pet. writeOnly and readOnly are both present"), true);
-
-    }
 }