Merge pull request #18 from swagger-api/develop

Merged from develop
swagger-api · Mar 4, 2015 · 08b37f9 · 08b37f9
2 parents 8935bed + 2716b84
commit 08b37f9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/modules/swagger-compat-spec-parser/pom.xml b/modules/swagger-compat-spec-parser/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-parser-project</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
   <artifactId>swagger-compat-spec-parser</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>jar</packaging>
   <name>swagger-compat-spec-parser</name>
   <dependencies>

diff --git a/...es/swagger-compat-spec-parser/src/main/java/io/swagger/parser/SwaggerCompatConverter.java b/...es/swagger-compat-spec-parser/src/main/java/io/swagger/parser/SwaggerCompatConverter.java
@@ -180,7 +180,8 @@ else if(ParamType.FORM.equals(param.getParamType())) {
 
     output.setName(param.getName());
     output.setDescription(param.getDescription());
-    output.setRequired(param.getRequired());
+    if(param.getRequired() != null)
+      output.setRequired(param.getRequired());
 
     Property property = null;
     String type = param.getType() == null ? null : param.getType().toString();
@@ -264,6 +265,12 @@ public Property propertyFromTypedObject(ExtendedTypedObject obj) {
     if("array".equals(type)) {
       ArrayProperty am = new ArrayProperty();
       Items items = obj.getItems();
+      if(items == null) {
+        System.out.println("Error! Missing array type for property!  Assuming `object` -- please fix your spec");
+        Json.prettyPrint(obj);
+        items = new Items();
+        items.setType("object");
+      }
       type = items.getType() == null ? null : items.getType().toString();
       format = items.getFormat() == null ? null : items.getFormat().toString();
 

diff --git a/modules/swagger-parser/pom.xml b/modules/swagger-parser/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-parser-project</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>jar</packaging>
   <name>swagger-parser</name>
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.swagger</groupId>
   <artifactId>swagger-parser-project</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <packaging>pom</packaging>
   <name>swagger-parser-project</name>
   <developers>