Merge branch 'master' into fix-for-mixed-and-upper-case-url

Author: daniel-kmiecik

.github/workflows/codeql-analysis.yml

@@ -1,4 +1,4 @@
-name: "Code scanning - action"
+name: "CodeQL scanning - action"
 
 on:
   push:
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -29,15 +29,15 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: java
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -51,4 +51,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

README.md

@@ -114,7 +114,7 @@ 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.1.33</version>
+  <version>2.1.34</version>
 </dependency>
 ```
 

modules/swagger-parser-cli/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>swagger-parser-project</artifactId>
         <groupId>io.swagger.parser.v3</groupId>
-        <version>2.1.34-SNAPSHOT</version>
+        <version>2.1.35-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>io.swagger.parser.v3</groupId>
             <artifactId>swagger-parser-v3</artifactId>
-            <version>2.1.34-SNAPSHOT</version>
+            <version>2.1.35-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

modules/swagger-parser-core/pom.xml

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

modules/swagger-parser-safe-url-resolver/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.34-SNAPSHOT</version>
+        <version>2.1.35-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
 
     </parent>

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.1.34-SNAPSHOT</version>
+        <version>2.1.35-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v3/pom.xml

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

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

@@ -207,6 +207,9 @@ public SwaggerParseResult readWithInfo(String location, List<AuthorizationValue>
 
     private SwaggerParseResult resolve(SwaggerParseResult result, List<AuthorizationValue> auth, ParseOptions options,
             String location) {
+        if (location != null) {
+            location = location.replace('\\', '/');
+        }
         try {
             if (options != null) {
                 if (options.isResolve() || options.isResolveFully()) {
@@ -284,7 +287,7 @@ private ObjectMapper getRightMapper(String data) {
     }
 
     private String readContentFromLocation(String location, List<AuthorizationValue> auth) {
-        final String adjustedLocation = location.replaceAll("\\\\", "/");
+        final String adjustedLocation = location.replace('\\', '/');
         try {
             if (adjustedLocation.toLowerCase().startsWith("http")) {
                 return RemoteUrl.urlToString(adjustedLocation, auth);

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

@@ -43,6 +43,13 @@
 public class OpenAPIV3ParserTest {
     List<AuthorizationValue> auths = new ArrayList<>();
 
+    @Test(description = "Issue 2223: reading 3.1 spec from Windows file path location produces URISyntaxException" )
+    public void testWindowsFilePathRead() {
+        OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
+        OpenAPI openAPI = openApiParser.read("\\issue-2223\\openapi.yaml");
+        assertNotNull(openAPI, "OpenAPI object should not be null (no errors during read())");
+    }
+
     @Test
     public void testFailedToResolveResponseReferences() {
         OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
@@ -51,7 +58,7 @@ public void testFailedToResolveResponseReferences() {
         SwaggerParseResult parseResult = openApiParser.readLocation("issue-2037/openapi.yaml", null, options);
         OpenAPI openAPI = parseResult.getOpenAPI();
 
-        Assert.assertTrue(openAPI.getPaths().get("/get").get$ref() == null);
+        assertNull(openAPI.getPaths().get("/get").get$ref());
         Assert.assertEquals(openAPI.getPaths().get("/get").getGet().getResponses().get("200").getContent().get("application/json").getSchema().get$ref(), "#/components/schemas/ResponsesRef");
     }
 
@@ -64,13 +71,13 @@ public void testFailedToResolveExternalReferences() {
         SwaggerParseResult parseResult = openApiParser.readLocation("resolve-external-ref/failedToResolveExternalRefs.yaml", null, options);
         OpenAPI openAPI = parseResult.getOpenAPI();
 
-        Assert.assertTrue(openAPI.getPaths().get("/permAssignments").get$ref() == null);
-        Assert.assertEquals(openAPI.getPaths().get("/permAssignments").getGet().getResponses().get("202").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/schemaResponseSuccess");
-        Assert.assertTrue(openAPI.getPaths().get("/permAssignmentChangeRequests").get$ref() == null);
-        Assert.assertEquals(openAPI.getPaths().get("/permAssignmentChangeRequests").getGet().getResponses().get("202").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/schemaResponseSuccess");
-        Assert.assertTrue(openAPI.getPaths().get("/permAssignmentChange").get$ref() == null);
-        Assert.assertEquals(openAPI.getPaths().get("/permAssignmentChange").getGet().getResponses().get("201").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/Error");
-        Assert.assertEquals(openAPI.getPaths().get("/permAssignmentChange").getGet().getResponses().get("404").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/RemoteError");
+        assertNull(openAPI.getPaths().get("/permAssignments").get$ref());
+        assertEquals(openAPI.getPaths().get("/permAssignments").getGet().getResponses().get("202").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/schemaResponseSuccess");
+        assertNull(openAPI.getPaths().get("/permAssignmentChangeRequests").get$ref());
+        assertEquals(openAPI.getPaths().get("/permAssignmentChangeRequests").getGet().getResponses().get("202").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/schemaResponseSuccess");
+        assertNull(openAPI.getPaths().get("/permAssignmentChange").get$ref());
+        assertEquals(openAPI.getPaths().get("/permAssignmentChange").getGet().getResponses().get("201").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/Error");
+        assertEquals(openAPI.getPaths().get("/permAssignmentChange").getGet().getResponses().get("404").getContent().get("application/vnd.api+json").getSchema().get$ref(),"#/components/schemas/RemoteError");
 
     }
 
@@ -2188,7 +2195,7 @@ public void testIssue393() {
     }
 
     @Test
-    public void testBadFormat() throws Exception {
+    public void testBadFormat() {
         OpenAPIV3Parser parser = new OpenAPIV3Parser();
         final OpenAPI openAPI = parser.read("src/test/resources/bad_format.yaml");
 
@@ -3429,4 +3436,4 @@ public void testVersion(){
         SwaggerParseResult parseResult = openApiParser.readLocation("version-missing.yaml", null, options);
         assertEquals(parseResult.getMessages().get(0), "attribute info.version is missing");
     }
-}
+}