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

#514 fixing composed schema parsing #515

Merged
merged 3 commits into from
Sep 11, 2017
Merged

#514 fixing composed schema parsing #515

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
a15c4c5
#514 - fixing composedSchema parsing
phiz71 Sep 8, 2017
91d8ae1
Merge remote-tracking branch 'refs/remotes/swagger-api/2.0' into #514…
phiz71 Sep 8, 2017
c64ac0d
Merge remote-tracking branch 'refs/remotes/swagger-api/2.0' into #514…
phiz71 Sep 11, 2017
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: 2 additions & 3 deletions modules/swagger-parser-v3/src/main/java/io/swagger/parser/v3/util/OpenAPIDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1797,9 +1797,8 @@ public Schema getSchema(ObjectNode node, String location, ParseResult result){
ComposedSchema anyOfList = new ComposedSchema();
for(JsonNode n : anyOfArray) {
if(n.isObject()) {
schema = getSchema((ObjectNode) n,location,result);
schema = getSchema((ObjectNode) n, location, result);
anyOfList.addAnyOfItem(schema);

}
}
schema = anyOfList;
Expand All @@ -1816,7 +1815,7 @@ public Schema getSchema(ObjectNode node, String location, ParseResult result){
ArraySchema items = new ArraySchema();
for(JsonNode n : itemsNode) {
if(n.isValueNode()) {
items.setItems(getSchema(itemsNode, location,result));
items.setItems(getSchema(itemsNode, location, result));
}
}
schema = items;
Expand Down
152 changes: 151 additions & 1 deletion ...es/swagger-parser-v3/src/test/java/io/swagger/parser/v3/util/OpenAPIDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,157 @@

public class OpenAPIDeserializerTest {

@Test
public void testAllOfSchema(@Injectable List<AuthorizationValue> auths){
String yaml = "openapi: '3.0'\n" +
"components:\n" +
" schemas:\n" +
" Pet:\n" +
" type: object\n" +
" required:\n" +
" - pet_type\n" +
" properties:\n" +
" pet_type:\n" +
" type: string\n" +
" Cat:\n" +
" allOf:\n" +
" - $ref: '#/components/schemas/Pet'\n" +
" - type: object\n" +
" # all other properties specific to a `Cat`\n" +
" properties:\n" +
" name:\n" +
" type: string\n";

OpenAPIV3Parser parser = new OpenAPIV3Parser();

ParseOptions options = new ParseOptions();
options.setResolve(true);

SwaggerParseResult result = parser.readContents(yaml,auths,options);
List<String> messageList = result.getMessages();
Set<String> messages = new HashSet<>(messageList);

Schema catSchema = result.getOpenAPI().getComponents().getSchemas().get("Cat");
assertTrue(catSchema != null);
assertTrue(catSchema instanceof ComposedSchema);

ComposedSchema catCompSchema = (ComposedSchema) catSchema;
List<Schema> allOfSchemas = catCompSchema.getAllOf();
assertTrue(allOfSchemas != null);
assertEquals(allOfSchemas.size(), 2);

Schema refPetSchema = allOfSchemas.get(0);
assertTrue(refPetSchema != null);
assertEquals(refPetSchema.get$ref(), "#/components/schemas/Pet");

Schema otherSchema = allOfSchemas.get(1);
assertTrue(otherSchema != null);
assertTrue(otherSchema.getProperties() != null);
Schema nameProp = (Schema) otherSchema.getProperties().get("name");
assertTrue(nameProp != null);
assertEquals(nameProp.getType(), "string");

}

@Test
public void testOneOfSchema(@Injectable List<AuthorizationValue> auths){
String yaml = "openapi: '3.0'\n" +
"components:\n" +
" schemas:\n" +
" Cat:\n" +
" type: object\n" +
" # all properties specific to a `Cat`\n" +
" properties:\n" +
" purring:\n" +
" type: string\n" +
" Dog:\n" +
" type: object\n" +
" # all properties specific to a `Dog`\n" +
" properties:\n" +
" bark:\n" +
" type: string\n" +
" Pet:\n" +
" oneOf: \n" +
" - $ref: '#/components/schemas/Cat'\n" +
" - $ref: '#/components/schemas/Dog'\n" +
" - type: object\n" +
" # neither a `Cat` nor a `Dog`\n" +
" properties:\n" +
" name:\n" +
" type: string\n" ;

OpenAPIV3Parser parser = new OpenAPIV3Parser();

ParseOptions options = new ParseOptions();
options.setResolve(true);

SwaggerParseResult result = parser.readContents(yaml,auths,options);
List<String> messageList = result.getMessages();
Set<String> messages = new HashSet<>(messageList);

Schema petSchema = result.getOpenAPI().getComponents().getSchemas().get("Pet");
assertTrue(petSchema != null);
assertTrue(petSchema instanceof ComposedSchema);

ComposedSchema petCompSchema = (ComposedSchema) petSchema;
List<Schema> oneOfSchemas = petCompSchema.getOneOf();
assertTrue(oneOfSchemas != null);
assertEquals(oneOfSchemas.size(), 3);

Schema refCatSchema = oneOfSchemas.get(0);
assertTrue(refCatSchema != null);
assertEquals(refCatSchema.get$ref(), "#/components/schemas/Cat");

Schema refDogSchema = oneOfSchemas.get(1);
assertTrue(refDogSchema != null);
assertEquals(refDogSchema.get$ref(), "#/components/schemas/Dog");

Schema otherSchema = oneOfSchemas.get(2);
assertTrue(otherSchema != null);
Schema nameProp = (Schema) otherSchema.getProperties().get("name");
assertTrue(nameProp != null);
assertEquals(nameProp.getType(), "string");

}

@Test
public void testAnyOfSchema(@Injectable List<AuthorizationValue> auths){
String yaml = "openapi: '3.0'\n" +
"components:\n" +
" schemas:\n" +
" id:\n" +
" anyOf: \n" +
" - type: string\n" +
" - type: number\n" ;

OpenAPIV3Parser parser = new OpenAPIV3Parser();

ParseOptions options = new ParseOptions();
options.setResolve(true);

SwaggerParseResult result = parser.readContents(yaml,auths,options);
List<String> messageList = result.getMessages();
Set<String> messages = new HashSet<>(messageList);

Schema idSchema = result.getOpenAPI().getComponents().getSchemas().get("id");
assertTrue(idSchema != null);
assertTrue(idSchema instanceof ComposedSchema);

ComposedSchema idCompSchema = (ComposedSchema) idSchema;
List<Schema> anyOfSchemas = idCompSchema.getAnyOf();
assertTrue(anyOfSchemas != null);
assertEquals(anyOfSchemas.size(), 2);

Schema stringSchema = anyOfSchemas.get(0);
assertTrue(stringSchema != null);
assertEquals(stringSchema.getType(), "string");

Schema numberSchema = anyOfSchemas.get(1);
assertTrue(numberSchema != null);
assertEquals(numberSchema.getType(), "number");

}

@Test
public void propertyTest(@Injectable List<AuthorizationValue> auths){
String yaml = "openapi: 3.0.0\n"+
Expand Down Expand Up @@ -230,7 +381,6 @@ public void testExamples(@Injectable List<AuthorizationValue> auths){
}



@Test
public void testSchemaExample(@Injectable List<AuthorizationValue> auths){
String yaml = "openapi: '3.0.0'\n" +
Expand Down