update default values

Author: fehguy

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

@@ -72,7 +72,7 @@ Property propertyFromNode(JsonNode node) {
       description = (String) ((TextNode) detailNode).asText();
     detailNode = node.get("default");
     if(detailNode != null)
-      _default = (String) ((TextNode) detailNode).asText();
+      _default = detailNode.toString();
     detailNode = node.get("pattern");
     if(detailNode != null)
       pattern = (String) ((TextNode) detailNode).asText();

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/AbstractProperty.java

@@ -7,7 +7,6 @@ public abstract class AbstractProperty implements Property {
   String type;
   String format;
   String example;
-  String _default;
   Xml xml;
   boolean required;
   Integer position;
@@ -23,10 +22,6 @@ public Property description(String description) {
     this.setDescription(description);
     return this;
   }
-  public Property _default(String _default) {
-    this.setDefault(_default);
-    return this;
-  }
   public Property readOnly() {
     this.setReadOnly(Boolean.TRUE);
     return this;
@@ -95,13 +90,6 @@ public void setDescription(String description) {
     this.description = description;
   }
 
-  public String getDefault() {
-    return _default;
-  }
-  public void setDefault(String _default) {
-    this._default = _default;
-  }
-
   public Boolean getReadOnly() {
     return readOnly;
   }
@@ -111,4 +99,8 @@ public void setReadOnly(Boolean readOnly) {
     else
       this.readOnly = readOnly;
   }
+
+  public void setDefault(String _default) {
+    // do nothing
+  }
 }

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/DoubleProperty.java

@@ -1,8 +1,11 @@
 package com.wordnik.swagger.models.properties;
 
 import com.wordnik.swagger.models.Xml;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class DoubleProperty extends AbstractNumericProperty implements Property {
+  protected Double _default;
+
   public DoubleProperty() {
     super.type = "number";
     super.format = "double";
@@ -17,9 +20,32 @@ public DoubleProperty example(Double example) {
     return this;
   }
 
+  public DoubleProperty _default(String _default) {
+    if(_default != null) {
+      try {
+        this._default = Double.parseDouble(_default);
+      }
+      catch (NumberFormatException e) {
+        // continue;
+      }
+    }
+    return this;
+  }
+
   public static boolean isType(String type, String format) {
     if("number".equals(type) && "double".equals(format))
       return true;
     else return false;
   }
+
+  public Double getDefault() {
+    return _default;
+  }
+  public void setDefault(Double _default) {
+    this._default = _default;
+  }
+  @JsonIgnore
+  public void setDefault(String _default) {
+    this._default(_default);
+  }
 }

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/FloatProperty.java

@@ -1,8 +1,11 @@
 package com.wordnik.swagger.models.properties;
 
 import com.wordnik.swagger.models.Xml;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class FloatProperty extends AbstractNumericProperty implements Property {
+  protected Float _default;
+
   public FloatProperty() {
     super.type = "number";
     super.format = "float";
@@ -17,9 +20,32 @@ public FloatProperty example(Float example) {
     return this;
   }
 
+  public FloatProperty _default(String _default) {
+    if(_default != null) {
+      try {
+        this._default = Float.parseFloat(_default);
+      }
+      catch (NumberFormatException e) {
+        // continue;
+      }
+    }
+    return this;
+  }
+
   public static boolean isType(String type, String format) {
     if("number".equals(type) && "float".equals(format))
       return true;
     else return false;
   }
+
+  public Float getDefault() {
+    return _default;
+  }
+  public void setDefault(Float _default) {
+    this._default = _default;
+  }
+  @JsonIgnore
+  public void setDefault(String _default) {
+    this._default(_default);
+  }
 }

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/IntegerProperty.java

@@ -1,8 +1,11 @@
 package com.wordnik.swagger.models.properties;
 
 import com.wordnik.swagger.models.Xml;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class IntegerProperty extends AbstractNumericProperty implements Property {
+  protected Integer _default;
+
   public IntegerProperty() {
     super.type = "integer";
     super.format = "int32";
@@ -17,9 +20,32 @@ public IntegerProperty example(Integer example) {
     return this;
   }
 
+  public IntegerProperty _default(String _default) {
+    if(_default != null) {
+      try {
+        this._default = Integer.parseInt(_default);
+      }
+      catch (NumberFormatException e) {
+        // continue;
+      }
+    }
+    return this;
+  }
+
   public static boolean isType(String type, String format) {
     if("integer".equals(type) && "int32".equals(format))
       return true;
     else return false;
   }
+
+  public Integer getDefault() {
+    return _default;
+  }
+  public void setDefault(Integer _default) {
+    this._default = _default;
+  }
+  @JsonIgnore
+  public void setDefault(String _default) {
+    this._default(_default);
+  }
 }

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/LongProperty.java

@@ -1,8 +1,11 @@
 package com.wordnik.swagger.models.properties;
 
 import com.wordnik.swagger.models.Xml;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class LongProperty extends AbstractNumericProperty implements Property {
+  protected Long _default;
+
   public LongProperty() {
     super.type = "integer";
     super.format = "int64";
@@ -17,9 +20,32 @@ public LongProperty example (Long example) {
     return this;
   }
 
+  public LongProperty _default(String _default) {
+    if(_default != null) {
+      try {
+        this._default = Long.parseLong(_default);
+      }
+      catch (NumberFormatException e) {
+        // continue;
+      }
+    }
+    return this;
+  }
+
   public static boolean isType(String type, String format) {
     if("integer".equals(type) && "int64".equals(format))
       return true;
     else return false;
   }
+
+  public Long getDefault() {
+    return _default;
+  }
+  public void setDefault(Long _default) {
+    this._default = _default;
+  }
+  @JsonIgnore
+  public void setDefault(String _default) {
+    this._default(_default);
+  }
 }

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/Property.java

@@ -25,9 +25,6 @@ public interface Property {
   boolean getRequired();
   void setRequired(boolean required);
 
-  String getDefault();
-  void setDefault(String _default);
-
   String getExample();
   void setExample(String example);
 
@@ -39,4 +36,6 @@ public interface Property {
 
   Xml getXml();
   void setXml(Xml xml);
+
+  void setDefault(String _default);
 }

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/PropertyBuilder.java

@@ -38,18 +38,22 @@ public static Property build(String type, String format, Map<String, Object> arg
       property = new DateProperty();
     if(DateTimeProperty.isType(type, format))
       property = new DateTimeProperty();
-    if(DoubleProperty.isType(type, format))
+    if(DoubleProperty.isType(type, format)) {
       property = new DoubleProperty()
+        ._default(_default)
         .minimum(minimum)
         .maximum(maximum)
         .exclusiveMinimum(exclusiveMinimum)
         .exclusiveMaximum(exclusiveMinimum);
-    if(FloatProperty.isType(type, format))
+    }
+    if(FloatProperty.isType(type, format)) {
       property = new FloatProperty()
+        ._default(_default)
         .minimum(minimum)
         .maximum(maximum)
         .exclusiveMinimum(exclusiveMinimum)
         .exclusiveMaximum(exclusiveMinimum);
+    }
     if(FileProperty.isType(type, format)) {
       property = new FileProperty();
     }
@@ -59,18 +63,22 @@ public static Property build(String type, String format, Map<String, Object> arg
         .maximum(maximum)
         .exclusiveMinimum(exclusiveMinimum)
         .exclusiveMaximum(exclusiveMinimum);
-    if(IntegerProperty.isType(type, format))
+    if(IntegerProperty.isType(type, format)) {
       property = new IntegerProperty()
+        ._default(_default)
         .minimum(minimum)
         .maximum(maximum)
         .exclusiveMinimum(exclusiveMinimum)
         .exclusiveMaximum(exclusiveMinimum);
-    if(LongProperty.isType(type, format))
+    }
+    if(LongProperty.isType(type, format)) {
       property = new LongProperty()
+        ._default(_default)
         .minimum(minimum)
         .maximum(maximum)
         .exclusiveMinimum(exclusiveMinimum)
         .exclusiveMaximum(exclusiveMinimum);
+    }
     if(RefProperty.isType(type, format))
       property = new RefProperty();
     if(EmailProperty.isType(type, format))
@@ -79,17 +87,21 @@ public static Property build(String type, String format, Map<String, Object> arg
         .maxLength(maxLength)
         .pattern(pattern)
         ._enum(_enum);
-    if(StringProperty.isType(type, format))
+    if(StringProperty.isType(type, format)) {
       property = new StringProperty()
+        ._default(_default)
         .minLength(minLength)
         .maxLength(maxLength)
         .pattern(pattern)
         ._enum(_enum);
-    if(UUIDProperty.isType(type, format))
+    }
+    if(UUIDProperty.isType(type, format)) {
       property = new UUIDProperty()
+        ._default(_default)
         .minLength(minLength)
         .maxLength(maxLength)
         .pattern(pattern);
+    }
     // general properties
     if(property != null) {
       property
@@ -105,6 +117,7 @@ public static Property build(String type, String format, Map<String, Object> arg
         // fall back to Integer if type is integer and format is missing
       LOGGER.debug("no format specified for integer type, falling back to int32");
       property = new IntegerProperty()
+        ._default(_default)
         .minimum(minimum)
         .maximum(maximum)
         .exclusiveMinimum(exclusiveMinimum)

modules/swagger-models/src/main/java/com/wordnik/swagger/models/properties/StringProperty.java

@@ -1,13 +1,15 @@
 package com.wordnik.swagger.models.properties;
 
 import com.wordnik.swagger.models.Xml;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.*;
 
 public class StringProperty extends AbstractProperty implements Property {
   protected List<String> _enum;
   protected Integer minLength = null, maxLength = null;
   protected String pattern = null;
+  protected String _default;
 
   public StringProperty() {
     super.type = "string";
@@ -43,6 +45,10 @@ public StringProperty _enum(List<String> value) {
     this._enum = value;
     return this;
   }
+  public StringProperty _default(String _default) {
+    this._default = _default;
+    return this;
+  }
 
   public List<String> getEnum() {
     return _enum;
@@ -72,6 +78,13 @@ public void setPattern(String pattern) {
     this.pattern = pattern;
   }
 
+  public String getDefault() {
+    return _default;
+  }
+  public void setDefault(String _default) {
+    this._default = _default;
+  }
+
   //TODO: implement additional formats
   public static boolean isType(String type, String format) {
     if("string".equals(type) && (format == null || "uri".equals(format) || "byte".equals(format)))