fix and test for issue swagger-api#1103

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ComponentsProcessor.java

@@ -190,6 +190,7 @@ private void processParameters(Set<String> ParametersKey, Map<String, Parameter>
         for (String parametersName : ParametersKey) {
             final Parameter parameter = parameters.get(parametersName);
             parameterProcessor.processParameter(parameter);
+
         }
     }
 
@@ -221,13 +222,13 @@ public void processSchemas(Set<String> schemaKeys, Map<String, Schema> schemas)
 
             schemaProcessor.processSchema(model);
 
-            //if we process a RefModel here, in the #/definitions table, we want to overwrite it with the referenced value
+            //if we process a RefModel here, in the #/components/schemas table, we want to overwrite it with the referenced value
             if (model.get$ref() != null) {
                 final String renamedRef = cache.getRenamedRef(originalRef);
 
                 if (renamedRef != null) {
-                    //we definitely resolved the referenced and shoved it in the definitions map
-                    // because the referenced model may be in the definitions map, we need to remove old instances
+                    //we definitely resolved the referenced and shoved it in the components map
+                    // because the referenced model may be in the components map, we need to remove old instances
                     final Schema resolvedModel = schemas.get(renamedRef);
 
                     // ensure the reference isn't still in use

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/PathsProcessor.java

@@ -162,6 +162,11 @@ protected void updateLocalRefs(PathItem path, String pathRef) {
     }
 
     protected void updateLocalRefs(ApiResponse response, String pathRef) {
+        if (response.get$ref() != null){
+            if(isLocalRef(response.get$ref())) {
+                response.set$ref(computeLocalRef(response.get$ref(), pathRef));
+            }
+        }
         if(response.getContent() != null) {
             Map<String, MediaType> content = response.getContent();
             for (String key: content.keySet()) {
@@ -188,6 +193,11 @@ protected void updateLocalRefs(Example example, String pathRef) {
     }
 
     protected void updateLocalRefs(Parameter param, String pathRef) {
+        if (param.get$ref() != null){
+            if(isLocalRef(param.get$ref())) {
+                param.set$ref(computeLocalRef(param.get$ref(), pathRef));
+            }
+        }
         if(param.getSchema() != null) {
             updateLocalRefs(param.getSchema(), pathRef);
         }
@@ -204,6 +214,11 @@ protected void updateLocalRefs(Parameter param, String pathRef) {
     }
 
     protected void updateLocalRefs(RequestBody body, String pathRef) {
+        if (body.get$ref() != null){
+            if(isLocalRef(body.get$ref())) {
+                body.set$ref(computeLocalRef(body.get$ref(), pathRef));
+            }
+        }
         if(body.getContent() != null) {
             Map<String, MediaType> content = body.getContent();
             for (String key: content.keySet()) {

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

@@ -498,6 +498,8 @@ public void testResolveFully() throws Exception{
         assertEquals(result.getOpenAPI().getComponents().getSchemas().get("OrderRef").getType(),"object");
     }
 
+
+
     @Test
     public void testResolveEmpty(@Injectable final List<AuthorizationValue> auths) throws Exception{
         String pathFile = FileUtils.readFileToString(new File("src/test/resources/empty-oas.yaml"));
@@ -558,9 +560,28 @@ public void testInlineModelResolver(@Injectable final List<AuthorizationValue> a
     }
 
     @Test
-    public void test30NoOptions(@Injectable final List<AuthorizationValue> auths) throws Exception{
+    public void testRemotePathItemIssue1103(@Injectable final List<AuthorizationValue> auths) throws Exception{
+
+
+        OpenAPI result = new OpenAPIV3Parser().read("issue-1103/remote-pathItem-swagger.yaml");
+
+        Assert.assertNotNull(result);
+        Assert.assertNotNull(result.getPaths().get("/Translation/{lang}"));
+        Assert.assertEquals(result.getPaths().get("/Translation/{lang}").getPut().getParameters().get(0).getName(), "lang");
+    }
 
 
+    @Test
+    public void testRemoteParameterIssue1103(@Injectable final List<AuthorizationValue> auths) throws Exception{
+
+        OpenAPI result = new OpenAPIV3Parser().read("issue-1103/remote-parameter-swagger.yaml");
+        Assert.assertNotNull(result);
+        Assert.assertEquals(result.getPaths().get("/Translation/{lang}").getPut().getParameters().get(0).getName(), "lang");
+
+    }
+
+    @Test
+    public void test30NoOptions(@Injectable final List<AuthorizationValue> auths) throws Exception{
 
         String pathFile = FileUtils.readFileToString(new File("src/test/resources/oas3.yaml.template"));
         pathFile = pathFile.replace("${dynamicPort}", String.valueOf(this.serverPort));

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/OpenAPIDeserializerTest.java

@@ -2280,6 +2280,7 @@ public void readMissingServerObject() throws Exception {
         final OpenAPI openAPI = result.getOpenAPI();
         Assert.assertNotNull(openAPI);
 
+
         assertEquals(openAPI.getServers().get(0).getUrl(),"/");
     }
 

modules/swagger-parser-v3/src/test/resources/issue-1103/domain.yaml

@@ -0,0 +1,33 @@
+openapi: 3.0.0
+info:
+  version: 1.0.0
+  title: API Reuse Common Components
+  description: Definitions of API components to be referred across different API files
+components:
+  pathitems:
+    Translation:
+      put:
+        tags:
+          - Translation
+        summary: Set value of this parameter
+        description: Provide the lookup table for localized strings
+        parameters:
+          - $ref: '#/components/parameters/param_lang'
+  parameters:
+    param_lang:
+      name: lang
+      in: path
+      description: language - 2-letter abbreviation
+      required: true
+      schema:
+        type: string
+        enum:
+          - en
+          - se
+          - dk
+          - fi
+          - false
+          - de
+          - es
+          - et
+          - fr

modules/swagger-parser-v3/src/test/resources/issue-1103/remote-parameter-swagger.yaml

@@ -0,0 +1,14 @@
+openapi: 3.0.0
+info:
+  version: "1"
+  title: Admin Web App Services
+  description: 'Services'
+paths:
+  '/Translation/{lang}':
+    put:
+      tags:
+        - Translation_Settings
+      summary: Set value of this parameter
+      description: Provide the lookup table for localized strings
+      parameters:
+        - $ref: 'domain.yaml#/components/parameters/param_lang'

modules/swagger-parser-v3/src/test/resources/issue-1103/remote-pathItem-swagger.yaml

@@ -0,0 +1,8 @@
+openapi: 3.0.0
+info:
+  version: 2.0.0
+  title: Admin Web App Services
+  description: 'Services API'
+paths:
+  '/Translation/{lang}':
+    $ref: './domain.yaml#/components/pathitems/Translation'