Merge pull request #58 from swagger-api/develop

merge develop into master

Author: frantuma

.travis.yml

@@ -1,12 +1,7 @@
 language: scala
 jdk:
-   - oraclejdk7
-   - oraclejdk8
+   - openjdk8
 scala:
    - 2.10.6
-   - 2.11.8
-   - 2.12.1
-matrix:
-  exclude:
-    - jdk: oraclejdk7
-      scala: 2.12.1
+   - 2.11.12
+   - 2.12.6

build.sbt

@@ -6,11 +6,11 @@ import Defaults._
 
 organization := "io.swagger"
 
-version := "1.0.4"
+version := "1.0.5-SNAPSHOT"
 
-scalaVersion := "2.11.8"
+scalaVersion := "2.11.12"
 
-crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.1")
+crossScalaVersions := Seq("2.10.6", scalaVersion.value, "2.12.6")
 
 organizationHomepage in ThisBuild := Some(url("http://swagger.io"))
 
@@ -23,9 +23,10 @@ publishArtifact in Test := false
 pomIncludeRepository := { x => false }
 
 libraryDependencies ++= Seq(
-  "io.swagger" % "swagger-core" % "1.5.12",
-  "org.scalatest" %% "scalatest" % "3.0.1" % "test",
-  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.8.6",
+  "org.scala-lang" % "scala-reflect" % scalaVersion.value,
+  "io.swagger" % "swagger-core" % "1.5.22",
+  "org.scalatest" %% "scalatest" % "3.0.5" % "test",
+  "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.9.8",
   "junit" % "junit" % "4.12" % "test"
 )
 
@@ -39,15 +40,12 @@ publishTo := {
 credentials in ThisBuild += Credentials (Path.userHome / ".ivy2" / ".credentials")
 
 resolvers in ThisBuild ++= Seq(
-  "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository",
-  Resolver.url("Local Ivy Repository", url("file://"+Path.userHome.absolutePath+"/.ivy2/local"))(Resolver.ivyStylePatterns),
-  "Typesafe Releases Repository" at "http://repo.typesafe.com/typesafe/releases/",
-    "Typesafe Snapshots Repository" at "http://repo.typesafe.com/typesafe/snapshots/",
-    "Maven Central" at "http://repo1.maven.org/maven2",
-  "Typesafe Maven Releases Repository" at "https://typesafe.artifactoryonline.com/typesafe/maven-releases/",
-    "Typesafe Maven Snapshots Repository" at "https://typesafe.artifactoryonline.com/typesafe/maven-snapshots/",
-    "sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
-    "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases")
+  Resolver.mavenLocal,
+  Resolver.typesafeRepo("releases"),
+  Resolver.typesafeRepo("snapshots"),
+  Resolver.sonatypeRepo("releases"),
+  Resolver.sonatypeRepo("snapshots")
+)
 
 publishMavenStyle := true
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=1.1.2

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.2")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")

src/main/scala/io/swagger/scala/converter/SwaggerScalaModelConverter.scala

@@ -36,11 +36,11 @@ class SwaggerScalaModelConverter extends ModelConverter {
             return sp
           }
         case None =>
-          if (cls.isAssignableFrom(classOf[BigDecimal])) {
+          if (cls == classOf[BigDecimal]) {
             val dp = PrimitiveType.DECIMAL.createProperty()
             dp.setRequired(true)
             return dp
-          } else if (cls.isAssignableFrom(classOf[BigInt])) {
+          } else if (cls == classOf[BigInt]) {
             val dp = PrimitiveType.INT.createProperty()
             dp.setRequired(true)
             return dp
@@ -55,21 +55,25 @@ class SwaggerScalaModelConverter extends ModelConverter {
         val nextResolved = {
           Option(resolveProperty(nextType, context, annotations, chain)) match {
             case Some(p) => Some(p)
-            case None if chain.hasNext() =>
+            case None if chain.hasNext =>
               Option(chain.next().resolveProperty(nextType, context, annotations, chain))
             case _ => None
           }
         }
         nextResolved match {
-          case Some(nextResolved) =>
-            nextResolved.setRequired(false)
-            nextResolved
+          case Some(property) =>
+            property.setRequired(false)
+            property
           case None => null
         }
       case t if chain.hasNext =>
-        val nextResolved = chain.next().resolveProperty(t, context, annotations, chain)
-        nextResolved.setRequired(true)
-        nextResolved
+        val nextResolved = Option(chain.next().resolveProperty(t, context, annotations, chain))
+        nextResolved match {
+          case Some(property) =>
+            property.setRequired(true)
+            property
+          case None => null
+        }
       case _ =>
         null
     }

src/test/scala/ModelPropertyParserTest.scala

@@ -1,7 +1,12 @@
+import java.lang.annotation.Annotation
+import java.lang.reflect.Type
+import java.util
+
 import io.swagger.converter._
 import io.swagger.models.Model
 import io.swagger.models.properties
 import io.swagger.models.properties._
+import io.swagger.scala.converter.SwaggerScalaModelConverter
 import models._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
@@ -92,6 +97,17 @@ class ModelPropertyParserTest extends FlatSpec with Matchers {
     optBigDecimal.getRequired should be (false)
   }
 
+  it should "process Model with Scala Option Boolean" in {
+    val converter = ModelConverters.getInstance()
+    val schemas = converter.readAll(classOf[ModelWOptionBoolean]).asScala.toMap
+    val model = schemas.get("ModelWOptionBoolean")
+    model should be ('defined)
+    val optBoolean = model.get.getProperties().get("optBoolean")
+    optBoolean should not be (null)
+    optBoolean shouldBe a [properties.ObjectProperty]
+    optBoolean.getRequired should be (false)
+  }
+
   it should "process all properties as required barring Option[_] or if overridden in annotation" in {
     val schemas = ModelConverters
       .getInstance()
@@ -114,6 +130,23 @@ class ModelPropertyParserTest extends FlatSpec with Matchers {
     forcedOptional.getRequired should be (false)
   }
 
+  it should "handle null properties from converters later in the chain" in {
+    object CustomConverter extends ModelConverter {
+      def resolve(`type`: Type, context: ModelConverterContext, chain: util.Iterator[ModelConverter]): Model = {
+        if (chain.hasNext) chain.next().resolve(`type`, context, chain) else null
+      }
+
+      def resolveProperty(`type`: Type, context: ModelConverterContext, annotations: Array[Annotation], chain: util.Iterator[ModelConverter]): Property = {
+        null
+      }
+    }
+
+    val converter = new ModelConverters()
+    converter.addConverter(CustomConverter)
+    converter.addConverter(new SwaggerScalaModelConverter)
+    converter.readAll(classOf[Option[Int]])
+  }
+
   def findModel(schemas: Map[String, Model], name: String): Option[Model] = {
     schemas.get(name) match {
       case Some(m) => Some(m)

src/test/scala/ScalaModelTest.scala

@@ -48,20 +48,29 @@ class ScalaModelTest extends FlatSpec with Matchers {
     val friends = model.getProperties().get("friends")
     friends.isInstanceOf[ArrayProperty] should be (true)
   }
-  
+
   it should "read a model with vector of ints" in {
     val schemas = ModelConverters.getInstance().readAll(classOf[ModelWithIntVector]).asScala
     val model = schemas("ModelWithIntVector")
     val prop = model.getProperties().get("ints")
     prop.isInstanceOf[ArrayProperty] should be (true)
-    prop.asInstanceOf[ArrayProperty].getItems.getType should be ("number")
+    prop.asInstanceOf[ArrayProperty].getItems.getType should be ("object")
+  }
+
+  it should "read a model with vector of booleans" in {
+    val schemas = ModelConverters.getInstance().readAll(classOf[ModelWithBooleanVector]).asScala
+    val model = schemas("ModelWithBooleanVector")
+    val prop = model.getProperties().get("bools")
+    prop.isInstanceOf[ArrayProperty] should be (true)
+    prop.asInstanceOf[ArrayProperty].getItems.getType should be ("object")
   }
 }
 
 case class ModelWithVector (
   name: String,
   friends: Vector[String])
-  
+
 case class ModelWithIntVector (ints: Vector[Int])
+case class ModelWithBooleanVector (bools: Vector[Boolean])
 
 case class SimpleUser (id: Long, name: String, @(ApiModelProperty @field)(value = "the birthdate") date: java.util.Date)

src/test/scala/models/ModelWOptionBoolean.scala

@@ -0,0 +1,8 @@
+package models
+
+import io.swagger.annotations.ApiModelProperty
+
+import scala.annotation.meta.field
+
+case class ModelWOptionBoolean(
+           @(ApiModelProperty @field)(value="this is an Option[Boolean] attribute") optBoolean: Option[Boolean])