-
-
Notifications
You must be signed in to change notification settings - Fork 7.2k
[Java] [Spring] Use deduction configOptions for oneOfInterfaces #20919
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
Merged
wing328
merged 33 commits into
OpenAPITools:master
from
jpfinne:useDeductionForOneOfInterfaces
Sep 21, 2025
Merged
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
aef3b64
fix(java): x-discriminator-value should not produce @JsonTypeName
4199d11
fix(java): Remove unused getDiscriminatorValue()
77a34df
build at Fednot
53832b0
build at Fednot
ad9959e
build at Fednot: skip sonar
eff380a
scm for release at fednot
b3ea3d8
Merge remote-tracking branch 'origin/master'
8fb89ae
Merge remote-tracking branch 'origin/master'
jpfinne 5a29795
build fednot not 7.5.0-FEDNOT-SNAPSHOT
jpfinne 8e83bee
build fednot not 7.5.0-FEDNOT-SNAPSHOT
jpfinne e91cde1
Merge remote-tracking branch 'origin/master'
jpfinne ca5b2e6
test all vars
jpfinne 9263f4c
rollback custom pom.xml
jpfinne 47c61f3
Merge remote-tracking branch 'origin/master'
jpfinne 33a68b2
commit master
jpfinne 15064a4
commit test
jpfinne 5a82c52
Merge remote-tracking branch 'origin/master'
jpfinne 135b972
Merge branch 'master' of https://github.com/jpfinne/openapi-generator
jpfinne 1c8c322
Samples for deduction
jpfinne e7b3c16
add files for deduction
jpfinne df46ce5
small improvements
martin-mfg 3119eca
Merge pull request #2 from martin-mfg/pr_20919_improvements
jpfinne 66a6693
Merge changes from martin-mfg
jpfinne 168d3d1
Merge branch 'master' of https://github.com/jpfinne/openapi-generator…
jpfinne 7634e4c
Merge changes from martin-mfg
jpfinne 58f2588
Merge changes from martin-mfg
jpfinne 59b18e9
Merge remote-tracking branch 'origin/master'
jpfinne e2a998f
Merge remote-tracking branch 'origin/master'
jpfinne 3557514
Merge branch 'master' into useDeductionForOneOfInterfaces
jpfinne a478971
Merge master
jpfinne 0397cc2
regenerate doc
jpfinne 21f1f1c
regenerate client
jpfinne a20aad5
regenerate client
jpfinne 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
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,12 @@ | ||
generatorName: spring | ||
outputDir: samples/openapi3/server/petstore/spring-boot-oneof-interface | ||
inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml | ||
templateDir: modules/openapi-generator/src/main/resources/JavaSpring | ||
additionalProperties: | ||
groupId: org.openapitools.openapi3 | ||
documentationProvider: springdoc | ||
artifactId: springboot-oneof | ||
snapshotVersion: "true" | ||
hideGenerationTimestamp: "true" | ||
useOneOfInterfaces: "true" | ||
useDeductionForOneOfInterfaces: "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
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
184 changes: 184 additions & 0 deletions
184
samples/client/echo_api/java/okhttp-gson-user-defined-templates/README.md
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,184 @@ | ||
# openapi-java-client | ||
|
||
OpenAPI Petstore | ||
- API version: 1.0.0 | ||
- Generator version: 7.6.0-SNAPSHOT | ||
|
||
This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. | ||
|
||
|
||
*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* | ||
|
||
|
||
## Requirements | ||
|
||
Building the API client library requires: | ||
1. Java 1.8+ | ||
2. Maven (3.8.3+)/Gradle (7.2+) | ||
|
||
## 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>openapi-java-client</artifactId> | ||
<version>1.0.0</version> | ||
<scope>compile</scope> | ||
</dependency> | ||
``` | ||
|
||
### Gradle users | ||
|
||
Add this dependency to your project's build file: | ||
|
||
```groovy | ||
repositories { | ||
mavenCentral() // Needed if the 'openapi-java-client' jar has been published to maven central. | ||
mavenLocal() // Needed if the 'openapi-java-client' jar has been published to the local maven repo. | ||
} | ||
|
||
dependencies { | ||
implementation "org.openapitools:openapi-java-client:1.0.0" | ||
} | ||
``` | ||
|
||
### Others | ||
|
||
At first generate the JAR by executing: | ||
|
||
```shell | ||
mvn clean package | ||
``` | ||
|
||
Then manually install the following JARs: | ||
|
||
* `target/openapi-java-client-1.0.0.jar` | ||
* `target/lib/*.jar` | ||
|
||
## Getting Started | ||
|
||
Please follow the [installation](#installation) instruction and execute the following Java code: | ||
|
||
```java | ||
|
||
// Import classes: | ||
import org.openapitools.client.ApiClient; | ||
import org.openapitools.client.ApiException; | ||
import org.openapitools.client.Configuration; | ||
import org.openapitools.client.auth.*; | ||
import org.openapitools.client.models.*; | ||
import org.openapitools.client.api.PetApi; | ||
|
||
public class Example { | ||
public static void main(String[] args) { | ||
ApiClient defaultClient = Configuration.getDefaultApiClient(); | ||
defaultClient.setBasePath("http://petstore.swagger.io/v2"); | ||
|
||
// Configure OAuth2 access token for authorization: petstore_auth | ||
OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth"); | ||
petstore_auth.setAccessToken("YOUR ACCESS TOKEN"); | ||
|
||
PetApi apiInstance = new PetApi(defaultClient); | ||
Pet pet = new Pet(); // Pet | Pet object that needs to be added to the store | ||
try { | ||
Pet result = apiInstance.addPet(pet); | ||
System.out.println(result); | ||
} catch (ApiException e) { | ||
System.err.println("Exception when calling PetApi#addPet"); | ||
System.err.println("Status code: " + e.getCode()); | ||
System.err.println("Reason: " + e.getResponseBody()); | ||
System.err.println("Response headers: " + e.getResponseHeaders()); | ||
e.printStackTrace(); | ||
} | ||
} | ||
} | ||
|
||
``` | ||
|
||
## Documentation for API Endpoints | ||
|
||
All URIs are relative to *http://petstore.swagger.io/v2* | ||
|
||
Class | Method | HTTP request | Description | ||
------------ | ------------- | ------------- | ------------- | ||
*PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store | ||
*PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet | ||
*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status | ||
*PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags | ||
*PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID | ||
*PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet | ||
*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data | ||
*PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image | ||
*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID | ||
*StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status | ||
*StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID | ||
*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet | ||
*UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user | ||
*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array | ||
*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array | ||
*UserApi* | [**deleteUser**](docs/UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user | ||
*UserApi* | [**getUserByName**](docs/UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name | ||
*UserApi* | [**loginUser**](docs/UserApi.md#loginUser) | **GET** /user/login | Logs user into the system | ||
*UserApi* | [**logoutUser**](docs/UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session | ||
*UserApi* | [**updateUser**](docs/UserApi.md#updateUser) | **PUT** /user/{username} | Updated user | ||
|
||
|
||
## Documentation for Models | ||
|
||
- [Category](docs/Category.md) | ||
- [ModelApiResponse](docs/ModelApiResponse.md) | ||
- [Order](docs/Order.md) | ||
- [Pet](docs/Pet.md) | ||
- [Tag](docs/Tag.md) | ||
- [User](docs/User.md) | ||
|
||
|
||
<a id="documentation-for-authorization"></a> | ||
## Documentation for Authorization | ||
|
||
|
||
Authentication schemes defined for the API: | ||
<a id="petstore_auth"></a> | ||
### petstore_auth | ||
|
||
- **Type**: OAuth | ||
- **Flow**: implicit | ||
- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog | ||
- **Scopes**: | ||
- write:pets: modify pets in your account | ||
- read:pets: read your pets | ||
|
||
<a id="api_key"></a> | ||
### api_key | ||
|
||
- **Type**: API key | ||
- **API key parameter name**: api_key | ||
- **Location**: HTTP header | ||
|
||
|
||
## Recommendation | ||
|
||
It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues. | ||
|
||
## Author | ||
|
||
|
||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# Animal | ||
|
||
## Enum Variants | ||
|
||
| Name | Description | | ||
|---- | -----| | ||
| Cat | | | ||
| Dog | | | ||
|
||
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) | ||
|
||
|
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.
what about adding this to the github workflow so that it will be tested moving forward?
https://github.com/OpenAPITools/openapi-generator/blob/master/.github/workflows/samples-spring.yaml
https://github.com/OpenAPITools/openapi-generator/blob/master/.github/workflows/samples-spring-jdk17.yaml
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 I did not know about this.
Maybe something to add to https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md
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 any chance that this PR get merged?