Merge branch 'develop_2.0' of github.com:swagger-api/swagger-core into develop_2.0

fehguy · fehguy · commit 3373936ea49a · 2015-03-29T21:33:16.000-07:00
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/BoxedTypesTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/BoxedTypesTest.scala
@@ -14,6 +14,8 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class BoxedTypesTest extends FlatSpec with Matchers {
   Json.mapper().registerModule(DefaultScalaModule)
@@ -27,7 +29,7 @@ class BoxedTypesTest extends FlatSpec with Matchers {
     properties should not be (null)
     properties.size should be (5)
 
-Json.pretty(models) should equal (
+models should serializeToJson (
 """{
   "BoxedTypesIssue31" : {
     "properties" : {
@@ -77,7 +79,7 @@ Json.pretty(models) should equal (
     properties should not be (null)
     properties.size should be (5)
 
-Json.pretty(models) should equal (
+    models should serializeToJson (
 """{
   "BoxedTypesIssue31WithDataType" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/ByteConverterTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/ByteConverterTest.scala
@@ -15,13 +15,15 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ByteConverterTest extends FlatSpec with Matchers {
   val m = Json.mapper()
   m.registerModule(DefaultScalaModule)
 
   val models = ModelConverters.getInstance().read(classOf[ByteConverterModel])
-  Json.pretty(models) should equal(
+  models should serializeToJson (
 """{
   "ByteConverterModel" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/CovariantGetterTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/CovariantGetterTest.scala
@@ -14,6 +14,8 @@ import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 import models.JCovariantGetter
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class CovariantGetterTest extends FlatSpec with Matchers {
   val m = Json.mapper()
@@ -22,7 +24,7 @@ class CovariantGetterTest extends FlatSpec with Matchers {
   it should "read a getter with covariant return type" in {
     val models = ModelConverters.getInstance().read(classOf[JCovariantGetter.Sub])
     models.size should be (1)
-Json.pretty(models) should be (
+    models should serializeToJson (
 """{
   "Sub" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/EnumConversionPropertyTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/EnumConversionPropertyTest.scala
@@ -14,14 +14,16 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class EnumConversionPropertyTest extends FlatSpec with Matchers {
   val m = Json.mapper()
   m.registerModule(DefaultScalaModule)
 
   it should "read a model with an enum property" in {
     val models = ModelConverters.getInstance().read(classOf[ModelWithEnumProperty])
-    Json.pretty(models) should be (
+    models should serializeToJson (
 """{
   "ModelWithEnumProperty" : {
     "properties" : {
@@ -36,7 +38,7 @@ class EnumConversionPropertyTest extends FlatSpec with Matchers {
 
   it should "read a model with enums" in {
     val models = ModelConverters.getInstance().read(classOf[ATM])
-    Json.pretty(models) should be (
+    models should serializeToJson (
 """{
   "ATM" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/JsonIgnoreModelTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/JsonIgnoreModelTest.scala
@@ -13,10 +13,12 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class JsonIgnoreModelTest extends FlatSpec with Matchers {
   val models = ModelConverters.getInstance().read(classOf[ModelWithIgnoreAnnotation])
-  Json.pretty(models) should equal (
+  models should serializeToJson (
 """{
   "ModelWithIgnoreAnnotation" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/JsonIgnorePropertiesModelTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/JsonIgnorePropertiesModelTest.scala
@@ -13,11 +13,13 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class JsonIgnorePropertiesModelTest extends FlatSpec with Matchers {
   it should "ignore a property with ignore annotations" in {
     val models = ModelConverters.getInstance().read(classOf[ModelWithIgnorePropertiesAnnotation])
-    Json.pretty(models) should equal(
+    models should serializeToJson (
 """{
   "ModelWithIgnorePropertiesAnnotation" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/JsonPropertyModelTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/JsonPropertyModelTest.scala
@@ -13,10 +13,12 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class JsonPropertyModelTest extends FlatSpec with Matchers {
   val models = ModelConverters.getInstance().read(classOf[ModelWithJsonProperty])
-  Json.pretty(models) should be (
+  models should serializeToJson (
 """{
   "ModelWithJsonProperty" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/ModelConversionTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/ModelConversionTest.scala
@@ -17,6 +17,8 @@ import java.util.Date
 
 import scala.annotation.meta.field
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ModelConversionTest extends FlatSpec with Matchers {
   Json.mapper().registerModule(DefaultScalaModule)
@@ -25,7 +27,7 @@ class ModelConversionTest extends FlatSpec with Matchers {
     val models = ModelConverters.getInstance().read(classOf[DateModel])
     val model = models.get("DateModel")
     model.getProperties().size should be (5)
-    Json.pretty(model) should equal(
+    model should serializeToJson (
 """{
   "properties" : {
     "date" : {
@@ -61,7 +63,7 @@ class ModelConversionTest extends FlatSpec with Matchers {
     val models = ModelConverters.getInstance().read(classOf[SetModel])
     val model = models.get("SetModel")
     model.getProperties().size should be (1)
-    Json.pretty(model) should be (
+    model should serializeToJson (
 """{
   "properties" : {
     "longs" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/ModelPropertyParserTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/ModelPropertyParserTest.scala
@@ -21,13 +21,15 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ModelPropertyParserTest extends FlatSpec with Matchers {
   Json.mapper().registerModule(DefaultScalaModule)
 
   it should "extract a string list" in {
     val property = ModelConverters.getInstance().readAsProperty(classOf[List[String]])
-    Json.pretty(property) should equal(
+    property should serializeToJson (
 """{
   "type" : "array",
   "items" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/ModelPropertyTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/ModelPropertyTest.scala
@@ -20,6 +20,8 @@ import org.scalatest.Matchers
 
 import scala.beans.BeanProperty
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ModelPropertyTest extends FlatSpec with Matchers {
   Json.mapper().registerModule(DefaultScalaModule)
@@ -76,7 +78,7 @@ class ModelPropertyTest extends FlatSpec with Matchers {
 class ModelPropertyOverrideTest extends FlatSpec with Matchers {
   it should "read a model with property dataTypes configured #679" in {
     val models = ModelConverters.getInstance().readAll(classOf[ModelWithModelPropertyOverrides])
-    Json.pretty(models) should equal(
+    models should serializeToJson (
 """{
   "Children" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/ModelWithOptionalFieldsTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/ModelWithOptionalFieldsTest.scala
@@ -12,13 +12,15 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ModelWithOptionalFieldsTest extends FlatSpec with Matchers {
   Json.mapper().registerModule(new GuavaModule())
 
   ignore should "read a model with guava optionals" in {
     val property = ModelConverters.getInstance().readAll(classOf[ModelWithOptionalFields])
-    Json.pretty(property) should equal (
+    property should serializeToJson (
 """{
   "ModelWithOptionalFields" : {
     "id" : "ModelWithOptionalFields",
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/PropertyAnnotationTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/PropertyAnnotationTest.scala
@@ -20,11 +20,13 @@ import org.scalatest.Matchers
 
 import javax.xml.bind.annotation._
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class PropertyAnnotationTest extends FlatSpec with Matchers {
   it should "read annotations on a property" in {
     val a = ModelConverters.getInstance().readAll(classOf[ModelWithAnnotationOnProperty])
-    Json.pretty(a) should equal (
+    a should serializeToJson (
 """{
   "ModelWithAnnotationOnProperty" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/1_3/converter/SnakeCaseConverterTest.scala b/modules/swagger-core/src/test/scala/1_3/converter/SnakeCaseConverterTest.scala
@@ -24,6 +24,8 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class SnakeCaseConverterTest extends FlatSpec with Matchers {
   it should "ignore properties with type Bar" in {
@@ -34,7 +36,7 @@ class SnakeCaseConverterTest extends FlatSpec with Matchers {
     converters.addConverter(snakeCaseConverter)
 
     val models = converters.readAll(classOf[SnakeCaseModel])
-    Json.pretty(models) should equal (
+    models should serializeToJson (
 """{
   "bar" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/CompositionTest.scala b/modules/swagger-core/src/test/scala/CompositionTest.scala
@@ -9,14 +9,16 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class CompositionTest extends FlatSpec with Matchers {
   val m = Json.mapper()
 
   ignore should "read a model with required params and description" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[Human])
 
-    Json.pretty(schemas) should equal (
+    schemas should serializeToJson (
 """{
   "Human" : {
     "properties" : {
@@ -63,7 +65,7 @@ class CompositionTest extends FlatSpec with Matchers {
 
   ignore should "read a model with composition" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[Animal])
-    Json.pretty(schemas) should equal (
+    schemas should serializeToJson (
 """{
   "Animal" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/ModelConverterTest.scala b/modules/swagger-core/src/test/scala/ModelConverterTest.scala
@@ -11,11 +11,13 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ModelConverterTest extends FlatSpec with Matchers {
   it should "convert a model" in {
     val schemas = ModelConverters.getInstance().read(classOf[Person])
-    Json.pretty(schemas) should equal(
+    schemas should serializeToJson (
 """{
   "Person" : {
     "properties" : {
@@ -59,7 +61,7 @@ class ModelConverterTest extends FlatSpec with Matchers {
 
   it should "read an interface" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[Pet])
-    Json.pretty(schemas) should equal (
+    schemas should serializeToJson (
 """{
   "Pet" : {
     "required" : [ "isDomestic", "name", "type" ],
@@ -85,7 +87,7 @@ class ModelConverterTest extends FlatSpec with Matchers {
 
   it should "read an inherited interface" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[Cat])
-    Json.pretty(schemas) should equal (
+    schemas should serializeToJson (
 """{
   "Cat" : {
     "required" : [ "isDomestic", "name", "type" ],
diff --git a/modules/swagger-core/src/test/scala/ScalaModelTest.scala b/modules/swagger-core/src/test/scala/ScalaModelTest.scala
@@ -14,13 +14,15 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ScalaModelTest extends FlatSpec with Matchers {
   Json.mapper().registerModule(DefaultScalaModule)
 
   it should "convert a simple scala case class" in {
     val schemas = ModelConverters.getInstance().read(classOf[SimpleCaseClass])
-    Json.pretty(schemas) should equal (
+    schemas should serializeToJson (
 """{
   "SimpleCaseClass" : {
     "properties" : {
@@ -38,7 +40,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
 
   it should "convert a scala case class with List property" in {
     val schemas = ModelConverters.getInstance().read(classOf[CaseClassWithList])
-    Json.pretty(schemas) should equal(
+    schemas should serializeToJson (
 """{
   "CaseClassWithList" : {
     "properties" : {
@@ -68,7 +70,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
     keys(3) should be ("dateValue")
     keys(4) should be ("booleanValue")
 
-    Json.pretty(schemas) should equal (
+    schemas should serializeToJson (
 """{
   "CaseClassWithOptionLong" : {
     "properties" : {
@@ -103,7 +105,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
 
   it should "convert a scala case class with nested models" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[NestedModel])
-    Json.pretty(schemas) should equal ( 
+    schemas should serializeToJson ( 
 """{
   "ComplexModel" : {
     "properties" : {
@@ -132,7 +134,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
 
   it should "read an interface" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[Pet])
-    Json.pretty(schemas) should equal (
+    schemas should serializeToJson (
 """{
   "Pet" : {
     "required" : [ "isDomestic", "name", "type" ],
diff --git a/modules/swagger-core/src/test/scala/ScalaTest.scala b/modules/swagger-core/src/test/scala/ScalaTest.scala
@@ -11,13 +11,15 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class ScalaTest extends FlatSpec with Matchers {
   val m = Json.mapper()
 
   it should "convert a model with scala list" in {
     val schemas = ModelConverters.getInstance().read(classOf[ClassWithScalaField])
-    Json.pretty(schemas) should be (
+    schemas should serializeToJson (
 """{
   "ClassWithScalaField" : {
     "properties" : {
diff --git a/modules/swagger-core/src/test/scala/auth/AuthSerializationTest.scala b/modules/swagger-core/src/test/scala/auth/AuthSerializationTest.scala
@@ -13,6 +13,8 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 
+import matchers.SerializationMatchers._
+
 @RunWith(classOf[JUnitRunner])
 class AuthSerializationTest extends FlatSpec with Matchers {
   it should "convert serialize a basic auth model" in {
@@ -28,13 +30,12 @@ class AuthSerializationTest extends FlatSpec with Matchers {
   }
 
   it should "convert serialize a header key model to yaml" in {
-    Yaml.mapper().convertValue(new ApiKeyAuthDefinition().name("api-key").in(In.HEADER),
-                               classOf[ObjectNode]) should equal (
-      Yaml.mapper().readValue("""---
+    val auth = new ApiKeyAuthDefinition().name("api-key").in(In.HEADER) 
+    auth should serializeToYaml ("""---
 type: "apiKey"
 name: "api-key"
 in: "header"
-""", classOf[ObjectNode]))
+""")
   }
 
   it should "convert serialize an oauth2 implicit flow model" in {
diff --git a/modules/swagger-core/src/test/scala/matchers/SerializationMatchers.scala b/modules/swagger-core/src/test/scala/matchers/SerializationMatchers.scala
diff --git a/modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/ParameterProcessor.java b/modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/ParameterProcessor.java
