Merge pull request #1033 from barney2k7/issue-1032

Refine creation of Schema to fix #1032

Author: gracekarina

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

@@ -1060,7 +1060,7 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {
 
                 schema = a;
             } else {
-                schema = new Schema();
+                schema = SchemaTypeUtil.createSchema(sp.getType(), sp.getFormat());
                 schema.setType(sp.getType());
                 schema.setFormat(sp.getFormat());
 

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

@@ -8,6 +8,7 @@
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.IntegerSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
@@ -88,6 +89,7 @@ public class V2ConverterTest {
     private static final String ISSUE_765_YAML = "issue-765.yaml";
     private static final String ISSUE_768_JSON = "issue-786.json";
     private static final String ISSUE_820_YAML = "issue-820.yaml";
+    private static final String ISSUE_1032_YAML = "issue-1032.yaml";
 
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
@@ -153,6 +155,9 @@ public class V2ConverterTest {
     private static final String ARRAY_VALUES = "[{\"id\":-1,\"name\":\"Marvin the Paranoid Android\"}," +
             "{\"id\":1000000,\"name\":\"Zaphod Beeblebrox\",\"friends\":[15]}]";
     private static final String SCHEMAS_A_REF = "#/components/schemas/A";
+    private static final String UNIX_TIMESTAMP_QUERY_PARAM = "unixTimestampQuery";
+    private static final String INTEGER_TYPE = "integer";
+    private static final String INT64_FORMAT = "int64";
 
     private static final int MAX_LENGTH = 60;
     private static final int REQUIRED_SIZE = 2;
@@ -164,7 +169,7 @@ public class V2ConverterTest {
     private static final int MIN_LENGTH = 3;
     private static final int NUMBER_VALUE_TWENTY = 20;
     private static final double MULTIPLE_OF_VALUE = 0.01D;
-    private static final long DEFAULT_VALUE = 11L;
+    private static final int DEFAULT_VALUE = 11;
     private static final int EXAMPLE_8_NUMBER = 8;
     private static final int EXAMPLE_42_NUMBER = 42;
 
@@ -762,6 +767,19 @@ public void testIssue820() throws Exception {
         assertEquals(baz.getNullable(), Boolean.FALSE);
     }
 
+    @Test(description = "OpenAPI v2 converter - proper IntegerSchema parsing")
+    public void testIssue1032() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1032_YAML);
+        assertNotNull(oas);
+        Parameter unixTimestampQueryParameter = oas.getComponents().getParameters().get(UNIX_TIMESTAMP_QUERY_PARAM);
+        assertNotNull(unixTimestampQueryParameter);
+        Schema s = unixTimestampQueryParameter.getSchema();
+        assertTrue((s instanceof IntegerSchema), "actual type: " + s);
+        IntegerSchema integerSchema = (IntegerSchema) s;
+        assertEquals(INTEGER_TYPE, integerSchema.getType());
+        assertEquals(INT64_FORMAT, integerSchema.getFormat());
+    }
+    
     private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException, URISyntaxException {
         SwaggerConverter converter = new SwaggerConverter();
         String swaggerAsString = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource(file).toURI())));
@@ -771,4 +789,4 @@ private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException,
         assertNotNull(result);
         return result.getOpenAPI();
     }
-}
+}

modules/swagger-parser-v2-converter/src/test/resources/issue-1032.yaml

@@ -0,0 +1,27 @@
+swagger: '2.0'
+basePath: "/"
+info:
+  version: "1"
+  title: "x"
+
+schemes:
+- https
+consumes:
+- application/json
+produces:
+- application/json
+paths:
+  /data:
+    get:
+      operationId: "getData"
+      parameters:
+      - $ref: '#/parameters/unixTimestampQuery'
+      responses:
+        '403':
+          description: Forbidden
+parameters:
+  unixTimestampQuery:
+    in: query
+    name: unixTimestamp
+    type: integer
+    format: int64