added uuid, bigdecimal

Author: fehguy

modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelConverters.scala

@@ -155,7 +155,7 @@ trait ModelConverter {
   def toDescriptionOpt(cls: Class[_]): Option[String]
 
   def ignoredPackages: Set[String] = Set("java.lang")
-  def ignoredClasses: Set[String] = Set("java.util.Date")
+  def ignoredClasses: Set[String] = Set("java.util.Date", "java.math.BigDecimal")
 
   def typeMap = Map[String, String]()
 

modules/swagger-core/src/main/scala/com/wordnik/swagger/core/SwaggerSpec.scala

@@ -1,7 +1,7 @@
 package com.wordnik.swagger.core
 
 object SwaggerSpec {
-  val baseTypes = Set("byte", "boolean", "int", "long", "float", "double", "string", "date", "void", "Date")
+  val baseTypes = Set("byte", "boolean", "int", "long", "float", "double", "string", "date", "void", "Date", "BigDecimal", "UUID")
   val containerTypes = Set("Array", "List", "Set")
   val version = "1.2"
 }

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

@@ -101,18 +101,20 @@ object SwaggerSerializers extends Serializers {
 
   def toJsonSchema(name: String, `type`: String): JObject = {
     `type` match {
-      case "int"       => (name -> "integer") ~ ("format" -> "int32")
-      case "long"      => (name -> "integer") ~ ("format" -> "int64")
-      case "float"     => (name -> "number")  ~ ("format" -> "float")
-      case "double"    => (name -> "number")  ~ ("format" -> "double")
-      case "string"    => (name -> "string")  ~ ("format" -> JNothing)
-      case "byte"      => (name -> "string")  ~ ("format" -> "byte")
-      case "boolean"   => (name -> "boolean") ~ ("format" -> JNothing)
-      case "Date"      => (name -> "string")  ~ ("format" -> "date-time")
-      case "DateTime"  => (name -> "string")  ~ ("format" -> "date-time")
-      case "date"      => (name -> "string")  ~ ("format" -> "date")
-      case "date-time" => (name -> "string")  ~ ("format" -> "date-time")
-      case _           => {
+      case "int"        => (name -> "integer") ~ ("format" -> "int32")
+      case "long"       => (name -> "integer") ~ ("format" -> "int64")
+      case "float"      => (name -> "number")  ~ ("format" -> "float")
+      case "double"     => (name -> "number")  ~ ("format" -> "double")
+      case "string"     => (name -> "string")  ~ ("format" -> JNothing)
+      case "byte"       => (name -> "string")  ~ ("format" -> "byte")
+      case "boolean"    => (name -> "boolean") ~ ("format" -> JNothing)
+      case "Date"       => (name -> "string")  ~ ("format" -> "date-time")
+      case "DateTime"   => (name -> "string")  ~ ("format" -> "date-time")
+      case "BigDecimal" => (name -> "number")
+      case "UUID"       => (name -> "string")  ~ ("format" -> "uuid")
+      case "date"       => (name -> "string")  ~ ("format" -> "date")
+      case "date-time"  => (name -> "string")  ~ ("format" -> "date-time")
+      case _            => {
         val ComplexTypeMatcher = "([a-zA-Z]*)\\[([a-zA-Z\\.\\-]*)\\].*".r
         `type` match {
           case ComplexTypeMatcher(container, value) => 
@@ -162,7 +164,9 @@ object SwaggerSerializers extends Serializers {
       case ("integer", "int64") => "long"
       case ("number", "float") => "float"
       case ("number", "double") => "double"
+      case ("number", _) => "bigDecimal"
       case ("string", "byte") => "byte"
+      case ("string", "uuid") => "uuid"
       case ("boolean", _) => "boolean"
       case ("string", "date") => "date"
       case ("string", "date-time") => "date-time"
@@ -547,8 +551,8 @@ trait Serializers {
       }) ~
       ("authorizations" -> {
         x.authorizations match {
-          case e: List[Authorization] if (e.size > 0) => {
-            Extraction.decompose((for(at: Authorization <- e) yield {
+          case e: List[AuthorizationType] if (e.size > 0) => {
+            Extraction.decompose((for(at: AuthorizationType <- e) yield {
               if(at.`type` != "") Some(at.`type`, at)
               else None
             }).flatten.toMap)