Skip to content

refs #2783 - avoid NumberFormatException warning with empty String in param example #2874

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

Merged
merged 2 commits into from
Jul 16, 2018
Merged

refs #2783 - avoid NumberFormatException warning with empty String in param example #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da41148
checking empty string in examples for #2783
lucasoares Jun 29, 2018
3e7ba14
refs #2783 - avoid NumberFormatException warning with empty String in…
frantuma Jul 16, 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
4 changes: 2 additions & 2 deletions ...gger-models/src/main/java/io/swagger/models/parameters/AbstractSerializableParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,8 @@ public void setAllowEmptyValue(Boolean allowEmptyValue) {

@JsonProperty("x-example")
public Object getExample() {
if (example == null) {
return null;
if (example == null || example.isEmpty()) {
return example;
}
try {
if (BaseIntegerProperty.TYPE.equals(type)) {
Expand Down
21 changes: 21 additions & 0 deletions ...-models/src/test/java/io/swagger/models/parameters/AbstractSerializableParameterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.swagger.models.properties.BaseIntegerProperty;
import io.swagger.models.properties.BooleanProperty;
import io.swagger.models.properties.DecimalProperty;
import io.swagger.models.properties.LongProperty;
import io.swagger.models.properties.Property;
import io.swagger.models.properties.StringProperty;
import org.testng.annotations.BeforeMethod;
Expand Down Expand Up @@ -335,6 +336,26 @@ public void testGetExampleWithDecimalProperty() {
"The example value must not change when when set an array property");
}

@Test
public void testGetExampleWithEmptyString() {
// given
instance.setProperty(new LongProperty());
example = null;

// when
instance.setExample(example);

// then
assertEquals(instance.getExample(), null, "The example must be null if the value is null");

// given
instance.setProperty(new LongProperty());
example = "";

// then
assertEquals(instance.getExample(), null, "The example must be empty string if the value is an empty string");
}

@Test
public void testGetExampleWithBooleanProperty() {
// given
Expand Down