loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into 2.3.0

Browse Source
This commit is contained in:
wing328
2017-04-23 22:46:10 +08:00
parent 397b440e60 1277db61bd
commit c8d9450db5
48 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+2
View File
@@ -126,6 +126,8 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
}
config.processOpts();
config.preprocessSwagger(swagger);
// TODO need to obtain version from a file instead of hardcoding it
config.additionalProperties().put("generatorVersion", "2.2.3-SNAPSHOT");
config.additionalProperties().put("generatedDate", DateTime.now().toString());
config.additionalProperties().put("generatorClass", config.getClass().getName());
config.additionalProperties().put("inputSpec", config.getInputSpec());
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
+9
View File
@@ -711,6 +711,15 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
p.example = example;
}
@Override
public String toExampleValue(Property p) {
if(p.getExample() != null) {
return escapeText(p.getExample().toString());
} else {
return super.toExampleValue(p);
}
}
@Override
public String getSwaggerType(Property p) {
String swaggerType = super.getSwaggerType(p);
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
+3 -3
View File
@@ -297,14 +297,14 @@ public class SpringCodegen extends AbstractJavaCodegen implements BeanValidation
break;
}
// add lamda for mustache templates
additionalProperties.put("lamdaEscapeDoubleQuote", new Mustache.Lambda() {
// add lambda for mustache templates
additionalProperties.put("lambdaEscapeDoubleQuote", new Mustache.Lambda() {
@Override
public void execute(Template.Fragment fragment, Writer writer) throws IOException {
writer.write(fragment.execute().replaceAll("\"", Matcher.quoteReplacement("\\\"")));
}
});
additionalProperties.put("lamdaRemoveLineBreak", new Mustache.Lambda() {
additionalProperties.put("lambdaRemoveLineBreak", new Mustache.Lambda() {
@Override
public void execute(Template.Fragment fragment, Writer writer) throws IOException {
writer.write(fragment.execute().replaceAll("\\r|\\n", ""));
modules/swagger-codegen/src/main/resources/Java/pojo.mustache
+1 -1
View File
@@ -82,7 +82,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
{{/maximum}}
* @return {{name}}
**/
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} @ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
{{#vendorExtensions.extraAnnotation}}
{{{vendorExtensions.extraAnnotation}}}
{{/vendorExtensions.extraAnnotation}}
modules/swagger-codegen/src/main/resources/JavaSpring/apiController.mustache
+1 -1
View File
@@ -55,7 +55,7 @@ public class {{classname}}Controller implements {{classname}} {
{{/-first}}
if (accept != null && accept.contains("{{{contentType}}}")) {
return new ResponseEntity<{{>returnTypes}}>(objectMapper.readValue("{{#lamdaRemoveLineBreak}}{{#lamdaEscapeDoubleQuote}}{{{example}}}{{/lamdaEscapeDoubleQuote}}{{/lamdaRemoveLineBreak}}", {{>exampleReturnTypes}}.class), HttpStatus.OK);
return new ResponseEntity<{{>returnTypes}}>(objectMapper.readValue("{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{example}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{>exampleReturnTypes}}.class), HttpStatus.OK);
}
{{/examples}}
modules/swagger-codegen/src/main/resources/ruby/api_info.mustache
+1
View File
@@ -9,3 +9,4 @@
{{#version}}OpenAPI spec version: {{version}}{{/version}}
{{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: {{{generatorVersion}}}
samples/client/petstore/ruby/lib/petstore.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/api/pet_api.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/api/store_api.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/api/user_api.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/api_client.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/api_error.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/configuration.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/additional_properties_class.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/animal.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/animal_farm.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/api_response.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/array_of_array_of_number_only.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/array_of_number_only.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/array_test.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/capitalization.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/cat.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/category.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/class_model.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/client.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/dog.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/enum_arrays.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/enum_class.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/enum_test.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/format_test.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/has_only_read_only.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/list.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/map_test.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/mixed_properties_and_additional_properties_class.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/model_200_response.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/model_return.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/name.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/number_only.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/order.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/outer_enum.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/pet.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/read_only_first.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/special_model_name.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/tag.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/models/user.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/lib/petstore/version.rb
+1
View File
@@ -6,6 +6,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end
samples/client/petstore/ruby/petstore.gemspec
+1
View File
@@ -8,6 +8,7 @@
OpenAPI spec version: 1.0.0
Contact: apiteam@swagger.io
Generated by: https://github.com/swagger-api/swagger-codegen.git
Swagger Codegen version: 2.2.3-SNAPSHOT
=end