Merge branch 'master' into fix_test_build

gracekarina · web-flow · commit a3857500eed3 · 2023-07-01T14:06:32.000-04:00
diff --git a/.github/workflows/next-snapshot-v1.yml b/.github/workflows/next-snapshot-v1.yml
@@ -17,7 +17,7 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
       - name: Set up Python 2.7
-        uses: actions/setup-python@v2
+        uses: MatteoH2O1999/setup-python@v1
         with:
           python-version: 2.7
       - name: Set up Java 8
diff --git a/.github/workflows/next-snapshot.yml b/.github/workflows/next-snapshot.yml
@@ -17,7 +17,7 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
       - name: Set up Python 2.7
-        uses: actions/setup-python@v2
+        uses: MatteoH2O1999/setup-python@v1
         with:
           python-version: 2.7
       - name: Set up Java 11
diff --git a/.github/workflows/prepare-release-v1.yml b/.github/workflows/prepare-release-v1.yml
@@ -17,7 +17,7 @@ jobs:
         app_id: ${{ secrets.APP_ID }}
         private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Set up Python 2.7
-      uses: actions/setup-python@v2
+      uses: MatteoH2O1999/setup-python@v1
       with:
         python-version: 2.7
     - name: Set up Java 8
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -17,7 +17,7 @@ jobs:
         app_id: ${{ secrets.APP_ID }}
         private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Set up Python 2.7
-      uses: actions/setup-python@v2
+      uses: MatteoH2O1999/setup-python@v1
       with:
         python-version: 2.7
     - name: Set up Java 11
diff --git a/.github/workflows/release-v1.yml b/.github/workflows/release-v1.yml
@@ -17,7 +17,7 @@ jobs:
         app_id: ${{ secrets.APP_ID }}
         private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Set up Python 2.7
-      uses: actions/setup-python@v2
+      uses: MatteoH2O1999/setup-python@v1
       with:
         python-version: 2.7
     - name: Set up Java 8
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
         app_id: ${{ secrets.APP_ID }}
         private_key: ${{ secrets.APP_PRIVATE_KEY }}
     - name: Set up Python 2.7
-      uses: actions/setup-python@v2
+      uses: MatteoH2O1999/setup-python@v1
       with:
         python-version: 2.7
     - name: Set up Java 11
diff --git a/README.md b/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.15</version>
+  <version>2.1.16</version>
 </dependency>
 ```
 
diff --git a/modules/swagger-parser-cli/pom.xml b/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.16-SNAPSHOT</version>
+        <version>2.1.17-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.16-SNAPSHOT</version>
+            <version>2.1.17-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/modules/swagger-parser-core/pom.xml b/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.16-SNAPSHOT</version>
+        <version>2.1.17-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-safe-url-resolver/pom.xml b/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.16-SNAPSHOT</version>
+        <version>2.1.17-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/swagger-parser-v2-converter/pom.xml b/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.16-SNAPSHOT</version>
+        <version>2.1.17-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-v3/pom.xml b/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.16-SNAPSHOT</version>
+        <version>2.1.17-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ExternalRefProcessor.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ExternalRefProcessor.java
@@ -313,6 +313,9 @@ public PathItem processRefToExternalPathItem(String $ref, RefFormat refFormat) {
                                     if (response.getLinks() != null) {
                                         processRefLinks(response.getLinks(), $ref);
                                     }
+                                    if (response.getHeaders() != null) {
+                                        processRefHeaders(response.getHeaders(), $ref);
+                                    }
                                 }
                             }
                         }
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
@@ -173,7 +173,7 @@ public class OpenAPIDeserializer {
             "default", "discriminator", "readOnly", "writeOnly", "xml", "externalDocs", "example", "deprecated",
 			"const", "examples", "$id", "$comment", "if", "then", "else", "unevaluatedProperties","unevaluatedItems", "prefixItems",
             "contains","contentEncoding","contentMediaType","$anchor","$schema","contentSchema","propertyNames",
-            "dependentSchemas","dependentRequired","minContains","maxContains","patternProperties"));
+            "dependentSchemas","dependentRequired","minContains","maxContains","patternProperties", "$vocabulary", "$dynamicAnchor"));
 	protected static Set<String> EXAMPLE_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "summary", "description",
 			"value", "externalValue"));
 	protected static Set<String> HEADER_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "name", "in", "description",
@@ -4180,6 +4180,16 @@ public Schema getJsonSchema(JsonNode jsonNode, String location, ParseResult resu
 			schema.set$anchor(value);
 		}
 
+        value = getString("$vocabulary", node, false, location, result);
+        if (value != null) {
+            schema.set$vocabulary(value);
+        }
+
+        value = getString("$dynamicAnchor", node, false, location, result);
+        if (value != null) {
+            schema.set$dynamicAnchor(value);
+        }
+
 		value = getString("$id", node, false, location, result);
 		if (value != null) {
 			schema.set$id(value);
diff --git a/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java b/modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java
@@ -3133,4 +3133,16 @@ public void testIssue1902_component_example_not_parse_ordinal_json() {
         Example expectedExample = openAPI.getComponents().getExamples().get("Things");
         assertNotNull(expectedExample);
     }
+
+    @Test
+    public void testIssue_1746_headers_relative_paths() {
+        OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        SwaggerParseResult parseResult = openApiParser.readLocation("issue-1746/petstore.yml", null, options);
+        OpenAPI openAPI = parseResult.getOpenAPI();
+
+
+        assertEquals(openAPI.getPaths().get("/pets").getGet().getResponses().get("200").getHeaders().get("x-next").get$ref(), "#/components/headers/LocationInHeaders");
+    }
 }
diff --git a/modules/swagger-parser-v3/src/test/resources/issue-1746/pets/def.yml b/modules/swagger-parser-v3/src/test/resources/issue-1746/pets/def.yml
@@ -0,0 +1,45 @@
+components:
+  schemas:
+    Pet:
+      type: object
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+    Pets:
+      type: array
+      items:
+        $ref: "#/components/schemas/Pet"
+    Error:
+      type: object
+      required:
+        - code
+        - message
+      properties:
+        code:
+          type: integer
+          format: int32
+        message:
+          type: string
+
+  links:
+    userRepository:
+      operationId: getRepository
+      requestBody: '$response.body#/slug'
+      headers:
+        X-Rate-Limit:
+          description: The number of allowed requests in the current period
+          schema:
+            type: integer
+  headers:
+    LocationInHeaders:
+      description: A link to the next page of responses
+      schema:
+        type: string
diff --git a/modules/swagger-parser-v3/src/test/resources/issue-1746/pets/pets.yml b/modules/swagger-parser-v3/src/test/resources/issue-1746/pets/pets.yml
@@ -0,0 +1,69 @@
+get:
+  summary: List all pets
+  operationId: listPets
+  tags:
+    - pets
+  parameters:
+    - name: myParam
+      in: query
+      description: Param
+      required: true
+      schema:
+        $ref: 'def.yml#/components/schemas/Pet'
+    - name: myParam2
+      in: query
+      description: Param2
+      required: true
+      schema:
+        $ref: './def.yml#/components/schemas/Pet'
+    - name: myParam3
+      in: query
+      description: Param3
+      required: true
+      schema:
+        $ref: '../pets/def.yml#/components/schemas/Pet'
+  responses:
+    "200":
+      description: A paged array of pets
+      headers:
+        x-next:
+          $ref: "./def.yml#/components/headers/LocationInHeaders"
+      content:
+        application/json:
+          schema:
+            $ref: "./def.yml#/components/schemas/Pets"
+    default:
+      description: unexpected error
+      content:
+        application/json:
+          schema:
+            $ref: "./def.yml#/components/schemas/Error"
+post:
+  summary: Create a pet
+  operationId: createPets
+  tags:
+    - pets
+  responses:
+    '201':
+      description: New guest added to event list
+      content:
+        application/json:
+          schema:
+            properties:
+              test:
+                type: string
+          examples:
+            testExamples:
+              $ref: "../petstore.yml#/components/schemas/DateWithExample"
+      links:
+        userRepository:
+          $ref: 'def.yml#/components/links/userRepository'
+    default:
+      description: unexpected error
+      content:
+        application/json:
+          schema:
+            $ref: "./def.yml#/components/schemas/Error"
+          example:
+            $ref: "../petstore.yml#/components/schemas/DateWithExample"
+
diff --git a/modules/swagger-parser-v3/src/test/resources/issue-1746/petstore.yml b/modules/swagger-parser-v3/src/test/resources/issue-1746/petstore.yml
@@ -0,0 +1,21 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  license:
+    name: MIT
+servers:
+  - url: http://petstore.swagger.io/v1
+paths:
+  /pets:
+    $ref: "./pets/pets.yml"
+
+components:
+  schemas:
+    Date:
+      type: string
+      format: date
+    DateWithExample:
+      $ref: '#/components/schemas/Date'
+      description: Date schema extended with a `default` value... Or not?
+      default: 2000-01-01
diff --git a/modules/swagger-parser/pom.xml b/modules/swagger-parser/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.1.16-SNAPSHOT</version>
+        <version>2.1.17-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger.parser.v3</groupId>
     <artifactId>swagger-parser-project</artifactId>
-    <version>2.1.16-SNAPSHOT</version>
+    <version>2.1.17-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>swagger-parser-project</name>
     <developers>
@@ -411,7 +411,7 @@
         <swagger-parser-v2-version>1.0.67</swagger-parser-v2-version>
         <commons-io-version>2.11.0</commons-io-version>
         <slf4j-version>1.7.36</slf4j-version>
-        <swagger-core-version>2.2.10</swagger-core-version>
+        <swagger-core-version>2.2.14</swagger-core-version>
         <swagger-core-v2-version>1.6.11</swagger-core-v2-version>
         <junit-version>4.13.2</junit-version>
         <testng-version>7.7.1</testng-version>
