Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JAVA] Implement #10176 (for 3.x) #667

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

[JAVA] Implement #10176 (for 3.x) #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fecf399
Update generators for 3.0.0
solace-mkourlas May 4, 2020
6b257a6
Merge branch 'master' into issue-10176
michaelkourlas May 4, 2020
155e338
Merge branch 'master' into issue-10176
michaelkourlas Jun 22, 2020
a58fdbd
Merge branch 'master' into issue-10176
michaelkourlas Mar 8, 2021
4b85c05
Merge branch 'master' into issue-10176
michaelkourlas May 14, 2021
1de5d2b
Support new patterns for resttemplate type
solace-mkourlas May 28, 2021
407a71f
Merge branch 'master' into issue-10176
solace-mkourlas May 28, 2021
ef0ea50
Merge branch 'issue-10176' of github.com:michaelkourlas/swagger-codeg…
solace-mkourlas May 28, 2021
69e19af
Fix Javadoc issue
solace-mkourlas May 28, 2021
d317e8b
Merge branch 'master' into issue-10176
michaelkourlas May 31, 2021
644cfac
Merge branch 'master' into issue-10176
michaelkourlas Jun 1, 2021
ea93303
Merge branch 'master' into issue-10176
michaelkourlas Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2205,6 +2205,9 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
if (foundSchemas.isEmpty()) {
operationParameters.addBodyParams(bodyParam.copy());
operationParameters.addAllParams(bodyParam);
if (body.getRequired() != null && body.getRequired()) {
operationParameters.addRequiredParam(bodyParam.copy());
}
} else {
boolean alreadyAdded = false;
for (Schema usedSchema : foundSchemas) {
Expand Down
73 changes: 73 additions & 0 deletions src/main/resources/handlebars/Java/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,79 @@ public class {{classname}} {

{{#operation}}
{{#contents}}
{{#hasOptionalParams}}
public static class {{operationIdCamelCase}}Optionals {
{{#allParams}}{{^required}}
public {{{dataType}}} {{paramName}}() {
return this.{{paramName}};
}

public {{operationIdCamelCase}}Optionals {{paramName}}({{{dataType}}} {{paramName}}) {
this.{{paramName}} = {{paramName}};
return this;
}

private {{{dataType}}} {{paramName}} = null;
{{/required}}{{/allParams}}
}
{{/hasOptionalParams}}

{{#hasOptionalParams}}
/**
* {{summary}}
* {{notes}}
{{#requiredParams}}
* @param {{paramName}} {{description}} (required)
{{/requiredParams}}
{{#returnType}}
* @return {{returnType}}
{{/returnType}}
* @throws ApiException if fails to make API call
{{#isDeprecated}}
* @deprecated
{{/isDeprecated}}
{{#externalDocs}}
* {{description}}
* @see <a href="{{url}}">{{summary}} Documentation</a>
{{/externalDocs}}
*/
{{#isDeprecated}}
@Deprecated
{{/isDeprecated}}
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#requiredParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}) throws ApiException {
{{#returnType}}return {{/returnType}}{{operationId}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
}

/**
* {{summary}}
* {{notes}}
{{#requiredParams}}
* @param {{paramName}} {{description}} (required)
{{/requiredParams}}
* @param optionals An object containing the optional parameters for this API call.
{{#returnType}}
* @return {{returnType}}
{{/returnType}}
* @throws ApiException if fails to make API call
{{#isDeprecated}}
* @deprecated
{{/isDeprecated}}
{{#externalDocs}}
* {{description}}
* @see <a href="{{url}}">{{summary}} Documentation</a>
{{/externalDocs}}
*/
{{#isDeprecated}}
@Deprecated
{{/isDeprecated}}
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}Opts({{#requiredParams}}{{{dataType}}} {{paramName}}, {{/requiredParams}}{{operationIdCamelCase}}Optionals optionals) throws ApiException {
if (optionals == null) {
optionals = new {{operationIdCamelCase}}Optionals();
}
{{#returnType}}return {{/returnType}}{{operationId}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}optionals.{{paramName}}(){{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
}
{{/hasOptionalParams}}

/**
* {{summary}}
* {{notes}}
Expand Down
73 changes: 73 additions & 0 deletions src/main/resources/handlebars/Java/libraries/jersey2/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,79 @@ public class {{classname}} {

{{#operation}}
{{#contents}}
{{#hasOptionalParams}}
public static class {{operationIdCamelCase}}Optionals {
{{#allParams}}{{^required}}
public {{{dataType}}} {{paramName}}() {
return this.{{paramName}};
}

public {{operationIdCamelCase}}Optionals {{paramName}}({{{dataType}}} {{paramName}}) {
this.{{paramName}} = {{paramName}};
return this;
}

private {{{dataType}}} {{paramName}} = null;
{{/required}}{{/allParams}}
}
{{/hasOptionalParams}}

{{#hasOptionalParams}}
/**
* {{summary}}
* {{notes}}
{{#requiredParams}}
* @param {{paramName}} {{description}} (required)
{{/requiredParams}}
{{#returnType}}
* @return {{returnType}}
{{/returnType}}
* @throws ApiException if fails to make API call
{{#isDeprecated}}
* @deprecated
{{/isDeprecated}}
{{#externalDocs}}
* {{description}}
* @see <a href="{{url}}">{{summary}} Documentation</a>
{{/externalDocs}}
*/
{{#isDeprecated}}
@Deprecated
{{/isDeprecated}}
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#requiredParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}) throws ApiException {
{{#returnType}}return {{/returnType}}{{operationId}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
}

/**
* {{summary}}
* {{notes}}
{{#requiredParams}}
* @param {{paramName}} {{description}} (required)
{{/requiredParams}}
* @param optionals An object containing the optional parameters for this API call.
{{#returnType}}
* @return {{returnType}}
{{/returnType}}
* @throws ApiException if fails to make API call
{{#isDeprecated}}
* @deprecated
{{/isDeprecated}}
{{#externalDocs}}
* {{description}}
* @see <a href="{{url}}">{{summary}} Documentation</a>
{{/externalDocs}}
*/
{{#isDeprecated}}
@Deprecated
{{/isDeprecated}}
public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}Opts({{#requiredParams}}{{{dataType}}} {{paramName}}, {{/requiredParams}}{{operationIdCamelCase}}Optionals optionals) throws ApiException {
if (optionals == null) {
optionals = new {{operationIdCamelCase}}Optionals();
}
{{#returnType}}return {{/returnType}}{{operationId}}({{#allParams}}{{#required}}{{paramName}}{{/required}}{{^required}}optionals.{{paramName}}(){{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
}
{{/hasOptionalParams}}

/**
* {{summary}}
* {{notes}}
Expand Down
Loading