Skip to content

Another Null Pointer #150

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
Dec 16, 2015
Merged

Another Null Pointer #150

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
2fb2b62
Fixed issue in which a null pointer exception was generated if a
rstanton Dec 15, 2015
7b1ac6d
Fixed issue in which a null pointer exception was generated if an
rstanton Dec 15, 2015
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
6 changes: 4 additions & 2 deletions modules/swagger-parser/src/main/java/io/swagger/parser/processors/ExternalRefProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import static io.swagger.parser.util.RefUtils.computeDefinitionName;
import static io.swagger.parser.util.RefUtils.deconflictName;

import static io.swagger.parser.util.RefUtils.isAnExternalRefFormat;

public final class ExternalRefProcessor {

Expand Down Expand Up @@ -64,7 +64,9 @@ public String processRefToExternalDefinition(String $ref, RefFormat refFormat) {
for (Map.Entry<String, Property> prop : subProps.entrySet()) {
if (prop.getValue() instanceof RefProperty) {
RefProperty subRef = (RefProperty) prop.getValue();
subRef.set$ref(processRefToExternalDefinition(subRef.get$ref(), subRef.getRefFormat()));

if(isAnExternalRefFormat(subRef.getRefFormat()))
subRef.set$ref(processRefToExternalDefinition(subRef.get$ref(), subRef.getRefFormat()));
}
}
}
Expand Down
11 changes: 10 additions & 1 deletion ...s/swagger-parser/src/test/java/io/swagger/parser/processors/ExternalRefProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ public void testNestedExternalRefs(@Injectable final Model mockedModel){
final String addressURL = "http://my.company.com/path/to/address.json#/definitions/Address";
address.set$ref(addressURL);
custProps.put("Address", address);

//Create a 'local' reference to something in #/definitions, this should be ignored a no longer result in a null pointer exception
final String loyaltyURL = "#/definitions/LoyaltyScheme";

RefProperty loyaltyProp = new RefProperty();
loyaltyProp.set$ref(loyaltyURL);
loyaltyProp.setName("LoyaltyCardNumber");
loyaltyProp.setRequired(true);

custProps.put("Loyalty", loyaltyProp);
customerModel.setProperties(custProps);

//create address model, add Contact Ref Property to it
Expand Down Expand Up @@ -174,6 +184,5 @@ public void testNestedExternalRefs(@Injectable final Model mockedModel){
assertTrue(testedSwagger.getDefinitions().get("Customer")!=null);
assertTrue(testedSwagger.getDefinitions().get("Contact")!=null);
assertTrue(testedSwagger.getDefinitions().get("Address")!=null);
assertTrue(testedSwagger.getDefinitions().size()==3);
}
}