Repository navigation
[java][spring-clients]Bugfix: additional properties in multipart request #22574
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sermler
wants to merge
10
commits into
OpenAPITools:master
Choose a base branch
from
sermler:bugfix/additional-properties-in-multipart-request-java-resttemplate
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
622c1e4
Add test-case for additional-properties-in-multipart-issue-java-restt…
sermler 5ed2d7c
Fix multipart requests for additional-properties
sermler 86cb453
Update samples
sermler 0befc20
Move sample-spec to java folder
sermler 54675a6
Add additional reproduction samples
sermler d933d56
Fix multipart requests for container types (restclient)
sermler 22df2af
Fix multipart requests for container types (webclient)
sermler e34d4e6
Add new samples to ci
sermler 4c1e738
Move rest- and webclient samples to jdk17 build
sermler d070a3f
Update samples
sermler File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
bin/configs/java-restclient-additonal-properties-in-multipart-request-issue.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| generatorName: java | ||
| outputDir: samples/client/others/java/restclient-additonal-properties-in-multipart-request-issue | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. thanks for the pr what about adding the new folder to the github workflow so that it will be tested moving forward? |
||
| 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 | ||
9 changes: 9 additions & 0 deletions
9
bin/configs/java-resttemplate-additonal-properties-in-multipart-request-issue.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
9 changes: 9 additions & 0 deletions
9
bin/configs/java-webclient-additonal-properties-in-multipart-request-issue.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
...enerator/src/test/resources/3_0/java/additonal-properties-in-multipart-request-issue.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
30 changes: 30 additions & 0 deletions
30
...va/restclient-additonal-properties-in-multipart-request-issue/.github/workflows/maven.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
21 changes: 21 additions & 0 deletions
21
.../client/others/java/restclient-additonal-properties-in-multipart-request-issue/.gitignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
23 changes: 23 additions & 0 deletions
23
...java/restclient-additonal-properties-in-multipart-request-issue/.openapi-generator-ignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
32 changes: 32 additions & 0 deletions
32
.../java/restclient-additonal-properties-in-multipart-request-issue/.openapi-generator/FILES
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
1 change: 1 addition & 0 deletions
1
...ava/restclient-additonal-properties-in-multipart-request-issue/.openapi-generator/VERSION
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 7.23.0-SNAPSHOT |
22 changes: 22 additions & 0 deletions
22
...client/others/java/restclient-additonal-properties-in-multipart-request-issue/.travis.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wing328 like this?