fixed enums on properties

Author: fehguy

modules/swagger-core/src/main/java/com/wordnik/swagger/jackson/ModelResolver.java

@@ -48,7 +48,6 @@ public Property resolveProperty(JavaType propType, ModelConverterContext context
 
     // primitive or null
     property = getPrimitiveProperty(typeName);
-    // modelProp.setQualifiedType(_typeQName(propType));
     // And then properties specific to subset of property types:
     if (propType.isContainerType()) {
       JavaType keyType = propType.getKeyType();
@@ -142,6 +141,7 @@ protected void _addEnumProps(Class<?> propClass, Property property) {
     final boolean useIndex =  _mapper.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX);
     final boolean useToString = _mapper.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
     // List<AllowableValue> enums = new ArrayList<AllowableValue>();
+
     @SuppressWarnings("unchecked")
     Class<Enum<?>> enumClass = (Class<Enum<?>>) propClass;
     for (Enum<?> en : enumClass.getEnumConstants()) {
@@ -329,6 +329,27 @@ else if(or.toLowerCase().startsWith("map[")) {
           property.setExample(_findExampleValue(member));
           property.setReadOnly(_findReadOnly(member));
 
+
+
+          if(property instanceof StringProperty) {
+            if(mp != null) {
+              String allowableValues = mp.allowableValues();
+              LOGGER.debug("allowableValues " + allowableValues);
+              if(!"".equals(allowableValues)) {
+                String[] parts = allowableValues.split(",");
+                LOGGER.debug("found " + parts.length + " parts");
+                for(String part : parts) {
+                  if(property instanceof StringProperty) {
+                    StringProperty sp = (StringProperty) property;
+                    sp._enum(part.trim());
+                    LOGGER.debug("added enum value " + part);
+                  }          
+                }
+              }
+            }
+          }
+
+
           if(property != null) {
             // check for XML annotations
             XmlElementWrapper wrapper = member.getAnnotation(XmlElementWrapper.class);