loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fixed build file and also removed duplicate config property

Browse Source
This commit is contained in:
rpidikiti
2011-08-03 07:37:24 -07:00
parent 8c4efd8b7c
commit 976493b69b
3 changed files with 85 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/wordnik/swagger/codegen/api/SwaggerResourceDocReader.java
View File

@@ -71,8 +71,8 @@ public class SwaggerResourceDocReader {
for (String resource : resources) {
resource = trimResourceName(resource);
if (!resource.equals(trimResourceName( apiListResource ))) {
if(!resource.endsWith(".json")){
resource = resource.concat(".json");
if(resource.endsWith(".{format}")){
resource = resource.replace(".{format}", ".json");
}
resourceURLs.add(baseUrl + resource);
}
@@ -83,13 +83,11 @@ public class SwaggerResourceDocReader {
WebResource aResource = apiClient.resource(resourceURL);
aResource.header("api_key", apiKey);
ClientResponse clientResponse = aResource.header("api_key", apiKey).get(ClientResponse.class);
String version = clientResponse.getHeaders().get(HEADER_NAME_API_VERSION).get(0);//TODO - check if this is required
String response = clientResponse.getEntity(String.class);
try {
ObjectMapper mapper = new ObjectMapper();
mapper.getDeserializationConfig().set(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
Resource aResourceDoc = deserializeResource(response, mapper);
aResourceDoc.setApiVersion(version);
resourceDocs.add(aResourceDoc);
} catch (IOException ioe) {
ioe.printStackTrace();
@@ -111,15 +109,15 @@ public class SwaggerResourceDocReader {
String resourceCsv = "";
Resource resourceApi;
String apiResourceUrl = null;
if(apiListResource == null){
throw new CodeGenerationException("apiListingUrl needs to be defined in api configuration object");
}
apiListResource = baseUrl + "resources.json";
if(!apiListResource.endsWith(".json")){
apiResourceUrl = trimResourceName( apiListResource.concat(".json") );
}else{
apiResourceUrl = trimResourceName( apiListResource);
}
apiResourceUrl = baseUrl.concat(apiResourceUrl);
WebResource aResource = apiClient.resource(apiResourceUrl);
aResource.header("api_key", apiKey);
ClientResponse clientResponse = aResource.header("api_key", apiKey).get(ClientResponse.class);