Merge pull request #2058 from swagger-api/issue-1743

Added boolean enums

Author: fehguy

modules/swagger-core/src/test/java/io/swagger/ModelPropertyTest.java

@@ -5,10 +5,12 @@
 import io.swagger.models.Model;
 import io.swagger.models.Model1979;
 import io.swagger.models.ModelImpl;
+import io.swagger.models.ModelWithBooleanProperty;
 import io.swagger.models.ModelWithModelPropertyOverrides;
 import io.swagger.models.ModelWithPrimitiveArray;
 import io.swagger.models.ReadOnlyFields;
 import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
 import io.swagger.models.properties.IntegerProperty;
 import io.swagger.models.properties.LongProperty;
 import io.swagger.models.properties.Property;
@@ -107,6 +109,18 @@ public void modelAllowEmptyTest() {
         assertTrue(model.getProperties().get("id").getAllowEmptyValue());
     }
 
+
+    @Test
+    public void testIssue1743() {
+        final Map<String, Model> models = ModelConverters.getInstance().readAll(ModelWithBooleanProperty.class);
+        final Model model = models.get("ModelWithBooleanProperty");
+        assertNotNull(model);
+
+        BooleanProperty bp = (BooleanProperty) model.getProperties().get("isGreat");
+        assertTrue(bp.getEnum().size() == 1);
+        assertEquals(bp.getEnum().get(0), Boolean.TRUE);
+    }
+
     class Family {
         public Date membersSince;
         public List<Person> members;

modules/swagger-core/src/test/java/io/swagger/models/ModelWithBooleanProperty.java

@@ -0,0 +1,11 @@
+package io.swagger.models;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ModelWithBooleanProperty {
+    @ApiModelProperty(allowableValues = "true")
+    public Boolean isGreat;
+
+    @ApiModelProperty(allowableValues = "1,2")
+    public Integer intValue;
+}

modules/swagger-models/src/main/java/io/swagger/models/properties/BooleanProperty.java

@@ -2,9 +2,13 @@
 
 import io.swagger.models.Xml;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class BooleanProperty extends AbstractProperty implements Property {
     public static final String TYPE = "boolean";
     protected Boolean _default;
+    protected List<Boolean> _enum;
 
     public BooleanProperty() {
         super.type = TYPE;
@@ -14,6 +18,16 @@ public static boolean isType(String type, String format) {
         return TYPE.equals(type);
     }
 
+    public BooleanProperty _enum(Boolean value) {
+        if (this._enum == null) {
+            this._enum = new ArrayList<Boolean>();
+        }
+        if (!_enum.contains(value)) {
+            _enum.add(value);
+        }
+        return this;
+    }
+
     public BooleanProperty xml(Xml xml) {
         this.setXml(xml);
         return this;
@@ -54,9 +68,39 @@ public BooleanProperty vendorExtension(String key, Object obj) {
         return this;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof BooleanProperty)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+
+        BooleanProperty that = (BooleanProperty) o;
+
+        if (_default != null ? !_default.equals(that._default) : that._default != null) {
+            return false;
+        }
+        return _enum != null ? _enum.equals(that._enum) : that._enum == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = super.hashCode();
+        result = 31 * result + (_default != null ? _default.hashCode() : 0);
+        result = 31 * result + (_enum != null ? _enum.hashCode() : 0);
+        return result;
+    }
+
     public BooleanProperty readOnly() {
         this.setReadOnly(Boolean.TRUE);
         return this;
+
     }
 
     public Boolean getDefault() {
@@ -71,30 +115,12 @@ public void setDefault(Boolean _default) {
         this._default = _default;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result + ((_default == null) ? 0 : _default.hashCode());
-        return result;
+    public List<Boolean> getEnum() {
+        return _enum;
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (!super.equals(obj)) {
-            return false;
-        }
-        if (!(obj instanceof BooleanProperty)) {
-            return false;
-        }
-        BooleanProperty other = (BooleanProperty) obj;
-        if (_default == null) {
-            if (other._default != null) {
-                return false;
-            }
-        } else if (!_default.equals(other._default)) {
-            return false;
-        }
-        return true;
+    public void setEnum(List<Boolean> _enum) {
+        this._enum = _enum;
     }
+
 }

modules/swagger-models/src/main/java/io/swagger/models/properties/PropertyBuilder.java

@@ -783,6 +783,17 @@ public Property merge(Property property, Map<PropertyId, Object> args) {
                 if(args.containsKey(PropertyId.ENUM)) {
                     final List<String> values = PropertyId.ENUM.findValue(args);
                     if(values != null) {
+                        if(property instanceof BooleanProperty) {
+                            BooleanProperty p = (BooleanProperty) property;
+                            for(String value : values) {
+                                try {
+                                    p._enum(Boolean.parseBoolean(value));
+                                }
+                                catch(Exception e) {
+                                    // continue
+                                }
+                            }
+                        }
                         if(property instanceof IntegerProperty) {
                             IntegerProperty p = (IntegerProperty) property;
                             for(String value : values) {