Skip to content

Commit 1ec75b4

Browse files
fehguyfehguy
committed
Merge branch 'develop'
2 parents 47fc33e + e76fa12 commit 1ec75b4

File tree

109 files changed

+1272
-2820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1272
-2820
lines changed

‎modules/swagger-annotations/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-project_2.10</artifactId>
6-
<version>1.3.6</version>
6+
<version>1.3.7-SNAPSHOT</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-annotations</artifactId>
12-
<version>1.3.6</version>
12+
<version>1.3.7-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414
<name>swagger-annotations</name>
1515

‎modules/swagger-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<parent>
33
<groupId>com.wordnik</groupId>
44
<artifactId>swagger-project_2.10</artifactId>
5-
<version>1.3.6</version>
5+
<version>1.3.7-SNAPSHOT</version>
66
<relativePath>../..</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.wordnik</groupId>
1010
<artifactId>swagger-core_2.10</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-core</name>
13-
<version>1.3.6</version>
13+
<version>1.3.7-SNAPSHOT</version>
1414
<build>
1515
<sourceDirectory>src/main/java</sourceDirectory>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-core/src/main/resources/logback.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
66
</layout>
77
</appender>
8-
<logger name="com.wordnik" level="error"/>
9-
<root level="error">
8+
<logger name="com.wordnik" level="ERROR"/>
9+
<root level="ERROR">
1010
<appender-ref ref="STDOUT" />
1111
</root>
1212
</configuration>

‎modules/swagger-core/src/main/scala/com/wordnik/swagger/config/SwaggerConfig.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.wordnik.swagger.core.SwaggerSpec
44

55
import com.wordnik.swagger.model.{ AuthorizationType, ApiInfo }
66

7-
import scala.reflect.BeanProperty
7+
import scala.beans.BeanProperty
88

99
class SwaggerConfig(
1010
@BeanProperty var apiVersion: String,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ModelPropertyParser(cls: Class[_], t: Map[String, String] = Map.empty) (im
7171

7272
def parseField(field: Field) = {
7373
LOGGER.debug("processing field " + field)
74-
val returnClass = field.getDeclaringClass
74+
val returnClass = field.getType
7575
parsePropertyAnnotations(returnClass, field.getName, field.getAnnotations, field.getGenericType, field.getType, true)
7676
}
7777

‎modules/swagger-core/src/main/scala/com/wordnik/swagger/core/util/ReaderUtil.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ trait ReaderUtil {
2424
val grouped = tuples.groupBy(_._1)
2525
(for (group <- grouped) yield {
2626
val apiDescriptions = (for(g <- group._2; api <- g._2.apis) yield api).toList
27-
group._2(0)._2.copy(apis = apiDescriptions)
27+
val models = (for(g <- group._2; models <- g._2.models) yield models).flatten.toMap
28+
group._2(0)._2.copy(apis = apiDescriptions, models = Option(models))
2829
}).toList
2930
}
3031
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import scala.collection.JavaConverters._
2222

2323
trait AuthorizationType {
2424
def `type`: String
25+
def getName: String
2526
}
2627

2728
class OAuthBuilder {
@@ -54,12 +55,15 @@ case class OAuth(
5455
scopes: List[AuthorizationScope],
5556
grantTypes: List[GrantType]) extends AuthorizationType {
5657
override def `type` = "oauth2"
58+
override def getName: String = `type`
5759
}
5860
case class ApiKey(keyname: String, passAs: String = "header") extends AuthorizationType {
5961
override def `type` = "apiKey"
62+
override def getName: String = keyname
6063
}
6164
case class BasicAuth() extends AuthorizationType {
6265
override def `type` = "basicAuth"
66+
override def getName: String = `type`
6367
}
6468

6569
trait GrantType {

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,20 @@ object SwaggerSerializers extends Serializers {
235235
}) ~
236236
("authorizations" -> {
237237
x.authorizations match {
238-
case e: List[AuthorizationType] if (e.size > 0) => {
239-
Extraction.decompose((for(at <- e) yield {
240-
if(at.`type` != "") Some(at.`type`, at)
241-
else None
238+
case e: List[Authorization] if (e.size > 0) => {
239+
var open = false
240+
val o = ((for(at <- e) yield {
241+
if(at.`type` == "open") {
242+
open = true
243+
None
244+
}
245+
else if(at.`type` != "")
246+
Some(at.`type`, at)
247+
else
248+
None
242249
}).flatten.toMap)
250+
if(o.size > 0 || open) Extraction.decompose(o)
251+
else JNothing
243252
}
244253
case _ => JNothing
245254
}
@@ -262,6 +271,10 @@ object SwaggerSerializers extends Serializers {
262271
case e: JString => e.s
263272
case _ => ""
264273
}
274+
val qType = (json \ "qualifiedType") match {
275+
case e: JString => e.s
276+
case _ => jType
277+
}
265278
val jFormat = (json \ "format") match {
266279
case e: JString => e.s
267280
case _ => ""
@@ -286,7 +299,7 @@ object SwaggerSerializers extends Serializers {
286299

287300
ModelProperty(
288301
`type` = `type`,
289-
qualifiedType = `type`,
302+
qualifiedType = qType,
290303
position = (json \ "position").extractOrElse(0),
291304
(json \ "required") match {
292305
case e:JString => e.s.toBoolean
@@ -486,7 +499,7 @@ trait Serializers {
486499
x.authorizations match {
487500
case e: List[AuthorizationType] if (e.size > 0) => {
488501
Extraction.decompose((for(at <- e) yield {
489-
if(at.`type` != "") Some(at.`type`, at)
502+
if(at.`type` != "") Some(at.getName, at)
490503
else None
491504
}).flatten.toMap)
492505
}
@@ -545,7 +558,7 @@ trait Serializers {
545558
x.authorizations match {
546559
case e: List[AuthorizationType] if (e.size > 0) => {
547560
Extraction.decompose((for(at <- e) yield {
548-
if(at.`type` != "") Some(at.`type`, at)
561+
if(at.`type` != "") Some(at.getName, at)
549562
else None
550563
}).flatten.toMap)
551564
}
@@ -737,8 +750,8 @@ trait Serializers {
737750
x.authorizations match {
738751
case e: List[AuthorizationType] if (e.size > 0) => {
739752
Extraction.decompose((for(at <- e) yield {
740-
if(at.`type` != "") {
741-
Some(at.`type`, at)
753+
if(at.getName != "") {
754+
Some(at.getName, at)
742755
}
743756
else None
744757
}).flatten.toMap)
@@ -924,7 +937,7 @@ trait Serializers {
924937

925938
class AuthorizationTypeSerializer extends CustomSerializer[AuthorizationType](formats => ({
926939
case json =>
927-
implicit val fmts: Formats = formats
940+
implicit val fmts = formats
928941
json \ "type" match {
929942
case JString(x) if x.equalsIgnoreCase("oauth2") => {
930943
OAuth((json \ "scopes").extractOrElse(List()),
@@ -966,7 +979,7 @@ trait Serializers {
966979
}, {
967980
case x: Authorization =>
968981
implicit val fmts = formats
969-
Extraction.decompose(x.scopes)
982+
Extraction.decompose(x.scopes.filter(_.scope != ""))
970983
}
971984
))
972985

‎modules/swagger-core/src/test/scala/converter/ATMTest.scala‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
package converter
22

33
import model._
4-
54
import com.wordnik.swagger.converter._
65
import com.wordnik.swagger.model._
7-
86
import com.wordnik.swagger.annotations._
97
import com.wordnik.swagger.converter._
108
import com.wordnik.swagger.core.util._
119
import com.wordnik.swagger.model._
12-
13-
import scala.reflect.BeanProperty
10+
import scala.beans.BeanProperty
1411
import scala.collection.mutable.LinkedHashMap
15-
1612
import org.junit.runner.RunWith
1713
import org.scalatest.junit.JUnitRunner
1814
import org.scalatest.FlatSpec
1915
import org.scalatest.matchers.ShouldMatchers
20-
2116
import javax.xml.bind.annotation._
17+
import converter.models.ATM
2218

2319
@RunWith(classOf[JUnitRunner])
2420
class ATMTest extends FlatSpec with ShouldMatchers {

‎modules/swagger-core/src/test/scala/converter/CustomConverterTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.joda.time.DateTime
1414

1515
import scala.collection.mutable.LinkedHashMap
1616
import scala.annotation.target.field
17-
import scala.reflect.BeanProperty
17+
import scala.beans.BeanProperty
1818

1919
import org.junit.runner.RunWith
2020
import org.scalatest.junit.JUnitRunner

0 commit comments

Comments
 (0)