Skip to content

Fix getter methods for Java model with additionalProperties #301

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

Closed
stianlik wants to merge 3 commits into from
Closed

Fix getter methods for Java model with additionalProperties #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd016f3
Fix getter methods for Java model with additionalProperties
stianlik Jun 13, 2018
dc854f0
Update Petstore sample
stianlik Jun 13, 2018
207b663
Update samples using `bin/ensure-up-to-date`
stianlik Jun 13, 2018
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
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,12 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
{{{vendorExtensions.extraAnnotation}}}
{{/vendorExtensions.extraAnnotation}}
public {{{datatypeWithEnum}}} {{getter}}() {
{{#parent}}
return {{name}} == null ? ({{{datatypeWithEnum}}}) this.get("{{name}}") : {{name}};
{{/parent}}
{{^parent}}
return {{name}};
{{/parent}}
}
{{^isReadOnly}}

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...ient/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...ient/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...s/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...ore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...les/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...les/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...lient/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...lient/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...lient/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...lient/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...les/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...les/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Cat declawed(Boolean declawed) {
**/
@ApiModelProperty(value = "")
public Boolean isDeclawed() {
return declawed;
return declawed == null ? (Boolean) this.get("declawed") : declawed;
}

public void setDeclawed(Boolean declawed) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Dog breed(String breed) {
**/
@ApiModelProperty(value = "")
public String getBreed() {
return breed;
return breed == null ? (String) this.get("breed") : breed;
}

public void setBreed(String breed) {
Expand Down