Merge branch 'master' into preserve-body-parameter-name

Author: gracekarina

README.md

@@ -99,22 +99,13 @@ You can include this library from Sonatype OSS for SNAPSHOTS, or Maven central f
 <dependency>
   <groupId>io.swagger.parser.v3</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>2.0.8-SNAPSHOT</version>
+  <version>2.0.12</version>
 </dependency>
-
 ```
 
-or
-
-```xml
-<dependency>
-  <groupId>io.swagger.parser.v3</groupId>
-  <artifactId>swagger-parser</artifactId>
-  <version>2.0.8-SNAPSHOT</version>
-</dependency>
-
-```
+## Security contact
 
+Please disclose any security-related issues or vulnerabilities by emailing [[email protected]](mailto:[email protected]), instead of using the public issue tracker.
 
 License
 -------

modules/swagger-parser-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.8-SNAPSHOT</version>
+        <version>2.0.13-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v2-converter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.8-SNAPSHOT</version>
+        <version>2.0.13-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -71,6 +71,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -139,6 +140,10 @@ public SwaggerParseResult convert(SwaggerDeserializationResult parse) {
 
         Swagger swagger = parse.getSwagger();
 
+        if (swagger.getVendorExtensions() != null) {
+            openAPI.setExtensions(convert(swagger.getVendorExtensions()));
+        }
+
         if (swagger.getExternalDocs() != null) {
             openAPI.setExternalDocs(convert(swagger.getExternalDocs()));
         }
@@ -415,7 +420,7 @@ private List<Server> convert(List<Scheme> schemes, String host, String basePath)
                 servers.add(server);
             }
         } else {
-            if (!"/".equals(baseUrl)) {
+            if (!StringUtils.startsWith(baseUrl, "/") && !"/".equals(baseUrl)) {
                 baseUrl = "//" + baseUrl;
             }
             Server server = new Server();
@@ -917,7 +922,7 @@ private Schema convert(Property schema) {
             result.setExample(schema.getExample());
 
             if ("object".equals(schema.getType()) && (result.getProperties() != null) && (result.getProperties().size() > 0)) {
-                Map<String, Schema> properties = new HashMap<>();
+                Map<String, Schema> properties = new LinkedHashMap<>();
 
                 ((ObjectProperty) schema).getProperties().forEach((k, v) -> properties.put(k, convert(v)));
 
@@ -1056,7 +1061,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,8 @@ 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 ISSUE_1113_YAML = "issue-1113.yaml";
 
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
@@ -153,6 +156,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 +170,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;
 
@@ -734,6 +740,13 @@ public void testIssue755() throws Exception {
         final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_755_YAML);
         assertNotNull(oas);
     }
+
+    @Test(description = "OpenAPI v2 converter - top-level extensions should be preserved")
+    public void testTopLevelExtensions() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(PARAMETER_CONVERSION_JSON);
+        assertNotNull(oas);
+        assertEquals((String)oas.getExtensions().get("x-some-extensions"), "hello");
+    }
 
     @Test(description = "OpenAPI v2 converter - Conversion param extensions should be preserved")
     public void testIssue820() throws Exception {
@@ -762,6 +775,29 @@ 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());
+    }
+
+    @Test(description = "OpenAPI v2 converter - converts URL correctly when it begins with forward slash")
+    public void testIssue1113() throws Exception {
+        final OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1113_YAML);
+        assertNotNull(oas);
+        assertNotNull(oas.getServers());
+        assertFalse(oas.getServers().isEmpty());
+        assertNotNull(oas.getServers().get(0));
+        assertEquals(oas.getServers().get(0).getUrl(), "/test");
+    }
+    
     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 +807,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

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

@@ -0,0 +1,14 @@
+swagger: '2.0'
+info:
+  title: Test for Issue 1113
+  version: 1.0.0
+basePath: /test
+paths:
+  /ping:
+    get:
+      summary: test
+      description: 'test'
+      operationId: pingOp
+      responses:
+        '200':
+          description: OK

modules/swagger-parser-v2-converter/src/test/resources/parameter-conversion.json

@@ -1,5 +1,6 @@
 {
     "swagger": "2.0",
+    "x-some-extensions": "hello",
     "info": {
         "version": "1.0",
         "title": "x-example"

modules/swagger-parser-v3/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.8-SNAPSHOT</version>
+        <version>2.0.13-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java

@@ -197,19 +197,36 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
         return result;
     }
 
-    protected List<SwaggerParserExtension> getExtensions() {
+    /**
+     * Locates extensions on the current thread class loader and then, if it differs
+     * from this class classloader (as in OSGi), locates extensions from this
+     * class classloader as well.
+     * 
+     * @return a list of extensions
+     */
+    public static List<SwaggerParserExtension> getExtensions() {
+        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+        List<SwaggerParserExtension> extensions = getExtensions(tccl);
+        ClassLoader cl = SwaggerParserExtension.class.getClassLoader();
+        if (cl != tccl) {
+            extensions.addAll(getExtensions(cl));
+        }
+        extensions.add(0, new OpenAPIV3Parser());
+        return extensions;
+    }
+
+    protected static List<SwaggerParserExtension> getExtensions(ClassLoader cl) {
         List<SwaggerParserExtension> extensions = new ArrayList<>();
 
-        ServiceLoader<SwaggerParserExtension> loader = ServiceLoader.load(SwaggerParserExtension.class);
+        ServiceLoader<SwaggerParserExtension> loader = ServiceLoader.load(SwaggerParserExtension.class, cl);
         Iterator<SwaggerParserExtension> itr = loader.iterator();
         while (itr.hasNext()) {
             extensions.add(itr.next());
         }
-        extensions.add(0, new OpenAPIV3Parser());
         return extensions;
     }
 
-    /**
+   /**
      * Transform the swagger-model version of AuthorizationValue into a parser-specific one, to avoid
      * dependencies across extensions
      *