Skip to content

Commit ee0b639

Browse files
fehguyfehguy
committed
Merge pull request #962 from swagger-api/develop_2.0
Merged from develop_2.0
2 parents d588f96 + 32eeeb7 commit ee0b639

File tree

32 files changed

+249
-70
lines changed

32 files changed

+249
-70
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ The Swagger Specification has undergone 3 revisions since initial creation in 20
2929

3030
Swagger core Version | Release Date | Swagger Spec compatibility | Notes | Status
3131
------------------------- | ------------ | -------------------------- | ----- | ----
32-
1.5.0-M2 | 2015-03-30 | 2.0 | [master](https://github.com/swagger-api/swagger-core) | Supported
32+
1.5.1-M2 | 2015-04-05 | 2.0 | [master](https://github.com/swagger-api/swagger-core) | Supported
3333
1.3.12 | 2014-12-23 | 1.2 | [tag v1.3.12](https://github.com/swagger-api/swagger-core/tree/v1.3.12) | Supported
3434
1.2.4 | 2013-06-19 | 1.1 | [tag swagger-project_2.10.0-1.2.4](https://github.com/swagger-api/swagger-core/tree/swagger-project_2.10.0-1.2.4) | Deprecated
3535
1.0.0 | 2011-10-16 | 1.0 | [tag v1.0](https://github.com/swagger-api/swagger-core/tree/v1.0) | Deprecated
@@ -52,7 +52,7 @@ You need the following installed and available in your $PATH:
5252
* Jackson 2.4.2 or greater
5353

5454

55-
### To build from source (currently 1.5.0-M2)
55+
### To build from source (currently 1.5.1-M2)
5656
```
5757
# first time building locally
5858
mvn -N

‎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</artifactId>
6-
<version>1.5.0-M2</version>
6+
<version>1.5.1-M2</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.5.0-M2</version>
12+
<version>1.5.1-M2</version>
1313
<packaging>bundle</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</artifactId>
5-
<version>1.5.0-M2</version>
5+
<version>1.5.1-M2</version>
66
<relativePath>../..</relativePath>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<groupId>com.wordnik</groupId>
1010
<artifactId>swagger-core</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-core</name>
13-
<version>1.5.0-M2</version>
13+
<version>1.5.1-M2</version>
1414
<build>
1515
<sourceDirectory>src/main/java</sourceDirectory>
1616
<defaultGoal>install</defaultGoal>

‎modules/swagger-core/src/main/java/com/wordnik/swagger/util/PropertyDeserializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Property propertyFromNode(JsonNode node) {
7272
description = (String) ((TextNode) detailNode).asText();
7373
detailNode = node.get("default");
7474
if(detailNode != null)
75-
_default = (String) ((TextNode) detailNode).asText();
75+
_default = detailNode.toString();
7676
detailNode = node.get("pattern");
7777
if(detailNode != null)
7878
pattern = (String) ((TextNode) detailNode).asText();

‎modules/swagger-core/src/test/scala/ModelConverterTest.scala‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ class ModelConverterTest extends FlatSpec with Matchers {
7878
},
7979
"isDomestic" : {
8080
"type" : "boolean",
81-
"position" : 3
81+
"position" : 3,
82+
"default" : false
8283
}
8384
}
8485
}
@@ -108,7 +109,8 @@ class ModelConverterTest extends FlatSpec with Matchers {
108109
},
109110
"isDomestic" : {
110111
"type" : "boolean",
111-
"position" : 3
112+
"position" : 3,
113+
"default": false
112114
}
113115
}
114116
}

‎modules/swagger-core/src/test/scala/ScalaModelTest.scala‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ class ScalaModelTest extends FlatSpec with Matchers {
9696
"format" : "date-time"
9797
},
9898
"booleanValue" : {
99-
"type" : "boolean"
99+
"type" : "boolean",
100+
"default": false
100101
}
101102
}
102103
}
@@ -151,6 +152,7 @@ class ScalaModelTest extends FlatSpec with Matchers {
151152
},
152153
"isDomestic" : {
153154
"type" : "boolean",
155+
"default": false,
154156
"position" : 3
155157
}
156158
}

‎modules/swagger-core/src/test/scala/properties/PropertySerializationTest.scala‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@ class PropertySerializationTest extends FlatSpec with Matchers {
1515

1616
it should "serialize a BooleanProperty" in {
1717
val p = new BooleanProperty()
18-
m.writeValueAsString(p) should be ("""{"type":"boolean"}""")
18+
._default(true)
19+
20+
m.writeValueAsString(p) should be ("""{"type":"boolean","default":true}""")
1921
}
2022

2123
it should "deserialize a BooleanProperty" in {
22-
val json = """{"type":"boolean"}"""
24+
val json = """{"type":"boolean","default":false}"""
2325
val p = m.readValue(json, classOf[Property])
2426
p.getType should be ("boolean")
2527
p.getFormat should be (null)
2628
p.getClass should be (classOf[BooleanProperty])
29+
p.asInstanceOf[BooleanProperty].getDefault should equal (false)
2730
m.writeValueAsString(p) should equal (json)
2831
}
2932

@@ -57,7 +60,8 @@ class PropertySerializationTest extends FlatSpec with Matchers {
5760

5861
it should "serialize a DoubleProperty" in {
5962
val p = new DoubleProperty()
60-
m.writeValueAsString(p) should be ("""{"type":"number","format":"double"}""")
63+
._default(3.14159)
64+
m.writeValueAsString(p) should be ("""{"type":"number","format":"double","default":3.14159}""")
6165
}
6266

6367
it should "deserialize a DoubleProperty" in {
@@ -71,7 +75,8 @@ class PropertySerializationTest extends FlatSpec with Matchers {
7175

7276
it should "serialize a FloatProperty" in {
7377
val p = new FloatProperty()
74-
m.writeValueAsString(p) should be ("""{"type":"number","format":"float"}""")
78+
._default(1.2f)
79+
m.writeValueAsString(p) should be ("""{"type":"number","format":"float","default":1.2}""")
7580
}
7681

7782
it should "deserialize a FloatProperty" in {
@@ -85,7 +90,8 @@ class PropertySerializationTest extends FlatSpec with Matchers {
8590

8691
it should "serialize an IntegerProperty" in {
8792
val p = new IntegerProperty()
88-
m.writeValueAsString(p) should be ("""{"type":"integer","format":"int32"}""")
93+
._default(32)
94+
m.writeValueAsString(p) should be ("""{"type":"integer","format":"int32","default":32}""")
8995
}
9096

9197
it should "deserialize a IntegerProperty" in {
@@ -99,7 +105,8 @@ class PropertySerializationTest extends FlatSpec with Matchers {
99105

100106
it should "serialize a LongProperty" in {
101107
val p = new LongProperty()
102-
m.writeValueAsString(p) should be ("""{"type":"integer","format":"int64"}""")
108+
._default(8675309L)
109+
m.writeValueAsString(p) should be ("""{"type":"integer","format":"int64","default":8675309}""")
103110
}
104111

105112
it should "deserialize a LongProperty" in {
@@ -164,7 +171,8 @@ class PropertySerializationTest extends FlatSpec with Matchers {
164171

165172
it should "serialize a StringProperty" in {
166173
val p = new StringProperty()
167-
m.writeValueAsString(p) should be ("""{"type":"string"}""")
174+
._default("Bob")
175+
m.writeValueAsString(p) should be ("""{"type":"string","default":"Bob"}""")
168176
}
169177

170178
it should "deserialize a StringProperty" in {

‎modules/swagger-hiberate-validations/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</artifactId>
6-
<version>1.5.0-M2</version>
6+
<version>1.5.1-M2</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-hiberate-validations</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.5.0-M2</version>
13+
<version>1.5.1-M2</version>
1414
<name>swagger-hiberate-validations</name>
1515
<build>
1616
<sourceDirectory>src/main/java</sourceDirectory>

‎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</artifactId>
6-
<version>1.5.0-M2</version>
6+
<version>1.5.1-M2</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010
<groupId>com.wordnik</groupId>
1111
<artifactId>swagger-jaxrs</artifactId>
1212
<packaging>jar</packaging>
13-
<version>1.5.0-M2</version>
13+
<version>1.5.1-M2</version>
1414
<name>swagger-jaxrs</name>
1515
<build>
1616
<sourceDirectory>src/main/java</sourceDirectory>

‎modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/listing/ApiListingResource.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
import javax.ws.rs.*;
1616
import javax.ws.rs.core.*;
1717

18-
import java.util.Set;
18+
import java.util.HashMap;
19+
import java.util.HashSet;
1920
import java.util.List;
2021
import java.util.Map;
21-
import java.util.HashMap;
22+
import java.util.Set;
2223

2324
@Path("/")
2425
public class ApiListingResource {
@@ -37,7 +38,7 @@ protected synchronized Swagger scan (Application app, ServletConfig sc) {
3738
SwaggerSerializers.setPrettyPrint(scanner.getPrettyPrint());
3839
swagger = (Swagger)context.getAttribute("swagger");
3940

40-
Set<Class<?>> classes = null;
41+
Set<Class<?>> classes = new HashSet<Class<?>>();
4142
if (scanner instanceof JaxrsScanner) {
4243
JaxrsScanner jaxrsScanner = (JaxrsScanner)scanner;
4344
classes = jaxrsScanner.classesFromContext(app, sc);

0 commit comments

Comments
 (0)