Remove custom OpenAPI Generator templates from archetype

[InfoSec812]

The portions which were customized have been merged into the upstream OpenAPI Generator and are no longer needed.

[KurtStam]

Can you add a reference to where they got merged? I can't find anything Quarkus in that repo. Thanks

[InfoSec812]

@KurtStam It's implemented in the Java JAX-RS Spec generator

https://github.com/OpenAPITools/openapi-generator/blob/ff9b38404eb516d46adf104d8e68e4559d9d90ae/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache#L16

openapi-generator generate -g jaxrs-spec -p library=quarkus . . . 

The annotations you would use in the OpenAPI Spec are as follows:

## Class level annotations
x-class-extra-annotation: |
    @javax.jpa.Entity
    @javax.jpa.Table(name = "entity")

## Getter Annotations
x-extra-annotation: |
    @javax.jpa.Id
    @javax.jpa.Column(name = "getter-column")

## Field Annotations
x-field-extra-annotation: |
    @javax.jpa.Id
    @javax.jpa.Column(name = "field-column")

## Setter Annotations
x-setter-extra-annotation: |
    @some.package.Annotation
    @some.other.Annotation

Since these annotations do not make changes to the import statements, you need to use fully qualifies names for the annotations.

[KurtStam]

Thank you very much for your quick response. I was able to port my spec to they way you described above. I had to upgrade to openapi-generator 6.0.0. I'm having a hard time finding docs on it though. I'm struggling with a OneToOne annotation which I defined as

template:
  $ref: '#/components/schemas/Template'
  x-field-extra-annotation: |
    @javax.persistence.OneToOne(fetch=javax.persistence.FetchType.EAGER)
    @javax.persistence.JoinColumn(name = "applicationVersionId")

Sorry for hijacking this jira issue a bit but it maybe useful for other people too.

[InfoSec812]

@KurtStam Could you share what the rendered code looks like?

[KurtStam]

Sure it's completely ignoring the annotation:

private @Valid Template template

When I wrongly use

items:
  $ref: '#/components/schemas/Template'

Then it works (but it tries to construct an array)

All my OneToMany's work just fine. So I must be missing something in my openapi spec when constructing the annotation

[InfoSec812]

@KurtStam Ahhhhh . . . Now I see what the problem is. When you use a $ref it replaces the contents of the current item and the vendor extension is completely ignored. I have been trying to get this fixed upstream for some time. The older (OAI 3.0) specification did not allow for merging and the swagger-parser library in use by openapi-generator still does not support it for OAI 3.1 (yet?). I have tried and tried to get them to support it. It's not forbidden by the spec, but it is also not required.

[KurtStam]

Ah ok.. anything I can do to help getting this fixed, is there a PR I can vote for or comment on? I guess the workaround for now is to markup Entity files containing a OneToOne by hand?

[InfoSec812]

Here are some links:

swagger-api/swagger-parser#1388

https://spec.openapis.org/oas/v3.1.0#reference-object

This object cannot be extended with additional properties and any properties added SHALL be ignored.
Note that this restriction on additional properties is a difference between Reference Objects and Schema Objects that contain a $ref keyword.