[Java][Retrofit2] The part name is not added to the annotation (#1029)

* fixed retrofit2/formParams.mustache

* added play26 to retrofit2-all.sh

* fixed samples

bin/java-petstore-retrofit2-all.sh

@@ -2,6 +2,7 @@
 
 ./bin/java-petstore-retrofit2-play24.sh
 ./bin/java-petstore-retrofit2-play25.sh
+./bin/java-petstore-retrofit2-play26.sh
 ./bin/java-petstore-retrofit2.sh
 ./bin/java-petstore-retrofit2rx.sh
 ./bin/java-petstore-retrofit2rx2.sh

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

@@ -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}}
+{{#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

@@ -122,7 +122,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   F.Promise<Response<ModelApiResponse>> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
   );
 
   /**
@@ -136,7 +136,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("fake/{petId}/uploadImageWithRequiredFile")
   F.Promise<Response<ModelApiResponse>> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
   );
 
 }

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

@@ -122,7 +122,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   CompletionStage<Response<ModelApiResponse>> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
   );
 
   /**
@@ -136,7 +136,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("fake/{petId}/uploadImageWithRequiredFile")
   CompletionStage<Response<ModelApiResponse>> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
   );
 
 }

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

@@ -122,7 +122,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   CompletionStage<Response<ModelApiResponse>> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
   );
 
   /**
@@ -136,7 +136,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("fake/{petId}/uploadImageWithRequiredFile")
   CompletionStage<Response<ModelApiResponse>> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
   );
 
 }

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

@@ -119,7 +119,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Call<ModelApiResponse> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
   );
 
   /**
@@ -133,7 +133,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("fake/{petId}/uploadImageWithRequiredFile")
   Call<ModelApiResponse> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
   );
 
 }

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

@@ -119,7 +119,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Observable<ModelApiResponse> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
   );
 
   /**
@@ -133,7 +133,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("fake/{petId}/uploadImageWithRequiredFile")
   Observable<ModelApiResponse> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
   );
 
 }

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

@@ -120,7 +120,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("pet/{petId}/uploadImage")
   Observable<ModelApiResponse> uploadFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part("file") MultipartBody.Part file
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("additionalMetadata") String additionalMetadata, @retrofit2.http.Part MultipartBody.Part file
   );
 
   /**
@@ -134,7 +134,7 @@ public interface PetApi {
   @retrofit2.http.Multipart
   @POST("fake/{petId}/uploadImageWithRequiredFile")
   Observable<ModelApiResponse> uploadFileWithRequiredFile(
-    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part("requiredFile") MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
+    @retrofit2.http.Path("petId") Long petId, @retrofit2.http.Part MultipartBody.Part requiredFile, @retrofit2.http.Part("additionalMetadata") String additionalMetadata
   );
 
 }