Skip to content

Commit 7592b52

Browse files
author
Ron
authored
Merge pull request #552 from swagger-api/fix/issue-546
Fixing empty Definitions
2 parents fed7094 + f32cfdb commit 7592b52

File tree

2 files changed

+49
-2
lines changed

2 files changed

+49
-2
lines changed

modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,6 @@ else if(!SCHEMA_KEYS.contains(key)) {
831831
result.extra(location, key, node.get(key));
832832
}
833833
}
834-
if("{ }".equals(Json.pretty(impl)))
835-
return null;
836834
model = impl;
837835
}
838836
JsonNode exampleNode = node.get("example");

modules/swagger-parser/src/test/java/io/swagger/parser/util/SwaggerDeserializerTest.java

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,55 @@
2424
import static org.junit.Assert.*;
2525

2626
public class SwaggerDeserializerTest {
27+
28+
29+
@Test
30+
public void testEmptyDefinitions() throws Exception {
31+
String yaml = "swagger: \"2.0\"\n" +
32+
"info:\n" +
33+
" version: \"1.0\"\n" +
34+
" title: \"dd\"\n" +
35+
"host: \"abc:5555\"\n" +
36+
"basePath: \"/mypath\"\n" +
37+
"schemes:\n" +
38+
"- \"http\"\n" +
39+
"consumes:\n" +
40+
"- \"application/json\"\n" +
41+
"produces:\n" +
42+
"- \"application/json\"\n" +
43+
"paths:\n" +
44+
" /resource1/Id:\n" +
45+
" post:\n" +
46+
" description: \"\"\n" +
47+
" operationId: \"postOp\"\n" +
48+
" parameters:\n" +
49+
" - in: \"body\"\n" +
50+
" name: \"input3\"\n" +
51+
" description: \"\"\n" +
52+
" required: true\n" +
53+
" schema:\n" +
54+
" $ref: \"#/definitions/mydefinition\"\n" +
55+
" responses:\n" +
56+
" 200:\n" +
57+
" description: \"Successful\"\n" +
58+
" 401:\n" +
59+
" description: \"Access Denied\"\n" +
60+
"definitions:\n" +
61+
" mydefinition: {}";
62+
63+
SwaggerParser parser = new SwaggerParser();
64+
65+
SwaggerDeserializationResult result = parser.readWithInfo(yaml);
66+
List<String> messageList = result.getMessages();
67+
Set<String> messages = new HashSet<String>(messageList);
68+
Swagger swagger = result.getSwagger();
69+
assertNotNull(swagger);
70+
assertNotNull(swagger.getDefinitions().get("mydefinition"));
71+
72+
73+
}
74+
75+
2776
@Test
2877
public void testSecurityDeserialization() throws Exception {
2978
String json = "{\n" +

0 commit comments

Comments
 (0)