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

minor changes

Browse Source 
removed gson version in pom and added a space between the parameters
This commit is contained in:
cbornet 2015-08-29 18:41:16 +02:00
parent 265de9654b
commit a207251b29
6 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/swagger-codegen/src/main/resources/retrofit/api.mustache
View File

@ -24,7 +24,7 @@ public interface {{classname}} {
{{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}}
@{{httpMethod}}("{{path}}") @{{httpMethod}}("{{path}}")
{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}} {{nickname}}({{^allParams}});{{/allParams}} {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}} {{nickname}}({{^allParams}});{{/allParams}}
{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{^hasMore}} {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}
);{{/hasMore}}{{/allParams}} );{{/hasMore}}{{/allParams}}
/** /**
@ -38,7 +38,7 @@ public interface {{classname}} {
{{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}} {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}}
@{{httpMethod}}("{{path}}") @{{httpMethod}}("{{path}}")
void {{nickname}}( void {{nickname}}(
{{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}} Callback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> cb {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}, {{/allParams}}Callback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> cb
); );
{{/operation}} {{/operation}}
} }

2
modules/swagger-codegen/src/main/resources/retrofit/pom.mustache
View File

@ -121,7 +121,6 @@
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp</groupId>
@ -139,7 +138,6 @@
</dependencies> </dependencies>
<properties> <properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version> <swagger-annotations-version>1.5.0</swagger-annotations-version>
<gson-version>2.3.1</gson-version>
<retrofit-version>1.9.0</retrofit-version> <retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.4.0</okhttp-version> <okhttp-version>2.4.0</okhttp-version>
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.0</oltu-version>

2
samples/client/petstore/retrofit/pom.xml
View File

@ -121,7 +121,6 @@
<groupId>org.apache.oltu.oauth2</groupId> <groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>${oltu-version}</version> <version>${oltu-version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp</groupId>
@ -139,7 +138,6 @@
</dependencies> </dependencies>
<properties> <properties>
<swagger-annotations-version>1.5.0</swagger-annotations-version> <swagger-annotations-version>1.5.0</swagger-annotations-version>
<gson-version>2.3.1</gson-version>
<retrofit-version>1.9.0</retrofit-version> <retrofit-version>1.9.0</retrofit-version>
<okhttp-version>2.4.0</okhttp-version> <okhttp-version>2.4.0</okhttp-version>
<oltu-version>1.0.0</oltu-version> <oltu-version>1.0.0</oltu-version>

12
samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -156,7 +156,7 @@ public interface PetApi {
@FormUrlEncoded @FormUrlEncoded
@POST("/pet/{petId}") @POST("/pet/{petId}")
Void updatePetWithForm( Void updatePetWithForm(
@Path("petId") Long petId,@Field("name") String name,@Field("status") String status @Path("petId") Long petId, @Field("name") String name, @Field("status") String status
); );
/** /**
@ -172,7 +172,7 @@ public interface PetApi {
@FormUrlEncoded @FormUrlEncoded
@POST("/pet/{petId}") @POST("/pet/{petId}")
void updatePetWithForm( void updatePetWithForm(
@Path("petId") Long petId,@Field("name") String name,@Field("status") String status, Callback<Void> cb @Path("petId") Long petId, @Field("name") String name, @Field("status") String status, Callback<Void> cb
); );
/** /**
@ -186,7 +186,7 @@ public interface PetApi {
@DELETE("/pet/{petId}") @DELETE("/pet/{petId}")
Void deletePet( Void deletePet(
@Path("petId") Long petId,@Header("api_key") String apiKey @Path("petId") Long petId, @Header("api_key") String apiKey
); );
/** /**
@ -200,7 +200,7 @@ public interface PetApi {
@DELETE("/pet/{petId}") @DELETE("/pet/{petId}")
void deletePet( void deletePet(
@Path("petId") Long petId,@Header("api_key") String apiKey, Callback<Void> cb @Path("petId") Long petId, @Header("api_key") String apiKey, Callback<Void> cb
); );
/** /**
@ -216,7 +216,7 @@ public interface PetApi {
@Multipart @Multipart
@POST("/pet/{petId}/uploadImage") @POST("/pet/{petId}/uploadImage")
ApiResponse uploadFile( ApiResponse uploadFile(
@Path("petId") Long petId,@Part("additionalMetadata") String additionalMetadata,@Part("file") TypedFile file @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file
); );
/** /**
@ -232,7 +232,7 @@ public interface PetApi {
@Multipart @Multipart
@POST("/pet/{petId}/uploadImage") @POST("/pet/{petId}/uploadImage")
void uploadFile( void uploadFile(
@Path("petId") Long petId,@Part("additionalMetadata") String additionalMetadata,@Part("file") TypedFile file, Callback<ApiResponse> cb @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file, Callback<ApiResponse> cb
); );
} }

2
samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -32,7 +32,7 @@ public interface StoreApi {
@GET("/store/inventory") @GET("/store/inventory")
void getInventory( void getInventory(
Callback<Map<String, Integer>> cb Callback<Map<String, Integer>> cb
); );
/** /**

10
samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -101,7 +101,7 @@ public interface UserApi {
@GET("/user/login") @GET("/user/login")
String loginUser( String loginUser(
@Query("username") String username,@Query("password") String password @Query("username") String username, @Query("password") String password
); );
/** /**
@ -115,7 +115,7 @@ public interface UserApi {
@GET("/user/login") @GET("/user/login")
void loginUser( void loginUser(
@Query("username") String username,@Query("password") String password, Callback<String> cb @Query("username") String username, @Query("password") String password, Callback<String> cb
); );
/** /**
@ -138,7 +138,7 @@ public interface UserApi {
@GET("/user/logout") @GET("/user/logout")
void logoutUser( void logoutUser(
Callback<Void> cb Callback<Void> cb
); );
/** /**
@ -178,7 +178,7 @@ public interface UserApi {
@PUT("/user/{username}") @PUT("/user/{username}")
Void updateUser( Void updateUser(
@Path("username") String username,@Body User body @Path("username") String username, @Body User body
); );
/** /**
@ -192,7 +192,7 @@ public interface UserApi {
@PUT("/user/{username}") @PUT("/user/{username}")
void updateUser( void updateUser(
@Path("username") String username,@Body User body, Callback<Void> cb @Path("username") String username, @Body User body, Callback<Void> cb
); );
/** /**