Merge remote-tracking branch 'origin/master' into 2.0-OpenAPITools

Conflicts:
	modules/swagger-parser-core/pom.xml
	modules/swagger-parser-v2-converter/pom.xml
	modules/swagger-parser-v3/pom.xml
	modules/swagger-parser/pom.xml
	pom.xml

Author: jmini

modules/swagger-parser-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openapitools.swagger.parser</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.12-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>org.openapitools.swagger.parser</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>2.0.13-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v3/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openapitools.swagger.parser</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.12-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

@@ -204,7 +204,7 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
      * 
      * @return a list of extensions
      */
-    protected List<SwaggerParserExtension> getExtensions() {
+    public static List<SwaggerParserExtension> getExtensions() {
         ClassLoader tccl = Thread.currentThread().getContextClassLoader();
         List<SwaggerParserExtension> extensions = getExtensions(tccl);
         ClassLoader cl = SwaggerParserExtension.class.getClassLoader();
@@ -215,7 +215,7 @@ protected List<SwaggerParserExtension> getExtensions() {
         return extensions;
     }
 
-    protected List<SwaggerParserExtension> getExtensions(ClassLoader cl) {
+    protected static List<SwaggerParserExtension> getExtensions(ClassLoader cl) {
         List<SwaggerParserExtension> extensions = new ArrayList<>();
 
         ServiceLoader<SwaggerParserExtension> loader = ServiceLoader.load(SwaggerParserExtension.class, cl);

modules/swagger-parser/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openapitools.swagger.parser</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.12-SNAPSHOT</version>
+        <version>2.0.13-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser/src/main/java/io/swagger/parser/OpenAPIParser.java

@@ -6,16 +6,13 @@
 import io.swagger.v3.parser.core.models.SwaggerParseResult;
 import io.swagger.v3.parser.OpenAPIV3Parser;
 
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import java.util.ServiceLoader;
 
 public class OpenAPIParser {
     public SwaggerParseResult readLocation(String url, List<AuthorizationValue> auth, ParseOptions options) {
         SwaggerParseResult output = null;
 
-        for(SwaggerParserExtension extension : getExtensions()) {
+        for(SwaggerParserExtension extension : OpenAPIV3Parser.getExtensions()) {
             output = extension.readLocation(url, auth, options);
             if(output != null && output.getOpenAPI() != null) {
                 return output;
@@ -28,7 +25,7 @@ public SwaggerParseResult readLocation(String url, List<AuthorizationValue> auth
     public SwaggerParseResult readContents(String swaggerAsString, List<AuthorizationValue> auth, ParseOptions options) {
         SwaggerParseResult output = null;
 
-        for(SwaggerParserExtension extension : getExtensions()) {
+        for(SwaggerParserExtension extension : OpenAPIV3Parser.getExtensions()) {
             output = extension.readContents(swaggerAsString, auth, options);
             if(output != null && output.getOpenAPI() != null) {
                 return output;
@@ -38,15 +35,4 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
         return output;
     }
 
-    protected List<SwaggerParserExtension> getExtensions() {
-        List<SwaggerParserExtension> extensions = new ArrayList<>();
-
-        ServiceLoader<SwaggerParserExtension> loader = ServiceLoader.load(SwaggerParserExtension.class);
-        Iterator<SwaggerParserExtension> itr = loader.iterator();
-        while (itr.hasNext()) {
-            extensions.add(itr.next());
-        }
-        extensions.add(0, new OpenAPIV3Parser());
-        return extensions;
-    }
 }

modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java

@@ -481,5 +481,21 @@ public void testIssue959() {
 
     }
 
+    @Test
+    public void testIssue1003_ExtensionsClassloader() {
+        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+        SwaggerParseResult api = null;
+        try {
+            // Temporarily switch tccl to an unproductive cl
+            final ClassLoader tcclTemp = new java.net.URLClassLoader(new java.net.URL[] {},
+                ClassLoader.getSystemClassLoader());
+            Thread.currentThread().setContextClassLoader(tcclTemp);
+            api = new OpenAPIParser().readLocation("src/test/resources/petstore.yaml",null,null);
+        } finally {
+            Thread.currentThread().setContextClassLoader(tccl);
+        }
+        assertNotNull(api);
+    }
+  
 }
 

pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapitools.swagger.parser</groupId>
     <artifactId>swagger-parser-project</artifactId>
-    <version>2.0.12-SNAPSHOT</version>
+    <version>2.0.13-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>swagger-parser-project</name>
     <developers>