Merge pull request #775 from dilipkrish/develop_scala-2.10

Fix for problem with serializing ApiListing with authorizations

Author: fehguy

modules/swagger-core/src/main/scala/com/wordnik/swagger/model/SwaggerSerializers.scala

@@ -509,9 +509,9 @@ trait Serializers {
       }) ~
       ("authorizations" -> {
         x.authorizations match {
-          case e: List[AuthorizationType] if (e.size > 0) => {
-            Extraction.decompose((for(at: AuthorizationType <- e) yield {
-              if(at.`type` != "") Some(at.getName, at)
+          case e: List[Authorization] if (e.size > 0) => {
+            Extraction.decompose((for(at: Authorization <- e) yield {
+              if(at.`type` != "") Some(at.`type`, at)
               else None
             }).flatten.toMap)
           }

modules/swagger-core/src/test/scala/converter/SwaggerSerializersTest.scala

@@ -1,5 +1,6 @@
 package converter
 
+import com.wordnik.swagger.core.SwaggerSpec
 import com.wordnik.swagger.model._
 
 import org.json4s._
@@ -32,10 +33,29 @@ class SwaggerSerializersTest extends FlatSpec with Matchers {
 }""")*/
   }
 
+  it should "serialize an api listing with authorizations" in {
+    val auth = new Authorization("oauth2", Array(AuthorizationScope("scope1", "description 1"),
+      AuthorizationScope("scope2", "description 2")))
+    val emptyList = List()
+    val apiListing = ApiListing(
+      "1.0",
+      SwaggerSpec.version,
+      "",
+      "/relative-path-to-endpoint",
+      emptyList,
+      emptyList,
+      emptyList,
+      List(auth),
+      emptyList,
+      None,
+      None,
+      1)
+    println(pretty(render(parse(write(apiListing)))))
+  }
+
   it should "deserialize an ApiDeclaration" in {
     parse(apiDeclaration).extract[ApiListing] should not be (null)
   }
 
-
   val apiDeclaration = """{"apiVersion":"1.0.0","swaggerVersion":"1.2","basePath":"http://localhost:9095/resteasy","resourcePath":"/library","apis":[{"path":"/library/books/badger","operations":[{"method":"GET","summary":"gets books with Badger","notes":"gets books with @Badgerfish","type":"listing","nickname":"getBooksBadger","produces":["application/json"],"authorizations":{},"parameters":[],"responseMessages":[{"code":400,"message":"Not sure"},{"code":404,"message":"bad"}]}]},{"path":"/library/books/mapped","operations":[{"method":"GET","summary":"gets books with mapped","notes":"gets books with @Mapped","type":"listing","nickname":"getBooksMapped","produces":["application/json"],"authorizations":{},"parameters":[],"responseMessages":[{"code":400,"message":"Not sure"},{"code":404,"message":"bad"}]}]}],"models":{"book":{"id":"book","properties":{"author":{"type":"string"},"title":{"type":"string"},"iSBN":{"type":"string"}}},"listing":{"id":"listing","properties":{"books":{"type":"array","items":{"$ref":"book"}}}}}}"""
 }