Merge pull request #880 from ymohdriz/branch_issue_878

Fix for issue 878

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -1128,14 +1128,13 @@ public Callback getCallback(ObjectNode node,String location, ParseResult result)
                 JsonNode ref = node.get("$ref");
                 if (ref != null) {
                     if (ref.getNodeType().equals(JsonNodeType.STRING)) {
-                        PathItem pathItem = new PathItem();
                         String mungedRef = mungedRef(ref.textValue());
                         if (mungedRef != null) {
-                            pathItem.set$ref(mungedRef);
+                            callback.set$ref(mungedRef);
                         }else{
-                            pathItem.set$ref(ref.textValue());
+                            callback.set$ref(ref.textValue());
                         }
-                        return callback.addPathItem(name,pathItem);
+                        return callback;
                     } else {
                         result.invalidType(location, "$ref", "string", node);
                         return null;

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

@@ -339,11 +339,11 @@ public void componentsResolver() throws Exception {
 
         Map<String, Callback> callbacks = openAPI.getComponents().getCallbacks();
         // internal callback reference
-        assertEquals(callbacks.get("referenced").get("$ref").get$ref(),"#/components/callbacks/failed");
+        assertEquals(callbacks.get("referenced").get$ref(),"#/components/callbacks/failed");
         //callback pathItem -> operation ->requestBody
         assertEquals(callbacks.get("heartbeat").get("$request.query.heartbeat-url").getPost().getRequestBody().get$ref(),"#/components/requestBodies/requestBody3");
         //remote callback ref
-        assertEquals(callbacks.get("remoteCallback").get("$ref").get$ref(),"#/components/callbacks/callback");
+        assertEquals(callbacks.get("remoteCallback").get$ref(),"http://localhost:" + serverPort + "/remote/callback");
 
     }
 

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

@@ -415,4 +415,19 @@ public void testIssueRelativeRefs1(){
 
         assertEquals(prop.get$ref(),"#/components/schemas/simpleIDType_v01");
     }
+
+    @Test
+    public void testIssue879() {
+        OpenAPIParser openApiParser = new OpenAPIParser();
+        ParseOptions options = new ParseOptions();
+        OpenAPI openAPI = openApiParser.readLocation("issue_879.yaml", null, options).getOpenAPI();
+
+        String ref = openAPI.getPaths()
+                .get("/register")
+                .getPost()
+                .getCallbacks()
+                .get("myEvent")
+                .get$ref();
+        assertEquals(ref, "#/components/callbacks/callbackEvent");
+    }
 }

modules/swagger-parser/src/test/resources/issue_879.yaml

@@ -0,0 +1,59 @@
+openapi: 3.0.0
+info:
+  title: Callback with ref Example
+  version: 1.0.0
+paths:
+  /register:
+    post:
+      summary: Subscribe to a webhook
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                callbackUrl: # Callback URL
+                  type: string
+                  format: uri
+                  example: https://myserver.com/send/callback/here
+              required:
+              - callbackUrl
+      responses:
+        '200':
+          description: subscription successfully created
+          content:
+            application/json:
+              schema:
+                type: object
+                description: subscription information
+                required:
+                - subscriptionId
+                properties:
+                  subscriptionId:
+                    description: unique identifier
+                    type: string
+                    example: 2531329f-fb09-4ef7-887e-84e648214436
+      callbacks:
+        myEvent:
+          $ref: '#/components/callbacks/callbackEvent'
+components:
+  callbacks:
+    callbackEvent:
+      '{$request.body#/callbackUrl}':
+        post:
+          requestBody: # Contents of the callback message
+            required: true
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    message:
+                      type: string
+                      example: Some event happened
+                  required:
+                  - message
+          responses:
+            '200':
+              description: ok