[java][spring-clients]Bugfix: additional properties in multipart request

bin/configs/java-restclient-additonal-properties-in-multipart-request-issue.yaml

@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue
+library: restclient
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/additonal-properties-in-multipart-request-issue.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: additonal-properties-in-multipart-request-issue
+  hideGenerationTimestamp: "true"
+  java8: true

bin/configs/java-resttemplate-additonal-properties-in-multipart-request-issue.yaml

@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/others/java/resttemplate-additonal-properties-in-multipart-request-issue
+library: resttemplate
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/additonal-properties-in-multipart-request-issue.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: additonal-properties-in-multipart-request-issue
+  hideGenerationTimestamp: "true"
+  java8: true

bin/configs/java-webclient-additonal-properties-in-multipart-request-issue.yaml

@@ -0,0 +1,9 @@
+generatorName: java
+outputDir: samples/client/others/java/webclient-additonal-properties-in-multipart-request-issue
+library: webclient
+inputSpec: modules/openapi-generator/src/test/resources/3_0/java/additonal-properties-in-multipart-request-issue.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: additonal-properties-in-multipart-request-issue
+  hideGenerationTimestamp: "true"
+  java8: true

modules/openapi-generator/src/main/resources/Java/libraries/restclient/api.mustache

@@ -147,7 +147,7 @@ public class {{classname}} {
 
         {{#formParams}}
         if ({{paramName}} != null)
-            formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});
+            formParams.add{{#isArray}}All{{/isArray}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});
         {{/formParams}}
         {{/hasFormParams}}
 

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api.mustache

@@ -140,7 +140,7 @@ public class {{classname}} extends BaseApi {
         {{/-last}}{{/cookieParams}}{{/hasCookieParams}}{{#hasFormParams}}
 
         {{#formParams}}if ({{paramName}} != null)
-            localVarFormParams.{{^collectionFormat}}add{{/collectionFormat}}{{#collectionFormat}}addAll{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{^-last}}
+            localVarFormParams.{{^isArray}}add{{/isArray}}{{#isArray}}addAll{{/isArray}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});{{^-last}}
         {{/-last}}{{/formParams}}{{/hasFormParams}}
 
         final String[] localVarAccepts = { {{#hasProduces}}

modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache

@@ -149,7 +149,7 @@ public class {{classname}} {
 
         {{#formParams}}
         if ({{paramName}} != null)
-            formParams.add{{#collectionFormat}}All{{/collectionFormat}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});
+            formParams.add{{#isArray}}All{{/isArray}}("{{baseName}}", {{#isFile}}{{^collectionFormat}}{{#useAbstractionForFiles}}{{paramName}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}new FileSystemResource({{paramName}}){{/useAbstractionForFiles}}{{/collectionFormat}}{{/isFile}}{{#isFile}}{{#collectionFormat}}{{paramName}}.stream(){{^useAbstractionForFiles}}.map(FileSystemResource::new){{/useAbstractionForFiles}}.collect(Collectors.toList()){{/collectionFormat}}{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}});
         {{/formParams}}
         {{/hasFormParams}}
 

modules/openapi-generator/src/test/resources/3_0/java/additonal-properties-in-multipart-request-issue.yaml

@@ -0,0 +1,56 @@
+openapi: 3.0.3
+info:
+  title: Minimal
+  description: Api to reproduce bug
+  version: 0.5.1-SNAPSHOT.0
+tags:
+  - name: test
+servers:
+  - url: http://localhost:8080
+paths:
+  "/api/v1/file":
+    post:
+      tags:
+        - file
+      operationId: createFile
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: "#/components/schemas/FileUploadRequest"
+            encoding:
+              documentBytes:
+                contentType: "*/*"
+              properties:
+                contentType: application/json
+      responses:
+        "201":
+          description: File created successfully
+components:
+  schemas:
+    FileUploadRequest:
+      type: object
+      properties:
+        documentBytes:
+          type: string
+          format: binary
+        documentType:
+          type: string
+        structured:
+          $ref: '#/components/schemas/StructuredType'
+        properties:
+          $ref: '#/components/schemas/TypeMap'
+      required:
+        - documentBytes
+        - documentType
+        - properties
+    TypeMap:
+      type: object
+      additionalProperties:
+        type: string
+    StructuredType:
+      type: object
+      properties:
+        someString:
+          type: string

samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue/.github/workflows/maven.yml

@@ -0,0 +1,30 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+#
+# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+
+jobs:
+  build:
+    name: Build Minimal
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 17, 21 ]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --no-transfer-progress --file pom.xml

samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue/.gitignore

@@ -0,0 +1,21 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# exclude jar for gradle wrapper
+!gradle/wrapper/*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# build files
+**/target
+target
+.gradle
+build

samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue/.openapi-generator/FILES

@@ -0,0 +1,32 @@
+.github/workflows/maven.yml
+.gitignore
+.travis.yml
+README.md
+api/openapi.yaml
+build.gradle
+build.sbt
+docs/FileApi.md
+docs/StructuredType.md
+git_push.sh
+gradle.properties
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+pom.xml
+settings.gradle
+src/main/AndroidManifest.xml
+src/main/java/org/openapitools/client/ApiClient.java
+src/main/java/org/openapitools/client/JavaTimeFormatter.java
+src/main/java/org/openapitools/client/RFC3339DateFormat.java
+src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java
+src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java
+src/main/java/org/openapitools/client/ServerConfiguration.java
+src/main/java/org/openapitools/client/ServerVariable.java
+src/main/java/org/openapitools/client/StringUtil.java
+src/main/java/org/openapitools/client/api/FileApi.java
+src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+src/main/java/org/openapitools/client/auth/Authentication.java
+src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+src/main/java/org/openapitools/client/model/StructuredType.java

samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.19.0-SNAPSHOT

samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue/.travis.yml

@@ -0,0 +1,22 @@
+#
+# Generated by OpenAPI Generator: https://openapi-generator.tech
+#
+# Ref: https://docs.travis-ci.com/user/languages/java/
+#
+language: java
+jdk:
+  - openjdk12
+  - openjdk11
+  - openjdk10
+  - openjdk9
+  - openjdk8
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  #- mvn test
+  # test using gradle
+  - gradle test
+  # test using sbt
+  # - sbt test

samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue/README.md

@@ -0,0 +1,141 @@
+# additonal-properties-in-multipart-request-issue
+
+Minimal
+
+- API version: 0.5.1-SNAPSHOT.0
+
+- Generator version: 7.19.0-SNAPSHOT
+
+Api to reproduce bug
+
+
+*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
+
+## Requirements
+
+Building the API client library requires:
+
+1. Java 17+
+2. Maven/Gradle
+
+## Installation
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn clean install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn clean deploy
+```
+
+Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
+
+### Maven users
+
+Add this dependency to your project's POM:
+
+```xml
+<dependency>
+  <groupId>org.openapitools</groupId>
+  <artifactId>additonal-properties-in-multipart-request-issue</artifactId>
+  <version>0.5.1-SNAPSHOT.0</version>
+  <scope>compile</scope>
+</dependency>
+```
+
+### Gradle users
+
+Add this dependency to your project's build file:
+
+```groovy
+  repositories {
+    mavenCentral()     // Needed if the 'additonal-properties-in-multipart-request-issue' jar has been published to maven central.
+    mavenLocal()       // Needed if the 'additonal-properties-in-multipart-request-issue' jar has been published to the local maven repo.
+  }
+
+  dependencies {
+     implementation "org.openapitools:additonal-properties-in-multipart-request-issue:0.5.1-SNAPSHOT.0"
+  }
+```
+
+### Others
+
+At first generate the JAR by executing:
+
+```shell
+mvn clean package
+```
+
+Then manually install the following JARs:
+
+- `target/additonal-properties-in-multipart-request-issue-0.5.1-SNAPSHOT.0.jar`
+- `target/lib/*.jar`
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following Java code:
+
+```java
+
+import org.openapitools.client.*;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.model.*;
+import org.openapitools.client.api.FileApi;
+
+public class FileApiExample {
+
+    public static void main(String[] args) {
+        ApiClient defaultClient = new ApiClient();
+        defaultClient.setBasePath("http://localhost:8080");
+
+        FileApi apiInstance = new FileApi(defaultClient);
+        File documentBytes = new File("/path/to/file"); // File | 
+        String documentType = "documentType_example"; // String | 
+        Map<String, String> properties = new HashMap(); // Map<String, String> | 
+        StructuredType structured = new StructuredType(); // StructuredType | 
+        try {
+            apiInstance.createFile(documentBytes, documentType, properties, structured);
+        } catch (HttpStatusCodeException e) {
+            System.err.println("Exception when calling FileApi#createFile");
+            System.err.println("Status code: " + e.getStatusCode().value());
+            System.err.println("Reason: " + e.getResponseBodyAsString());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://localhost:8080*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*FileApi* | [**createFile**](docs/FileApi.md#createFile) | **POST** /api/v1/file | 
+
+
+## Documentation for Models
+
+ - [StructuredType](docs/StructuredType.md)
+
+
+<a id="documentation-for-authorization"></a>
+## Documentation for Authorization
+
+Endpoints do not require authorization.
+
+
+## Recommendation
+
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
+
+## Author
+
+
+