Skip to content

Conversation

@Bethibande
Copy link
Contributor

@Bethibande Bethibande commented May 1, 2024

Fixes #18517, Gradle builds work again using the test file: https://gist.github.com/Bethibande/c97b0b64e3dc284c056c02fbf3778a9b

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh ./bin/configs/*.yaml
    ./bin/utils/export_docs_generators.sh
    
    (For Windows users, please run the script in Git BASH)
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.1.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)

@Bethibande Bethibande changed the title [BUG] [Java] Invalid code generation for oneof types. #18517 [BUG] [Java] Invalid code generation for oneof types. May 1, 2024
@wing328
Copy link
Member

wing328 commented May 2, 2024

thanks for the PR.

can you please add a test model (oneOf with map as sub schema) in modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml?

@Bethibande
Copy link
Contributor Author

Bethibande commented May 2, 2024

Going to add the unit-tests later.
EDIT: Never mind, just found out the sample Test classes are all empty.

@wing328
Copy link
Member

wing328 commented May 5, 2024

when you've time, can you please add a unit test or 2 in https://github.com/OpenAPITools/openapi-generator/blob/c80075bc2ee24634a5124a52d3088d11b6b13719/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java ? (which contains many examples on unit testing the models)

@wing328
Copy link
Member

wing328 commented May 5, 2024

@wing328 wing328 added this to the 7.6.0 milestone May 11, 2024
@wing328 wing328 merged commit d4d4c77 into OpenAPITools:master May 11, 2024
@wing328
Copy link
Member

wing328 commented May 11, 2024

thanks for the PR, which has been merged.

https://github.com/OpenAPITools/openapi-generator/actions/runs/9016604828/job/24773787312 fixed via eec30f2

@cambiph
Copy link

cambiph commented Oct 8, 2024

This issue also impacts jersey3.
I have the following config:

                    <execution>
                        <id>mock-server</id>
                        <goals>
                            <goal>generate</goal>
                        </goals>
                        <configuration>
                            <inputSpec>${project.basedir}/src/main/resources/static/public/jamesdbloom-mock-server-openapi-5.15.x-swagger.yaml</inputSpec>
                            <generatorName>java</generatorName>
                            <modelPackage>...</modelPackage>
                            <apiPackage>...</apiPackage>
                            <generateApiTests>false</generateApiTests>
                            <generateModelTests>false</generateModelTests>
                            <modelNameSuffix>DTO</modelNameSuffix>
                            <skipValidateSpec>true</skipValidateSpec>
                            <configOptions>
                                <library>jersey3</library>
                                <useJakartaEe>true</useJakartaEe>
                                <useSingleRequestParameter>true</useSingleRequestParameter>
                            </configOptions>
                        </configuration>
                    </execution>

The following classes are generated incorrectly: Body, KeyToValue, BodyWithContentType and SchemaType
For example Body:

    /**
     * Get the actual instance of `Map<String, Object>`. If the actual instance is not `Map<String, Object>`,
     * the ClassCastException will be thrown.
     *
     * @return The actual instance of `Map<String, Object>`
     * @throws ClassCastException if the instance is not `Map<String, Object>`
     */
    public Map<String, Object> getMap<String, Object>() throws ClassCastException {
        return (Map<String, Object>)super.getActualInstance();
    }

The method signature should be:

 public Map<String, Object> getMap() throws ClassCastException {

without <String, Object>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] [Java] Invalid code generation for oneof types.

3 participants