Merge pull request #2035 from swagger-api/issue-889

added type override

Author: fehguy

modules/swagger-annotations/src/main/java/io/swagger/annotations/ApiImplicitParam.java

@@ -127,4 +127,23 @@
      * @return
      */
     Example examples() default @Example(value = @ExampleProperty(mediaType = "", value = ""));
+
+    /**
+     * Adds the ability to override the detected type
+     *
+     * @since 1.5.11
+     *
+     * @return
+     */
+    String type() default "";
+
+    /**
+     * Adds the ability to provide a custom format
+     *
+     * @since 1.5.11
+     *
+     * @return
+     */
+    String format() default "";
+
 }

modules/swagger-annotations/src/main/java/io/swagger/annotations/ApiParam.java

@@ -111,6 +111,15 @@
      */
     Example examples() default @Example(value = @ExampleProperty(mediaType = "", value = ""));
 
+    /**
+     * Adds the ability to override the detected type
+     *
+     * @since 1.5.11
+     *
+     * @return
+     */
+    String type() default "";
+
     /**
      * Adds the ability to provide a custom format
      *

modules/swagger-core/src/main/java/io/swagger/util/ParameterProcessor.java

@@ -79,6 +79,9 @@ public static Parameter applyAnnotations(Swagger swagger, Parameter parameter, T
             if (helper.isRequired() != null) {
                 p.setRequired(true);
             }
+            if(helper.getType() != null) {
+                p.setType(helper.getType());
+            }
             if(helper.getFormat() != null) {
                 p.setFormat(helper.getFormat());
             }
@@ -255,6 +258,8 @@ public interface ParamWrapper<T extends Annotation> {
 
         String getExample();
 
+        String getType();
+
         String getFormat();
     }
 
@@ -266,6 +271,7 @@ private static class AnnotationsHelper {
         private static final ApiParam DEFAULT_API_PARAM = getDefaultApiParam(null);
         private boolean context;
         private ParamWrapper<?> apiParam = new ApiParamWrapper(DEFAULT_API_PARAM);
+        private String type;
         private String format;
         private String defaultValue;
         private Integer minItems;
@@ -307,6 +313,7 @@ public AnnotationsHelper(List<Annotation> annotations) {
                 }
             }
             defaultValue = StringUtils.isNotEmpty(apiParam.getDefaultValue()) ? apiParam.getDefaultValue() : rsDefault;
+            type = StringUtils.isNotEmpty(apiParam.getType()) ? apiParam.getType() : null;
             format = StringUtils.isNotEmpty(apiParam.getFormat()) ? apiParam.getFormat() : null;
         }
 
@@ -374,6 +381,10 @@ public Long getMin() {
             return min;
         }
 
+        public String getType() {
+            return type;
+        }
+
         public String getFormat() {
             return format;
         }
@@ -455,6 +466,10 @@ public Example getExamples() {
             return apiParam.examples();
         }
 
+        public String getType() {
+            return apiParam.type();
+        }
+
         public String getFormat() {
             return apiParam.format();
         }
@@ -535,8 +550,12 @@ public Example getExamples() {
             return apiParam.examples();
         }
 
+        public String getType() {
+            return apiParam.type();
+        }
+
         public String getFormat() {
-            return null;
+            return apiParam.format();
         }
     }
 }