Open
requested to merge github/fork/b-com/feat/JavaJaxrsResteasy_Make_it_possible_to_disable_generation_of_swagger_annotations into master
docs/generators
jaxrs-resteasy.md +1 -0
modules
openapi-generator-gradle-plugin/…/…
gradle.properties +1 -1
openapi-generator-maven-plugin/examples
kotlin.xml +1 -1
spring.xml +1 -1
openapi-generator/src/main
java/org/openapitools/codegen/languages
JavaResteasyServerCodegen.java +31 -16
resources/JavaJaxRS/resteasy
api.mustache +6 -6
bodyParams.mustache +1 -1
formParams.mustache +1 -1
headerParams.mustache +1 -1
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -52,6 +52,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -17,20 +17,28 @@
@@ -56,6 +64,7 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
@@ -73,11 +82,16 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
@@ -129,12 +143,12 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
@@ -151,15 +165,15 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
@@ -168,7 +182,8 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -3,8 +3,8 @@ package {{package}};
@@ -29,8 +29,8 @@ import javax.validation.Valid;
@@ -41,7 +41,7 @@ public class {{classname}} {
@@ -51,7 +51,7 @@ public class {{classname}} {
public Response {{nickname}}({{#isMultipart}}MultipartFormDataInput input,{{/isMultipart}}{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{^isMultipart}}{{>formParams}},{{/isMultipart}}{{#isMultipart}}{{^isFormParam}},{{/isFormParam}}{{/isMultipart}}{{/allParams}}@Context SecurityContext securityContext)
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#useBeanValidation}}{{#required}} @NotNull{{/required}} @Valid{{/useBeanValidation}} {{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
{{#isBodyParam}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/swaggerAnnotations}}{{#useBeanValidation}}{{#required}} @NotNull{{/required}} @Valid{{/useBeanValidation}} {{{dataType}}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
{{#isFormParam}}{{^isFile}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/swaggerAnnotations}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file