Skip to content

Commit a79d6e9

Browse files
committed
fixed enum, default value
1 parent deb539d commit a79d6e9

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

modules/swagger-compat-spec-parser/src/main/java/io/swagger/parser/SwaggerCompatConverter.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,20 +162,35 @@ public Property convertProperty(ModelProperty property) {
162162

163163
public Parameter convertParameter(io.swagger.models.apideclaration.Parameter param) {
164164
Parameter output = null;
165+
List<String> _enum = param.getEnumValues();
166+
165167
if(ParamType.PATH.equals(param.getParamType())) {
166-
output = new PathParameter();
168+
PathParameter p = new PathParameter();
169+
p.setDefaultValue(param.getDefaultValue());
170+
p.setEnum(_enum);
171+
output = p;
167172
}
168173
else if(ParamType.QUERY.equals(param.getParamType())) {
169-
output = new QueryParameter();
174+
QueryParameter p = new QueryParameter();
175+
p.setDefaultValue(param.getDefaultValue());
176+
p.setEnum(_enum);
177+
output = p;
170178
}
171179
else if(ParamType.HEADER.equals(param.getParamType())) {
172-
output = new HeaderParameter();
180+
HeaderParameter p = new HeaderParameter();
181+
p.setDefaultValue(param.getDefaultValue());
182+
p.setEnum(_enum);
183+
output = p;
173184
}
174185
else if(ParamType.BODY.equals(param.getParamType())) {
175-
output = new BodyParameter();
186+
BodyParameter p = new BodyParameter();
187+
output = p;
176188
}
177189
else if(ParamType.FORM.equals(param.getParamType())) {
178-
output = new FormParameter();
190+
FormParameter p = new FormParameter();
191+
p.setDefaultValue(param.getDefaultValue());
192+
p.setEnum(_enum);
193+
output = p;
179194
}
180195

181196
output.setName(param.getName());

modules/swagger-compat-spec-parser/src/test/java/com/wordnik/swagger/converter/LegacyConverterTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.swagger.parser.SwaggerCompatConverter;
44

55
import com.wordnik.swagger.models.*;
6+
import com.wordnik.swagger.models.parameters.*;
67
import com.wordnik.swagger.models.auth.*;
78
import com.wordnik.swagger.util.Json;
89

@@ -75,5 +76,14 @@ public void convertSingleFile() throws Exception {
7576

7677
assertEquals(oauth2Scopes.size(), 1);
7778
assertEquals(oauth2Scopes.get(0), "test:anything");
79+
80+
Operation fetchOperation = swagger.getPaths().get("/pet/findByStatus").getGet();
81+
QueryParameter param = (QueryParameter)fetchOperation.getParameters().get(0);
82+
assertEquals(param.getDefaultValue(), "available");
83+
84+
List<String> _enum = param.getEnum();
85+
assertEquals(_enum.get(0), "available");
86+
assertEquals(_enum.get(1), "pending");
87+
assertEquals(_enum.get(2), "sold");
7888
}
7989
}

0 commit comments

Comments
 (0)