Skip to content

Commit fca984c

Browse files
cheparinVwing328
cheparinV
authored and
wing328
committed
[Java][Retrofit2] The part name is not added to the annotation (OpenAPITools#1029)
* fixed retrofit2/formParams.mustache * added play26 to retrofit2-all.sh * fixed samples
1 parent 46fb1b6 commit fca984c

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

‎bin/java-petstore-retrofit2-all.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
./bin/java-petstore-retrofit2-play24.sh
44
./bin/java-petstore-retrofit2-play25.sh
5+
./bin/java-petstore-retrofit2-play26.sh
56
./bin/java-petstore-retrofit2.sh
67
./bin/java-petstore-retrofit2rx.sh
78
./bin/java-petstore-retrofit2rx2.sh

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isFormParam}}{{^isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") MultipartBody.Part {{paramName}}{{/isFile}}{{/isFormParam}}
1+
{{#isFormParam}}{{^isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field{{/isMultipart}}("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{#isMultipart}}@retrofit2.http.Part{{/isMultipart}}{{^isMultipart}}@retrofit2.http.Field("{{baseName}}"){{/isMultipart}} MultipartBody.Part {{paramName}}{{/isFile}}{{/isFormParam}}

‎samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ F.Promise<Response<Void>> updatePetWithForm(
122122
@retrofit2.http.Multipart
123123
@POST("pet/{petId}/uploadImage")
124124
F.Promise<Response<ModelApiResponse>> uploadFile(
125-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
125+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
126126
);
127127

128128
/**
@@ -136,7 +136,7 @@ F.Promise<Response<ModelApiResponse>> uploadFile(
136136
@retrofit2.http.Multipart
137137
@POST("fake/{petId}/uploadImageWithRequiredFile")
138138
F.Promise<Response<ModelApiResponse>> uploadFileWithRequiredFile(
139-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
139+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
140140
);
141141

142142
}

‎samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ CompletionStage<Response<Void>> updatePetWithForm(
122122
@retrofit2.http.Multipart
123123
@POST("pet/{petId}/uploadImage")
124124
CompletionStage<Response<ModelApiResponse>> uploadFile(
125-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
125+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
126126
);
127127

128128
/**
@@ -136,7 +136,7 @@ CompletionStage<Response<ModelApiResponse>> uploadFile(
136136
@retrofit2.http.Multipart
137137
@POST("fake/{petId}/uploadImageWithRequiredFile")
138138
CompletionStage<Response<ModelApiResponse>> uploadFileWithRequiredFile(
139-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
139+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
140140
);
141141

142142
}

‎samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ CompletionStage<Response<Void>> updatePetWithForm(
122122
@retrofit2.http.Multipart
123123
@POST("pet/{petId}/uploadImage")
124124
CompletionStage<Response<ModelApiResponse>> uploadFile(
125-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
125+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
126126
);
127127

128128
/**
@@ -136,7 +136,7 @@ CompletionStage<Response<ModelApiResponse>> uploadFile(
136136
@retrofit2.http.Multipart
137137
@POST("fake/{petId}/uploadImageWithRequiredFile")
138138
CompletionStage<Response<ModelApiResponse>> uploadFileWithRequiredFile(
139-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
139+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
140140
);
141141

142142
}

‎samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Call<Void> updatePetWithForm(
119119
@retrofit2.http.Multipart
120120
@POST("pet/{petId}/uploadImage")
121121
Call<ModelApiResponse> uploadFile(
122-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
122+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
123123
);
124124

125125
/**
@@ -133,7 +133,7 @@ Call<ModelApiResponse> uploadFile(
133133
@retrofit2.http.Multipart
134134
@POST("fake/{petId}/uploadImageWithRequiredFile")
135135
Call<ModelApiResponse> uploadFileWithRequiredFile(
136-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
136+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
137137
);
138138

139139
}

‎samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Observable<Void> updatePetWithForm(
119119
@retrofit2.http.Multipart
120120
@POST("pet/{petId}/uploadImage")
121121
Observable<ModelApiResponse> uploadFile(
122-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
122+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
123123
);
124124

125125
/**
@@ -133,7 +133,7 @@ Observable<ModelApiResponse> uploadFile(
133133
@retrofit2.http.Multipart
134134
@POST("fake/{petId}/uploadImageWithRequiredFile")
135135
Observable<ModelApiResponse> uploadFileWithRequiredFile(
136-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
136+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
137137
);
138138

139139
}

‎samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/PetApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Completable updatePetWithForm(
120120
@retrofit2.http.Multipart
121121
@POST("pet/{petId}/uploadImage")
122122
Observable<ModelApiResponse> uploadFile(
123-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
123+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
124124
);
125125

126126
/**
@@ -134,7 +134,7 @@ Observable<ModelApiResponse> uploadFile(
134134
@retrofit2.http.Multipart
135135
@POST("fake/{petId}/uploadImageWithRequiredFile")
136136
Observable<ModelApiResponse> uploadFileWithRequiredFile(
137-
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
137+
@retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
138138
);
139139

140140
}

0 commit comments

Comments
 (0)