added inline parameter processing

Author: fehguy

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

@@ -62,7 +62,11 @@ public void applyResolutions(List<AuthorizationValue> auths) {
         Object mapping = ctx.object;
         Object target = ctx.parent;
         try {
-          String contents = new RemoteUrl().urlToString(host, auths);
+          String contents = null;
+          if(host.startsWith("http"))
+            contents = new RemoteUrl().urlToString(host, auths);
+          else
+            contents = Json.mapper().writeValueAsString(swagger);
           JsonNode location = null;
           String locationName = null;
           if(contents != null) {
@@ -94,6 +98,24 @@ else if(target instanceof Parameter) {
                 swagger.addDefinition(locationName, model);
               }
             }
+            else if(target instanceof Operation) {
+
+              // get the operation position
+              Operation operation = (Operation) target;
+              int position = 0;
+              for(Parameter param : operation.getParameters()) {
+
+                if(param instanceof RefParameter) {
+                  RefParameter ref = (RefParameter) param;
+                  if(ref.getSimpleRef().equals(locationName)) {
+                    // found a match!
+                    Parameter remoteParam = Json.mapper().convertValue(location, Parameter.class);
+                    operation.getParameters().set(position, remoteParam);
+                  }
+                }
+                position += 1;
+              }
+            }
           }
         }
         catch(Exception e) {
@@ -102,7 +124,6 @@ else if(target instanceof Parameter) {
         }
       }
     }
-    // Json.prettyPrint(resolutionMap);
   }
 
   public void detectOperationRefs() {
@@ -113,14 +134,35 @@ public void detectOperationRefs() {
       Path path = paths.get(pathName);
       List<Operation> operations = path.getOperations();
       for(Operation operation : operations) {
-        for(Parameter parameter : operation.getParameters()) {
-          if(parameter instanceof BodyParameter) {
-            BodyParameter bp = (BodyParameter) parameter;
-            if(bp.getSchema() != null && bp.getSchema() instanceof RefModel) {
-              RefModel ref = (RefModel)bp.getSchema();
-              if(ref.get$ref().startsWith("http")) {
-                LOGGER.debug("added reference to " + ref.get$ref());
-                resolutionMap.put(ref.get$ref(), new ResolutionContext(ref, bp, "ref"));
+        if(operation.getParameters() != null) {
+          for(Parameter parameter : operation.getParameters()) {
+            if(parameter instanceof BodyParameter) {
+              BodyParameter bp = (BodyParameter) parameter;
+              if(bp.getSchema() != null && bp.getSchema() instanceof RefModel) {
+                RefModel ref = (RefModel)bp.getSchema();
+                if(ref.get$ref().startsWith("http")) {
+                  LOGGER.debug("added reference to " + ref.get$ref());
+                  resolutionMap.put(ref.get$ref(), new ResolutionContext(ref, bp, "ref"));
+                }
+              }
+            }
+            else if(parameter instanceof RefParameter) {
+              RefParameter ref = (RefParameter) parameter;
+              LOGGER.debug("added reference to " + ref.get$ref());
+              resolutionMap.put(ref.get$ref(), new ResolutionContext(ref, operation, "inline"));
+            }
+          }
+        }
+        if(operation.getResponses() != null) {
+          for(String responseCode : operation.getResponses().keySet()) {
+            Response response = operation.getResponses().get(responseCode);
+            if(response.getSchema() != null) {
+              Property schema = response.getSchema();
+              if(schema instanceof RefProperty) {
+                RefProperty ref = (RefProperty) schema;
+                if(ref.get$ref() != null && ref.get$ref().startsWith("http")) {
+                  resolutionMap.put(ref.get$ref(), new ResolutionContext(ref, response, "ref"));
+                }
               }
             }
           }

modules/swagger-parser/src/test/scala/SwaggerResolverTest.scala

@@ -16,7 +16,6 @@ import scala.collection.JavaConverters._
 
 @RunWith(classOf[JUnitRunner])
 class SwaggerResolverTest extends FlatSpec with Matchers {
-
   it should "resolve a simple remote model property definition" in {
     val swagger = new Swagger()
     swagger.addDefinition(
@@ -60,14 +59,47 @@ class SwaggerResolverTest extends FlatSpec with Matchers {
     swagger.getDefinitions().get("Tag") should not be (null)
   }
 
-  it should "resolve operation remote refs" in {
+  it should "resolve operation bodyparam remote refs" in {
     val swagger = new Swagger()
     swagger.path("/fun", new Path()
       .get(new Operation()
         .parameter(new BodyParameter()
           .schema(new RefModel("http://petstore.swagger.io/v2/swagger.json#/definitions/Tag")))))
 
     val resolved = new SwaggerResolver().resolve(swagger, null)
-    Json.prettyPrint(swagger)
+    val param = swagger.getPaths().get("/fun").getGet().getParameters().get(0).asInstanceOf[BodyParameter]
+    val ref = param.getSchema().asInstanceOf[RefModel]
+    ref.get$ref() should equal("#/definitions/Tag")
+    swagger.getDefinitions().get("Tag") should not be (null)
+  }
+
+  it should "resolve response remote refs" in {
+    val swagger = new Swagger()
+    swagger.path("/fun", new Path()
+      .get(new Operation()
+        .response(200, new Response()
+          .schema(new RefProperty("http://petstore.swagger.io/v2/swagger.json#/definitions/Tag")))))
+    val resolved = new SwaggerResolver().resolve(swagger, null)
+    val response = swagger.getPaths().get("/fun").getGet().getResponses().get("200")
+    val ref = response.getSchema.asInstanceOf[RefProperty]
+    ref.get$ref() should equal("#/definitions/Tag")
+    swagger.getDefinitions().get("Tag") should not be (null)
+  }
+
+  it should "resolve operation parameter remote refs" in {
+    val swagger = new Swagger()
+    swagger.path("/fun", new Path()
+      .get(new Operation()
+        .parameter(new RefParameter("#/parameters/SampleParameter"))))
+
+    swagger.parameter("SampleParameter", new QueryParameter()
+      .name("skip")
+      .property(new IntegerProperty()))
+
+    val resolved = new SwaggerResolver().resolve(swagger, null)
+    val params = swagger.getPaths().get("/fun").getGet().getParameters()
+    params.size() should be (1)
+    val param = params.get(0).asInstanceOf[QueryParameter]
+    param.getName() should be ("skip")
   }
 }