From eb6c09bfce0afaecb42d1fb4c561ba20ca2afd6c Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Fri, 26 Sep 2014 09:39:39 -0700 Subject: [PATCH] merged from #271 --- .../com/wordnik/swagger/codegen/CodegenProperty.java | 11 ++++++++--- .../com/wordnik/swagger/codegen/DefaultCodegen.java | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java b/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java index ecc2008c5be..8461310a298 100644 --- a/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java +++ b/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java @@ -1,13 +1,18 @@ package com.wordnik.swagger.codegen; -import com.wordnik.swagger.models.*; -import com.wordnik.swagger.models.properties.*; - import java.util.*; public class CodegenProperty { public String baseName, complexType, getter, setter, description, datatype, name, min, max, defaultValue, baseType, containerType; + + /** maxLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.1 */ + public Integer maxLength; + /** minLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.2 */ + public Integer minLength; + /** pattern validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.3 */ + public String pattern; + public Double minimum, maximum, exclusiveMinimum, exclusiveMaximum; public Boolean hasMore = null, required = null, secondaryParam = null; public Boolean isPrimitiveType, isContainer, isNotContainer; diff --git a/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java index 71aa90917c6..9a3999963f6 100644 --- a/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java +++ b/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java @@ -412,6 +412,9 @@ public class DefaultCodegen { if(p instanceof StringProperty) { StringProperty sp = (StringProperty) p; + property.maxLength = sp.getMaxLength(); + property.minLength = sp.getMinLength(); + property.pattern = sp.getPattern(); if(sp.getEnum() != null) { List _enum = sp.getEnum(); property._enum = _enum;