diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/allowableValues.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/allowableValues.mustache
new file mode 100644
index 00000000000..a48256d027a
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/allowableValues.mustache
@@ -0,0 +1 @@
+{{#allowableValues}}allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}{{^values}}range=[{{#min}}{{.}}{{/min}}{{^min}}-infinity{{/min}}, {{#max}}{{.}}{{/max}}{{^max}}infinity{{/max}}]{{/values}}"{{/allowableValues}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/bodyParams.mustache
index 86546afb9ca..2b28441d3d0 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/bodyParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/bodyParams.mustache
@@ -1 +1 @@
-{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
+{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache
index 1bae4717f4d..632d39cf23e 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache
@@ -1,2 +1,2 @@
-{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}  @FormDataParam("file") InputStream inputStream,
+{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@FormParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}  @FormDataParam("file") InputStream inputStream,
       @FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache
index 84a801e48ac..1360d796826 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/headerParams.mustache
@@ -1 +1 @@
-{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
+{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache
index 5bb31c704f7..8d80210b4b4 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pathParams.mustache
@@ -1 +1 @@
-{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}} {{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
+{{#isPathParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache
index 067493867c9..342da154a87 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
new file mode 100644
index 00000000000..ef24287b005
--- /dev/null
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/java/jaxrs/AllowableValuesTest.java
@@ -0,0 +1,64 @@
+package io.swagger.codegen.java.jaxrs;
+
+import io.swagger.codegen.CodegenParameter;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import org.apache.commons.io.IOUtils;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+public class AllowableValuesTest {
+
+    private static final String TEMPLATE_FILE = "JavaJaxRS/allowableValues.mustache";
+    private static final String PROVIDER_NAME = "operations";
+
+    private static String loadClassResource(Class<?> cls, String name) throws IOException {
+        InputStream in = null;
+        try {
+            in = cls.getClassLoader().getResourceAsStream(name);
+            return IOUtils.toString(in, StandardCharsets.UTF_8);
+        } finally {
+            IOUtils.closeQuietly(in);
+        }
+    }
+
+    @DataProvider(name = PROVIDER_NAME)
+    private Object[][] resource() {
+        final CodegenParameter param1 = new CodegenParameter();
+        final CodegenParameter param2 = new CodegenParameter() {{
+            allowableValues = ImmutableMap.<String, Object>of("values", ImmutableList.of("item1", "item2", "item3"));
+        }};
+        final CodegenParameter param3 = new CodegenParameter() {{
+            allowableValues = ImmutableMap.<String, Object>of("min", 1, "max", 10);
+        }};
+        final CodegenParameter param4 = new CodegenParameter() {{
+            allowableValues = ImmutableMap.<String, Object>of("min", 1);
+        }};
+        final CodegenParameter param5 = new CodegenParameter() {{
+            allowableValues = ImmutableMap.<String, Object>of("max", 10);
+        }};
+
+        return new Object[][]{
+                {param1, ""},
+                {param2, "allowableValues=\"item1, item2, item3\""},
+                {param3, "allowableValues=\"range=[1, 10]\""},
+                {param4, "allowableValues=\"range=[1, infinity]\""},
+                {param5, "allowableValues=\"range=[-infinity, 10]\""},
+        };
+    }
+
+    @Test(dataProvider = PROVIDER_NAME)
+    public void annotationsTest(CodegenParameter parameter, String expected) throws IOException {
+        final Template template = Mustache.compiler().compile(loadClassResource(this.getClass(), TEMPLATE_FILE));
+
+        Assert.assertEquals(template.execute(parameter), expected);
+    }
+}