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

Jump to bottom

Fix/generate optionals for dtos 3176 #3214

Closed
wants to merge 5 commits into from
Closed

Fix/generate optionals for dtos 3176 #3214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35919f9
Fix generation of Optionals for dtos
MelleD Jun 24, 2019
4a0f207
Remove line break for Optional bean validation
MelleD Jun 25, 2019
f12808b
Fix line breaking issues
MelleD Jun 25, 2019
b630963
Fix formatting and rework not optional datatype.
MelleD Jun 26, 2019
6b7d306
Rework optional types
MelleD Jun 26, 2019
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
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/dataTypeGetter.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{^useOptional}}{{>nullableDataType}}{{/useOptional}}{{#useOptional}}{{>optionalDataTypeGetter}}{{/useOptional}}
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/dataTypePojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{^useOptional}}{{>nullableDataType}}{{/useOptional}}{{#useOptional}}{{>optionalPojoDataType}}{{/useOptional}}
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/defaultValuePojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{^useOptional}}{{>nullableDefaultValue}}{{/useOptional}}{{#useOptional}}{{>optionalDefaultValue}}{{/useOptional}}
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,13 @@
<version>2.6.4</version>
</dependency>
{{/threetenbp}}
{{^useOptional}}
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>0.1.0</version>
</dependency>
{{/useOptional}}
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package {{package}};
import java.util.Objects;
{{#imports}}import {{import}};
{{/imports}}
{{^useOptional}}
import org.openapitools.jackson.nullable.JsonNullable;
{{/useOptional}}
{{#serializableModel}}
import java.io.Serializable;
{{/serializableModel}}
Expand All @@ -14,6 +16,9 @@ import javax.validation.constraints.*;
{{#performBeanValidation}}
import org.hibernate.validator.constraints.*;
{{/performBeanValidation}}
{{#useOptional}}
import java.util.Optional;
{{/useOptional}}
{{#jackson}}
{{#withXml}}
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
Expand Down
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/nullableDefaultValue.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{#isNullable}} = JsonNullable.undefined(){{/isNullable}}{{^isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isNullable}}
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/optionalBeanValidation.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/optionalDataTypeGetter.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{#isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}{{^isContainer}}{{#required}}{{{dataType}}}{{/required}}{{^required}}{{#useBeanValidation}}Optional<{{>optionalBeanValidation}}{{{dataType}}}>{{/useBeanValidation}}{{^useBeanValidation}}Optional<{{{dataType}}}>{{/useBeanValidation}}{{/required}}{{/isContainer}}
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/optionalDefaultValue.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{^isContainer}}{{^required}} = Optional.empty(){{/required}}{{/isContainer}}
1 change: 1 addition & 0 deletions modules/openapi-generator/src/main/resources/JavaSpring/optionalPojoDataType.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{#isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}{{^isContainer}}{{>optionalDataType}}{{/isContainer}}
10 changes: 5 additions & 5 deletions modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}}
{{/gson}}
{{#isContainer}}
{{#useBeanValidation}}@Valid{{/useBeanValidation}}
private {{>nullableDataType}} {{name}} = {{#isNullable}}JsonNullable.undefined(){{/isNullable}}{{^isNullable}}{{#required}}{{{defaultValue}}}{{/required}}{{^required}}null{{/required}}{{/isNullable}};
private {{>dataTypePojo}} {{name}} = {{#isNullable}}JsonNullable.undefined(){{/isNullable}}{{^isNullable}}{{#required}}{{{defaultValue}}}{{/required}}{{^required}}null{{/required}}{{/isNullable}};
{{/isContainer}}
{{^isContainer}}
private {{>nullableDataType}} {{name}}{{#isNullable}} = JsonNullable.undefined(){{/isNullable}}{{^isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/isNullable}};
private {{>dataTypePojo}} {{name}}{{>defaultValuePojo}};
{{/isContainer}}

{{/vars}}
{{#vars}}
public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) {
public {{classname}} {{name}}({{>dataTypePojo}} {{name}}) {
this.{{name}} = {{#isNullable}}JsonNullable.of({{name}}){{/isNullable}}{{^isNullable}}{{name}}{{/isNullable}};
return this;
}
Expand Down Expand Up @@ -84,11 +84,11 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}}
{{{vendorExtensions.extraAnnotation}}}
{{/vendorExtensions.extraAnnotation}}
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{>nullableDataType}} {{getter}}() {
{{#useBeanValidation}}{{#useOptional}}{{#required}}{{>beanValidation}}{{/required}}{{/useOptional}}{{/useBeanValidation}}{{#useBeanValidation}}{{^useOptional}}{{>beanValidation}}{{/useOptional}}{{/useBeanValidation}} public {{>dataTypeGetter}} {{getter}}() {
return {{name}};
}

public void {{setter}}({{>nullableDataType}} {{name}}) {
public void {{setter}}({{>dataTypePojo}} {{name}}) {
this.{{name}} = {{name}};
}

Expand Down