Swagr Codegen: Updates to generate comments properly for models

This commit is contained in:
Deepak Michael 2011-07-27 10:20:59 +05:30
parent 1f738486ee
commit b61d3b2914
3 changed files with 32 additions and 25 deletions

View File

@ -15,17 +15,19 @@ import $import$;
*/ */
public class $className$ extends $extends$ { public class $className$ extends $extends$ {
$fields:{ field | $fields:{ field |
//$field.description$
private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$; /**
}$ * $field.description$
*/
$fields:{ field | private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$;$\r$}$
//$field.description$
$if(field.required)$ $fields:{ field |
@Required $endif$ /**
$if(field.allowableValues)$ * $field.description$
@AllowableValues(value="$field.allowableValues$")$endif$ * $if(field.required)$@Required$endif$
* $if(field.allowableValues)$@AllowableValues(value="$field.allowedValuesString$")$endif$
*/
public $field.fieldDefinition.returnType$ get$field.fieldDefinition.NameForMethod$() { public $field.fieldDefinition.returnType$ get$field.fieldDefinition.NameForMethod$() {
return $field.fieldDefinition.name$; return $field.fieldDefinition.name$;
} }
@ -33,5 +35,6 @@ public class $className$ extends $extends$ {
public void set$field.fieldDefinition.NameForMethod$($field.fieldDefinition.returnType$ $field.fieldDefinition.name$) { public void set$field.fieldDefinition.NameForMethod$($field.fieldDefinition.returnType$ $field.fieldDefinition.name$) {
this.$field.fieldDefinition.name$ = $field.fieldDefinition.name$; this.$field.fieldDefinition.name$ = $field.fieldDefinition.name$;
} }
}$
}$
} }

View File

@ -96,8 +96,10 @@ public class ModelField {
public String getAllowedValuesString() { public String getAllowedValuesString() {
String result = ""; String result = "";
for(String allowedValue: this.allowableValues){ if (this.allowableValues != null) {
result += (allowedValue +","); for(String allowedValue: this.allowableValues){
result += (allowedValue +",");
}
} }
if(result.length() == 0) if(result.length() == 0)
return null; return null;

View File

@ -15,17 +15,19 @@ import $import$;
*/ */
public class $className$ extends $extends$ { public class $className$ extends $extends$ {
$fields:{ field | $fields:{ field |
//$field.description$ /**
private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$; * $field.description$
}$ */
private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$;$\n$
}$
$fields:{ field | $fields:{ field |
//$field.description$ /**
$if(field.required)$ * $field.description$
@Required $endif$ * $if(field.required)$@Required$endif$
$if(field.allowableValues)$ * $if(field.allowedValuesString)$@AllowableValues(value="$field.allowableValues$")$endif$
@AllowableValues(value="$field.allowableValues$")$endif$ */
public $field.fieldDefinition.returnType$ get$field.fieldDefinition.NameForMethod$() { public $field.fieldDefinition.returnType$ get$field.fieldDefinition.NameForMethod$() {
return $field.fieldDefinition.name$; return $field.fieldDefinition.name$;
} }
@ -33,5 +35,5 @@ public class $className$ extends $extends$ {
public void set$field.fieldDefinition.NameForMethod$($field.fieldDefinition.returnType$ $field.fieldDefinition.name$) { public void set$field.fieldDefinition.NameForMethod$($field.fieldDefinition.returnType$ $field.fieldDefinition.name$) {
this.$field.fieldDefinition.name$ = $field.fieldDefinition.name$; this.$field.fieldDefinition.name$ = $field.fieldDefinition.name$;
} }
}$ }$
} }