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

Merge branch 'develop_2.0' into library-template-jersey2

Browse Source 
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/api.mustache
This commit is contained in:
xhh
2015-08-20 17:36:42 +08:00
parent cb181e3480 a610fb5ac3
commit af2ec4cf85
105 changed files with 3355 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/client/petstore/java/default/src/main/java/io/swagger/client/api/PetApi.java
View File

@@ -243,7 +243,7 @@ public class PetApi {
};
final String contentType = apiClient.selectHeaderContentType(contentTypes);
String[] authNames = new String[] { "api_key", "petstore_auth" };
String[] authNames = new String[] { "petstore_auth", "api_key" };
TypeRef returnType = new TypeRef<Pet>() {};
return apiClient.invokeAPI(path, "GET", queryParams, postBody, headerParams, formParams, accept, contentType, authNames, returnType);

2
samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Pet.java
View File

@@ -1,8 +1,8 @@
package io.swagger.client.model;
import io.swagger.client.model.Category;
import io.swagger.client.model.Tag;
import java.util.*;
import io.swagger.client.model.Tag;
import io.swagger.annotations.*;
import com.fasterxml.jackson.annotation.JsonProperty;