Skip to content

Commit 7d73179

Browse files
fehguyfehguy
committed
merged from develop scala 2.10
1 parent b1a468c commit 7d73179

File tree

24 files changed

+63
-52
lines changed

24 files changed

+63
-52
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.7</version>
6+
<version>1.3.8</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.7</version>
12+
<version>1.3.8</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.7</version>
5+
<version>1.3.8</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.7</version>
13+
<version>1.3.8</version>
1414
<build>
1515
<sourceDirectory>src/main/java</sourceDirectory>
1616
<defaultGoal>install</defaultGoal>

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,21 @@ object SwaggerSerializers extends Serializers {
240240
("authorizations" -> {
241241
x.authorizations match {
242242
case e: List[Authorization] if (e.size > 0) => {
243-
Extraction.decompose((for(at: Authorization <- e) yield {
244-
if(at.`type` != "") Some(at.`type`, at)
245-
else None
246-
}).flatten.toMap)
243+
Extraction.decompose({
244+
var open = false
245+
val o = ((for(at <- e) yield {
246+
if(at.`type` == "open") {
247+
open = true
248+
None
249+
}
250+
else if(at.`type` != ""){
251+
val out: Option[Tuple2[String, Authorization]] = Some(at.`type`, at)
252+
out
253+
}
254+
else
255+
None
256+
}).flatten.toMap)
257+
})
247258
}
248259
case _ => JNothing
249260
}

‎modules/swagger-jaxrs-utils/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-project_2.10</artifactId>
6-
<version>1.3.7</version>
6+
<version>1.3.8</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-jaxrs-utils_2.10</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.3.7</version>
13+
<version>1.3.8</version>
1414
<name>swagger-jaxrs-utils</name>
1515
<build>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-jaxrs/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-project_2.10</artifactId>
6-
<version>1.3.7</version>
6+
<version>1.3.8</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-jaxrs_2.10</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.3.7</version>
13+
<version>1.3.8</version>
1414
<name>swagger-jaxrs</name>
1515
<build>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-jersey-jaxrs/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-project_2.10</artifactId>
6-
<version>1.3.7</version>
6+
<version>1.3.8</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-jersey-jaxrs_2.10</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.3.7</version>
13+
<version>1.3.8</version>
1414
<name>swagger-jersey-jaxrs</name>
1515
<build>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-jersey2-jaxrs/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-project_2.10</artifactId>
6-
<version>1.3.7</version>
6+
<version>1.3.8</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-jersey2-jaxrs_2.10</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.3.7</version>
13+
<version>1.3.8</version>
1414
<name>swagger-jersey2-jaxrs (Jersey 2.x support)</name>
1515
<build>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-oauth2-auth-server/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-project_2.10</artifactId>
6-
<version>1.3.7</version>
6+
<version>1.3.8</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-oauth2-server_2.10</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.3.7</version>
13+
<version>1.3.8</version>
1414
<name>swagger-oauth2-server</name>
1515
<build>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-servlet/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<parent>
44
<groupId>com.wordnik</groupId>
55
<artifactId>swagger-project_2.10</artifactId>
6-
<version>1.3.7</version>
6+
<version>1.3.8</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-servlet_2.10</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.3.7</version>
13+
<version>1.3.8</version>
1414
<name>swagger-servlet</name>
1515
<build>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-utils/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.7</version>
5+
<version>1.3.8</version>
66
<relativePath>../..</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.wordnik</groupId>
1010
<artifactId>swagger-utils_2.10</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-utils</name>
13-
<version>1.3.7</version>
13+
<version>1.3.8</version>
1414
<build>
1515
<sourceDirectory>src/main/java</sourceDirectory>
1616
<defaultGoal>install</defaultGoal>

0 commit comments

Comments
 (0)