loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 12:40:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Remove bean validation annotations on builder (#19580)

Browse Source 
* Revert #18724

Make JAX-RS spec BuilderImpl class final again

* Remove bean validation annotations from builder

* Also update other java generators

* Introduce removeAnnotations lambda

* Undo import changes to JavaHelidonClientCodegen

* Add javadoc comment, examples and test for AbstractJavaCodegen.removeAnnotations()
This commit is contained in:
Jimmy Praet 2025-01-07 14:36:19 +01:00 committed by GitHub
parent 00c76de2a9
commit eb96380928
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
167 changed files with 233 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -657,6 +657,9 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
}
writer.write(content);
});
additionalProperties.put("removeAnnotations", (Mustache.Lambda) (fragment, writer) -> {
writer.write(removeAnnotations(fragment.execute()));
});
}
/**
@ -1802,18 +1805,30 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
return;
}
// the response data types should not contain a bean validation annotation.
if (property.dataType.contains("@")) {
property.dataType = removeAnnotations(property.dataType);
}
// the response data types should not contain a bean validation annotation.
if (response.dataType.contains("@")) {
response.dataType = removeAnnotations(response.dataType);
}
// the response data types should not contain bean validation annotations.
property.dataType = removeAnnotations(property.dataType);
response.dataType = removeAnnotations(response.dataType);
}
private String removeAnnotations(String type) {
return type.replaceAll("(?:(?i)@[a-z0-9]*+([(].*[)]|\\s*))*+", "");
/**
* Remove annotations from the given data type string.
*
* For example:
* <ul>
* <li>{@code @Min(0) @Max(10)Integer} -> {@code Integer}</li>
* <li>{@code @Pattern(regexp = "^[a-z]$")String>} -> {@code String}</li>
* <li>{@code List<@Pattern(regexp = "^[a-z]$")String>}" -> "{@code List<String>}"</li>
* <li>{@code List<@Valid Pet>}" -> "{@code List<Pet>}"</li>
* </ul>
*
* @param dataType the data type string
* @return the data type string without annotations
*/
public String removeAnnotations(String dataType) {
if (dataType != null && dataType.contains("@")) {
return dataType.replaceAll("(?:(?i)@[a-z0-9]*+([(].*[)]|\\s*))*+", "");
}
return dataType;
}
@Override

10
modules/openapi-generator/src/main/resources/Java/javaBuilder.mustache vendored
View File

@ -14,9 +14,9 @@ public static class Builder {{#parentModel}}extends {{classname}}.Builder {{/par
}
{{#vars}}
public {{classname}}.Builder {{name}}({{{datatypeWithEnum}}} {{name}}) {
public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) {
{{#vendorExtensions.x-is-jackson-optional-nullable}}
this.instance.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{name}});
this.instance.{{name}} = JsonNullable.<{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}>of({{name}});
{{/vendorExtensions.x-is-jackson-optional-nullable}}
{{^vendorExtensions.x-is-jackson-optional-nullable}}
this.instance.{{name}} = {{name}};
@ -24,7 +24,7 @@ public static class Builder {{#parentModel}}extends {{classname}}.Builder {{/par
return this;
}
{{#vendorExtensions.x-is-jackson-optional-nullable}}
public {{classname}}.Builder {{name}}(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) {
public {{classname}}.Builder {{name}}(JsonNullable<{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}> {{name}}) {
this.instance.{{name}} = {{name}};
return this;
}
@ -32,12 +32,12 @@ public static class Builder {{#parentModel}}extends {{classname}}.Builder {{/par
{{/vars}}
{{#parentVars}}
public {{classname}}.Builder {{name}}({{{datatypeWithEnum}}} {{name}}) { // inherited: {{isInherited}}
public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) { // inherited: {{isInherited}}
super.{{name}}({{name}});
return this;
}
{{#vendorExtensions.x-is-jackson-optional-nullable}}
public {{classname}}.Builder {{name}}(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) {
public {{classname}}.Builder {{name}}(JsonNullable<{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}> {{name}}) {
this.instance.{{name}} = {{name}};
return this;
}

6
modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache vendored
View File

@ -188,7 +188,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
return new {{classname}}BuilderImpl();
}
private static class {{classname}}BuilderImpl extends {{classname}}Builder<{{classname}}, {{classname}}BuilderImpl> {
private static final class {{classname}}BuilderImpl extends {{classname}}Builder<{{classname}}, {{classname}}BuilderImpl> {
@Override
protected {{classname}}BuilderImpl self() {
@ -203,7 +203,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
public static abstract class {{classname}}Builder<C extends {{classname}}, B extends {{classname}}Builder<C, B>> {{#parent}}extends {{{.}}}Builder<C, B>{{/parent}} {
{{#vars}}
private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
private {{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
{{/vars}}
{{^parent}}
protected abstract B self();
@ -212,7 +212,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
{{/parent}}
{{#vars}}
public B {{name}}({{{datatypeWithEnum}}} {{name}}) {
public B {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) {
this.{{name}} = {{name}};
return self();
}

8
modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache vendored
View File

@ -24,12 +24,12 @@
{{#deprecated}}
@Deprecated
{{/deprecated}}
public {{classname}}.Builder {{name}}({{{datatypeWithEnum}}} {{name}}) {
public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) {
this.instance.{{name}}({{name}});
return this;
}
{{#openApiNullable}}{{#isNullable}}
public {{classname}}.Builder {{name}}(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) {
public {{classname}}.Builder {{name}}(JsonNullable<{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}> {{name}}) {
this.instance.{{name}} = {{name}};
return this;
}
@ -37,12 +37,12 @@
{{/vars}}
{{#parentVars}}
@Override
public {{classname}}.Builder {{name}}({{{datatypeWithEnum}}} {{name}}) {
public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) {
this.instance.{{name}}({{name}});
return this;
}
{{#openApiNullable}}{{#isNullable}}
public {{classname}}.Builder {{name}}(JsonNullable<{{{datatypeWithEnum}}}> {{name}}) {
public {{classname}}.Builder {{name}}(JsonNullable<{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}> {{name}}) {
this.instance.{{setter}}({{name}});
return this;
}

10
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
View File

@ -955,4 +955,14 @@ public class AbstractJavaCodegenTest {
defaultValue = codegen.getTypeDeclaration(schema);
Assert.assertEquals(defaultValue, "List<@Max(10)Integer>");
}
@Test
public void removeAnnotationsTest() {
Assert.assertEquals(codegen.removeAnnotations("@Min(0) @Max(10)Integer"), "Integer");
Assert.assertEquals(codegen.removeAnnotations("@Pattern(regexp = \"^[a-z]$\")String"), "String");
Assert.assertEquals(codegen.removeAnnotations("List<@Min(0) @Max(10)Integer>"), "List<Integer>");
Assert.assertEquals(codegen.removeAnnotations("List<@Pattern(regexp = \"^[a-z]$\")String>"), "List<String>");
Assert.assertEquals(codegen.removeAnnotations("List<@Valid Pet>"), "List<Pet>");
}
}

2
samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
View File

@ -359,7 +359,7 @@ public class Pet {
return this;
}
public Pet.Builder tags(List<@Valid Tag> tags) {
public Pet.Builder tags(List<Tag> tags) {
this.instance.tags(tags);
return this;
}

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View File

@ -452,7 +452,7 @@ public class AdditionalPropertiesClass implements Serializable {
return new AdditionalPropertiesClassBuilderImpl();
}
private static class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
private static final class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
@Override
protected AdditionalPropertiesClassBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Animal.java
View File

@ -129,7 +129,7 @@ public class Animal implements Serializable {
return new AnimalBuilderImpl();
}
private static class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
private static final class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
@Override
protected AnimalBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
View File

@ -110,7 +110,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable {
return new ArrayOfArrayOfNumberOnlyBuilderImpl();
}
private static class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
private static final class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
@Override
protected ArrayOfArrayOfNumberOnlyBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
View File

@ -110,7 +110,7 @@ public class ArrayOfNumberOnly implements Serializable {
return new ArrayOfNumberOnlyBuilderImpl();
}
private static class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
private static final class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
@Override
protected ArrayOfNumberOnlyBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ArrayTest.java
View File

@ -188,7 +188,7 @@ public class ArrayTest implements Serializable {
return new ArrayTestBuilderImpl();
}
private static class ArrayTestBuilderImpl extends ArrayTestBuilder<ArrayTest, ArrayTestBuilderImpl> {
private static final class ArrayTestBuilderImpl extends ArrayTestBuilder<ArrayTest, ArrayTestBuilderImpl> {
@Override
protected ArrayTestBuilderImpl self() {
@ -204,7 +204,7 @@ public class ArrayTest implements Serializable {
public static abstract class ArrayTestBuilder<C extends ArrayTest, B extends ArrayTestBuilder<C, B>> {
private List<String> arrayOfString = new ArrayList<>();
private List<List<Long>> arrayArrayOfInteger = new ArrayList<>();
private List<List<@Valid ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
protected abstract B self();
public abstract C build();
@ -217,7 +217,7 @@ public class ArrayTest implements Serializable {
this.arrayArrayOfInteger = arrayArrayOfInteger;
return self();
}
public B arrayArrayOfModel(List<List<@Valid ReadOnlyFirst>> arrayArrayOfModel) {
public B arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
this.arrayArrayOfModel = arrayArrayOfModel;
return self();
}

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/BigCat.java
View File

@ -149,7 +149,7 @@ public class BigCat extends Cat implements Serializable {
return new BigCatBuilderImpl();
}
private static class BigCatBuilderImpl extends BigCatBuilder<BigCat, BigCatBuilderImpl> {
private static final class BigCatBuilderImpl extends BigCatBuilder<BigCat, BigCatBuilderImpl> {
@Override
protected BigCatBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Capitalization.java
View File

@ -206,7 +206,7 @@ public class Capitalization implements Serializable {
return new CapitalizationBuilderImpl();
}
private static class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
private static final class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
@Override
protected CapitalizationBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Cat.java
View File

@ -102,7 +102,7 @@ public class Cat extends Animal implements Serializable {
return new CatBuilderImpl();
}
private static class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
private static final class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
@Override
protected CatBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Category.java
View File

@ -120,7 +120,7 @@ public class Category implements Serializable {
return new CategoryBuilderImpl();
}
private static class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
private static final class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
@Override
protected CategoryBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ClassModel.java
View File

@ -92,7 +92,7 @@ public class ClassModel implements Serializable {
return new ClassModelBuilderImpl();
}
private static class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
private static final class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
@Override
protected ClassModelBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Client.java
View File

@ -90,7 +90,7 @@ public class Client implements Serializable {
return new ClientBuilderImpl();
}
private static class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
private static final class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
@Override
protected ClientBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Dog.java
View File

@ -102,7 +102,7 @@ public class Dog extends Animal implements Serializable {
return new DogBuilderImpl();
}
private static class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
private static final class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
@Override
protected DogBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumArrays.java
View File

@ -226,7 +226,7 @@ public class EnumArrays implements Serializable {
return new EnumArraysBuilderImpl();
}
private static class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
private static final class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
@Override
protected EnumArraysBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/EnumTest.java
View File

@ -379,7 +379,7 @@ public class EnumTest implements Serializable {
return new EnumTestBuilderImpl();
}
private static class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
private static final class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
@Override
protected EnumTestBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
View File

@ -133,7 +133,7 @@ public class FileSchemaTestClass implements Serializable {
return new FileSchemaTestClassBuilderImpl();
}
private static class FileSchemaTestClassBuilderImpl extends FileSchemaTestClassBuilder<FileSchemaTestClass, FileSchemaTestClassBuilderImpl> {
private static final class FileSchemaTestClassBuilderImpl extends FileSchemaTestClassBuilder<FileSchemaTestClass, FileSchemaTestClassBuilderImpl> {
@Override
protected FileSchemaTestClassBuilderImpl self() {
@ -148,7 +148,7 @@ public class FileSchemaTestClass implements Serializable {
public static abstract class FileSchemaTestClassBuilder<C extends FileSchemaTestClass, B extends FileSchemaTestClassBuilder<C, B>> {
private ModelFile _file;
private List<@Valid ModelFile> files = new ArrayList<>();
private List<ModelFile> files = new ArrayList<>();
protected abstract B self();
public abstract C build();
@ -157,7 +157,7 @@ public class FileSchemaTestClass implements Serializable {
this._file = _file;
return self();
}
public B files(List<@Valid ModelFile> files) {
public B files(List<ModelFile> files) {
this.files = files;
return self();
}

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -419,7 +419,7 @@ public class FormatTest implements Serializable {
return new FormatTestBuilderImpl();
}
private static class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
private static final class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
@Override
protected FormatTestBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
View File

@ -114,7 +114,7 @@ public class HasOnlyReadOnly implements Serializable {
return new HasOnlyReadOnlyBuilderImpl();
}
private static class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
private static final class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
@Override
protected HasOnlyReadOnlyBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MapTest.java
View File

@ -272,7 +272,7 @@ public class MapTest implements Serializable {
return new MapTestBuilderImpl();
}
private static class MapTestBuilderImpl extends MapTestBuilder<MapTest, MapTestBuilderImpl> {
private static final class MapTestBuilderImpl extends MapTestBuilder<MapTest, MapTestBuilderImpl> {
@Override
protected MapTestBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -157,7 +157,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl
return new MixedPropertiesAndAdditionalPropertiesClassBuilderImpl();
}
private static class MixedPropertiesAndAdditionalPropertiesClassBuilderImpl extends MixedPropertiesAndAdditionalPropertiesClassBuilder<MixedPropertiesAndAdditionalPropertiesClass, MixedPropertiesAndAdditionalPropertiesClassBuilderImpl> {
private static final class MixedPropertiesAndAdditionalPropertiesClassBuilderImpl extends MixedPropertiesAndAdditionalPropertiesClassBuilder<MixedPropertiesAndAdditionalPropertiesClass, MixedPropertiesAndAdditionalPropertiesClassBuilderImpl> {
@Override
protected MixedPropertiesAndAdditionalPropertiesClassBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Model200Response.java
View File

@ -116,7 +116,7 @@ public class Model200Response implements Serializable {
return new Model200ResponseBuilderImpl();
}
private static class Model200ResponseBuilderImpl extends Model200ResponseBuilder<Model200Response, Model200ResponseBuilderImpl> {
private static final class Model200ResponseBuilderImpl extends Model200ResponseBuilder<Model200Response, Model200ResponseBuilderImpl> {
@Override
protected Model200ResponseBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelApiResponse.java
View File

@ -137,7 +137,7 @@ public class ModelApiResponse implements Serializable {
return new ModelApiResponseBuilderImpl();
}
private static class ModelApiResponseBuilderImpl extends ModelApiResponseBuilder<ModelApiResponse, ModelApiResponseBuilderImpl> {
private static final class ModelApiResponseBuilderImpl extends ModelApiResponseBuilder<ModelApiResponse, ModelApiResponseBuilderImpl> {
@Override
protected ModelApiResponseBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelFile.java
View File

@ -94,7 +94,7 @@ public class ModelFile implements Serializable {
return new ModelFileBuilderImpl();
}
private static class ModelFileBuilderImpl extends ModelFileBuilder<ModelFile, ModelFileBuilderImpl> {
private static final class ModelFileBuilderImpl extends ModelFileBuilder<ModelFile, ModelFileBuilderImpl> {
@Override
protected ModelFileBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelList.java
View File

@ -91,7 +91,7 @@ public class ModelList implements Serializable {
return new ModelListBuilderImpl();
}
private static class ModelListBuilderImpl extends ModelListBuilder<ModelList, ModelListBuilderImpl> {
private static final class ModelListBuilderImpl extends ModelListBuilder<ModelList, ModelListBuilderImpl> {
@Override
protected ModelListBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ModelReturn.java
View File

@ -93,7 +93,7 @@ public class ModelReturn implements Serializable {
return new ModelReturnBuilderImpl();
}
private static class ModelReturnBuilderImpl extends ModelReturnBuilder<ModelReturn, ModelReturnBuilderImpl> {
private static final class ModelReturnBuilderImpl extends ModelReturnBuilder<ModelReturn, ModelReturnBuilderImpl> {
@Override
protected ModelReturnBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Name.java
View File

@ -168,7 +168,7 @@ public class Name implements Serializable {
return new NameBuilderImpl();
}
private static class NameBuilderImpl extends NameBuilder<Name, NameBuilderImpl> {
private static final class NameBuilderImpl extends NameBuilder<Name, NameBuilderImpl> {
@Override
protected NameBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/NumberOnly.java
View File

@ -91,7 +91,7 @@ public class NumberOnly implements Serializable {
return new NumberOnlyBuilderImpl();
}
private static class NumberOnlyBuilderImpl extends NumberOnlyBuilder<NumberOnly, NumberOnlyBuilderImpl> {
private static final class NumberOnlyBuilderImpl extends NumberOnlyBuilder<NumberOnly, NumberOnlyBuilderImpl> {
@Override
protected NumberOnlyBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Order.java
View File

@ -254,7 +254,7 @@ public class Order implements Serializable {
return new OrderBuilderImpl();
}
private static class OrderBuilderImpl extends OrderBuilder<Order, OrderBuilderImpl> {
private static final class OrderBuilderImpl extends OrderBuilder<Order, OrderBuilderImpl> {
@Override
protected OrderBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/OuterComposite.java
View File

@ -137,7 +137,7 @@ public class OuterComposite implements Serializable {
return new OuterCompositeBuilderImpl();
}
private static class OuterCompositeBuilderImpl extends OuterCompositeBuilder<OuterComposite, OuterCompositeBuilderImpl> {
private static final class OuterCompositeBuilderImpl extends OuterCompositeBuilder<OuterComposite, OuterCompositeBuilderImpl> {
@Override
protected OuterCompositeBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Pet.java
View File

@ -303,7 +303,7 @@ public class Pet implements Serializable {
return new PetBuilderImpl();
}
private static class PetBuilderImpl extends PetBuilder<Pet, PetBuilderImpl> {
private static final class PetBuilderImpl extends PetBuilder<Pet, PetBuilderImpl> {
@Override
protected PetBuilderImpl self() {
@ -321,7 +321,7 @@ public class Pet implements Serializable {
private Category category;
private String name;
private Set<String> photoUrls = new LinkedHashSet<>();
private List<@Valid Tag> tags = new ArrayList<>();
private List<Tag> tags = new ArrayList<>();
private StatusEnum status;
protected abstract B self();
@ -343,7 +343,7 @@ public class Pet implements Serializable {
this.photoUrls = photoUrls;
return self();
}
public B tags(List<@Valid Tag> tags) {
public B tags(List<Tag> tags) {
this.tags = tags;
return self();
}

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
View File

@ -113,7 +113,7 @@ public class ReadOnlyFirst implements Serializable {
return new ReadOnlyFirstBuilderImpl();
}
private static class ReadOnlyFirstBuilderImpl extends ReadOnlyFirstBuilder<ReadOnlyFirst, ReadOnlyFirstBuilderImpl> {
private static final class ReadOnlyFirstBuilderImpl extends ReadOnlyFirstBuilder<ReadOnlyFirst, ReadOnlyFirstBuilderImpl> {
@Override
protected ReadOnlyFirstBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/SpecialModelName.java
View File

@ -91,7 +91,7 @@ public class SpecialModelName implements Serializable {
return new SpecialModelNameBuilderImpl();
}
private static class SpecialModelNameBuilderImpl extends SpecialModelNameBuilder<SpecialModelName, SpecialModelNameBuilderImpl> {
private static final class SpecialModelNameBuilderImpl extends SpecialModelNameBuilder<SpecialModelName, SpecialModelNameBuilderImpl> {
@Override
protected SpecialModelNameBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/Tag.java
View File

@ -113,7 +113,7 @@ public class Tag implements Serializable {
return new TagBuilderImpl();
}
private static class TagBuilderImpl extends TagBuilder<Tag, TagBuilderImpl> {
private static final class TagBuilderImpl extends TagBuilder<Tag, TagBuilderImpl> {
@Override
protected TagBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderDefault.java
View File

@ -217,7 +217,7 @@ public class TypeHolderDefault implements Serializable {
return new TypeHolderDefaultBuilderImpl();
}
private static class TypeHolderDefaultBuilderImpl extends TypeHolderDefaultBuilder<TypeHolderDefault, TypeHolderDefaultBuilderImpl> {
private static final class TypeHolderDefaultBuilderImpl extends TypeHolderDefaultBuilder<TypeHolderDefault, TypeHolderDefaultBuilderImpl> {
@Override
protected TypeHolderDefaultBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/TypeHolderExample.java
View File

@ -242,7 +242,7 @@ public class TypeHolderExample implements Serializable {
return new TypeHolderExampleBuilderImpl();
}
private static class TypeHolderExampleBuilderImpl extends TypeHolderExampleBuilder<TypeHolderExample, TypeHolderExampleBuilderImpl> {
private static final class TypeHolderExampleBuilderImpl extends TypeHolderExampleBuilder<TypeHolderExample, TypeHolderExampleBuilderImpl> {
@Override
protected TypeHolderExampleBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/User.java
View File

@ -252,7 +252,7 @@ public class User implements Serializable {
return new UserBuilderImpl();
}
private static class UserBuilderImpl extends UserBuilder<User, UserBuilderImpl> {
private static final class UserBuilderImpl extends UserBuilder<User, UserBuilderImpl> {
@Override
protected UserBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/XmlItem.java
View File

@ -882,7 +882,7 @@ public class XmlItem implements Serializable {
return new XmlItemBuilderImpl();
}
private static class XmlItemBuilderImpl extends XmlItemBuilder<XmlItem, XmlItemBuilderImpl> {
private static final class XmlItemBuilderImpl extends XmlItemBuilder<XmlItem, XmlItemBuilderImpl> {
@Override
protected XmlItemBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View File

@ -450,7 +450,7 @@ public class AdditionalPropertiesClass implements Serializable {
return new AdditionalPropertiesClassBuilderImpl();
}
private static class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
private static final class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
@Override
protected AdditionalPropertiesClassBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Animal.java
View File

@ -127,7 +127,7 @@ public class Animal implements Serializable {
return new AnimalBuilderImpl();
}
private static class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
private static final class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
@Override
protected AnimalBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
View File

@ -108,7 +108,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable {
return new ArrayOfArrayOfNumberOnlyBuilderImpl();
}
private static class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
private static final class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
@Override
protected ArrayOfArrayOfNumberOnlyBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
View File

@ -108,7 +108,7 @@ public class ArrayOfNumberOnly implements Serializable {
return new ArrayOfNumberOnlyBuilderImpl();
}
private static class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
private static final class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
@Override
protected ArrayOfNumberOnlyBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ArrayTest.java
View File

@ -186,7 +186,7 @@ public class ArrayTest implements Serializable {
return new ArrayTestBuilderImpl();
}
private static class ArrayTestBuilderImpl extends ArrayTestBuilder<ArrayTest, ArrayTestBuilderImpl> {
private static final class ArrayTestBuilderImpl extends ArrayTestBuilder<ArrayTest, ArrayTestBuilderImpl> {
@Override
protected ArrayTestBuilderImpl self() {
@ -202,7 +202,7 @@ public class ArrayTest implements Serializable {
public static abstract class ArrayTestBuilder<C extends ArrayTest, B extends ArrayTestBuilder<C, B>> {
private List<String> arrayOfString = new ArrayList<>();
private List<List<Long>> arrayArrayOfInteger = new ArrayList<>();
private List<List<@Valid ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
protected abstract B self();
public abstract C build();
@ -215,7 +215,7 @@ public class ArrayTest implements Serializable {
this.arrayArrayOfInteger = arrayArrayOfInteger;
return self();
}
public B arrayArrayOfModel(List<List<@Valid ReadOnlyFirst>> arrayArrayOfModel) {
public B arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
this.arrayArrayOfModel = arrayArrayOfModel;
return self();
}

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/BigCat.java
View File

@ -147,7 +147,7 @@ public class BigCat extends Cat implements Serializable {
return new BigCatBuilderImpl();
}
private static class BigCatBuilderImpl extends BigCatBuilder<BigCat, BigCatBuilderImpl> {
private static final class BigCatBuilderImpl extends BigCatBuilder<BigCat, BigCatBuilderImpl> {
@Override
protected BigCatBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Capitalization.java
View File

@ -204,7 +204,7 @@ public class Capitalization implements Serializable {
return new CapitalizationBuilderImpl();
}
private static class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
private static final class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
@Override
protected CapitalizationBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Cat.java
View File

@ -100,7 +100,7 @@ public class Cat extends Animal implements Serializable {
return new CatBuilderImpl();
}
private static class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
private static final class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
@Override
protected CatBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Category.java
View File

@ -118,7 +118,7 @@ public class Category implements Serializable {
return new CategoryBuilderImpl();
}
private static class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
private static final class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
@Override
protected CategoryBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ClassModel.java
View File

@ -90,7 +90,7 @@ public class ClassModel implements Serializable {
return new ClassModelBuilderImpl();
}
private static class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
private static final class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
@Override
protected ClassModelBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Client.java
View File

@ -88,7 +88,7 @@ public class Client implements Serializable {
return new ClientBuilderImpl();
}
private static class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
private static final class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
@Override
protected ClientBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Dog.java
View File

@ -100,7 +100,7 @@ public class Dog extends Animal implements Serializable {
return new DogBuilderImpl();
}
private static class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
private static final class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
@Override
protected DogBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumArrays.java
View File

@ -224,7 +224,7 @@ public class EnumArrays implements Serializable {
return new EnumArraysBuilderImpl();
}
private static class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
private static final class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
@Override
protected EnumArraysBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/EnumTest.java
View File

@ -377,7 +377,7 @@ public class EnumTest implements Serializable {
return new EnumTestBuilderImpl();
}
private static class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
private static final class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
@Override
protected EnumTestBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
View File

@ -131,7 +131,7 @@ public class FileSchemaTestClass implements Serializable {
return new FileSchemaTestClassBuilderImpl();
}
private static class FileSchemaTestClassBuilderImpl extends FileSchemaTestClassBuilder<FileSchemaTestClass, FileSchemaTestClassBuilderImpl> {
private static final class FileSchemaTestClassBuilderImpl extends FileSchemaTestClassBuilder<FileSchemaTestClass, FileSchemaTestClassBuilderImpl> {
@Override
protected FileSchemaTestClassBuilderImpl self() {
@ -146,7 +146,7 @@ public class FileSchemaTestClass implements Serializable {
public static abstract class FileSchemaTestClassBuilder<C extends FileSchemaTestClass, B extends FileSchemaTestClassBuilder<C, B>> {
private ModelFile _file;
private List<@Valid ModelFile> files = new ArrayList<>();
private List<ModelFile> files = new ArrayList<>();
protected abstract B self();
public abstract C build();
@ -155,7 +155,7 @@ public class FileSchemaTestClass implements Serializable {
this._file = _file;
return self();
}
public B files(List<@Valid ModelFile> files) {
public B files(List<ModelFile> files) {
this.files = files;
return self();
}

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -417,7 +417,7 @@ public class FormatTest implements Serializable {
return new FormatTestBuilderImpl();
}
private static class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
private static final class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
@Override
protected FormatTestBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
View File

@ -112,7 +112,7 @@ public class HasOnlyReadOnly implements Serializable {
return new HasOnlyReadOnlyBuilderImpl();
}
private static class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
private static final class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
@Override
protected HasOnlyReadOnlyBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MapTest.java
View File

@ -270,7 +270,7 @@ public class MapTest implements Serializable {
return new MapTestBuilderImpl();
}
private static class MapTestBuilderImpl extends MapTestBuilder<MapTest, MapTestBuilderImpl> {
private static final class MapTestBuilderImpl extends MapTestBuilder<MapTest, MapTestBuilderImpl> {
@Override
protected MapTestBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -155,7 +155,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl
return new MixedPropertiesAndAdditionalPropertiesClassBuilderImpl();
}
private static class MixedPropertiesAndAdditionalPropertiesClassBuilderImpl extends MixedPropertiesAndAdditionalPropertiesClassBuilder<MixedPropertiesAndAdditionalPropertiesClass, MixedPropertiesAndAdditionalPropertiesClassBuilderImpl> {
private static final class MixedPropertiesAndAdditionalPropertiesClassBuilderImpl extends MixedPropertiesAndAdditionalPropertiesClassBuilder<MixedPropertiesAndAdditionalPropertiesClass, MixedPropertiesAndAdditionalPropertiesClassBuilderImpl> {
@Override
protected MixedPropertiesAndAdditionalPropertiesClassBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Model200Response.java
View File

@ -114,7 +114,7 @@ public class Model200Response implements Serializable {
return new Model200ResponseBuilderImpl();
}
private static class Model200ResponseBuilderImpl extends Model200ResponseBuilder<Model200Response, Model200ResponseBuilderImpl> {
private static final class Model200ResponseBuilderImpl extends Model200ResponseBuilder<Model200Response, Model200ResponseBuilderImpl> {
@Override
protected Model200ResponseBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelApiResponse.java
View File

@ -135,7 +135,7 @@ public class ModelApiResponse implements Serializable {
return new ModelApiResponseBuilderImpl();
}
private static class ModelApiResponseBuilderImpl extends ModelApiResponseBuilder<ModelApiResponse, ModelApiResponseBuilderImpl> {
private static final class ModelApiResponseBuilderImpl extends ModelApiResponseBuilder<ModelApiResponse, ModelApiResponseBuilderImpl> {
@Override
protected ModelApiResponseBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelFile.java
View File

@ -92,7 +92,7 @@ public class ModelFile implements Serializable {
return new ModelFileBuilderImpl();
}
private static class ModelFileBuilderImpl extends ModelFileBuilder<ModelFile, ModelFileBuilderImpl> {
private static final class ModelFileBuilderImpl extends ModelFileBuilder<ModelFile, ModelFileBuilderImpl> {
@Override
protected ModelFileBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelList.java
View File

@ -89,7 +89,7 @@ public class ModelList implements Serializable {
return new ModelListBuilderImpl();
}
private static class ModelListBuilderImpl extends ModelListBuilder<ModelList, ModelListBuilderImpl> {
private static final class ModelListBuilderImpl extends ModelListBuilder<ModelList, ModelListBuilderImpl> {
@Override
protected ModelListBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ModelReturn.java
View File

@ -91,7 +91,7 @@ public class ModelReturn implements Serializable {
return new ModelReturnBuilderImpl();
}
private static class ModelReturnBuilderImpl extends ModelReturnBuilder<ModelReturn, ModelReturnBuilderImpl> {
private static final class ModelReturnBuilderImpl extends ModelReturnBuilder<ModelReturn, ModelReturnBuilderImpl> {
@Override
protected ModelReturnBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Name.java
View File

@ -166,7 +166,7 @@ public class Name implements Serializable {
return new NameBuilderImpl();
}
private static class NameBuilderImpl extends NameBuilder<Name, NameBuilderImpl> {
private static final class NameBuilderImpl extends NameBuilder<Name, NameBuilderImpl> {
@Override
protected NameBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/NumberOnly.java
View File

@ -89,7 +89,7 @@ public class NumberOnly implements Serializable {
return new NumberOnlyBuilderImpl();
}
private static class NumberOnlyBuilderImpl extends NumberOnlyBuilder<NumberOnly, NumberOnlyBuilderImpl> {
private static final class NumberOnlyBuilderImpl extends NumberOnlyBuilder<NumberOnly, NumberOnlyBuilderImpl> {
@Override
protected NumberOnlyBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Order.java
View File

@ -252,7 +252,7 @@ public class Order implements Serializable {
return new OrderBuilderImpl();
}
private static class OrderBuilderImpl extends OrderBuilder<Order, OrderBuilderImpl> {
private static final class OrderBuilderImpl extends OrderBuilder<Order, OrderBuilderImpl> {
@Override
protected OrderBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/OuterComposite.java
View File

@ -135,7 +135,7 @@ public class OuterComposite implements Serializable {
return new OuterCompositeBuilderImpl();
}
private static class OuterCompositeBuilderImpl extends OuterCompositeBuilder<OuterComposite, OuterCompositeBuilderImpl> {
private static final class OuterCompositeBuilderImpl extends OuterCompositeBuilder<OuterComposite, OuterCompositeBuilderImpl> {
@Override
protected OuterCompositeBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Pet.java
View File

@ -301,7 +301,7 @@ public class Pet implements Serializable {
return new PetBuilderImpl();
}
private static class PetBuilderImpl extends PetBuilder<Pet, PetBuilderImpl> {
private static final class PetBuilderImpl extends PetBuilder<Pet, PetBuilderImpl> {
@Override
protected PetBuilderImpl self() {
@ -319,7 +319,7 @@ public class Pet implements Serializable {
private Category category;
private String name;
private Set<String> photoUrls = new LinkedHashSet<>();
private List<@Valid Tag> tags = new ArrayList<>();
private List<Tag> tags = new ArrayList<>();
private StatusEnum status;
protected abstract B self();
@ -341,7 +341,7 @@ public class Pet implements Serializable {
this.photoUrls = photoUrls;
return self();
}
public B tags(List<@Valid Tag> tags) {
public B tags(List<Tag> tags) {
this.tags = tags;
return self();
}

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
View File

@ -111,7 +111,7 @@ public class ReadOnlyFirst implements Serializable {
return new ReadOnlyFirstBuilderImpl();
}
private static class ReadOnlyFirstBuilderImpl extends ReadOnlyFirstBuilder<ReadOnlyFirst, ReadOnlyFirstBuilderImpl> {
private static final class ReadOnlyFirstBuilderImpl extends ReadOnlyFirstBuilder<ReadOnlyFirst, ReadOnlyFirstBuilderImpl> {
@Override
protected ReadOnlyFirstBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/SpecialModelName.java
View File

@ -89,7 +89,7 @@ public class SpecialModelName implements Serializable {
return new SpecialModelNameBuilderImpl();
}
private static class SpecialModelNameBuilderImpl extends SpecialModelNameBuilder<SpecialModelName, SpecialModelNameBuilderImpl> {
private static final class SpecialModelNameBuilderImpl extends SpecialModelNameBuilder<SpecialModelName, SpecialModelNameBuilderImpl> {
@Override
protected SpecialModelNameBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/Tag.java
View File

@ -111,7 +111,7 @@ public class Tag implements Serializable {
return new TagBuilderImpl();
}
private static class TagBuilderImpl extends TagBuilder<Tag, TagBuilderImpl> {
private static final class TagBuilderImpl extends TagBuilder<Tag, TagBuilderImpl> {
@Override
protected TagBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderDefault.java
View File

@ -215,7 +215,7 @@ public class TypeHolderDefault implements Serializable {
return new TypeHolderDefaultBuilderImpl();
}
private static class TypeHolderDefaultBuilderImpl extends TypeHolderDefaultBuilder<TypeHolderDefault, TypeHolderDefaultBuilderImpl> {
private static final class TypeHolderDefaultBuilderImpl extends TypeHolderDefaultBuilder<TypeHolderDefault, TypeHolderDefaultBuilderImpl> {
@Override
protected TypeHolderDefaultBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/TypeHolderExample.java
View File

@ -240,7 +240,7 @@ public class TypeHolderExample implements Serializable {
return new TypeHolderExampleBuilderImpl();
}
private static class TypeHolderExampleBuilderImpl extends TypeHolderExampleBuilder<TypeHolderExample, TypeHolderExampleBuilderImpl> {
private static final class TypeHolderExampleBuilderImpl extends TypeHolderExampleBuilder<TypeHolderExample, TypeHolderExampleBuilderImpl> {
@Override
protected TypeHolderExampleBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/User.java
View File

@ -250,7 +250,7 @@ public class User implements Serializable {
return new UserBuilderImpl();
}
private static class UserBuilderImpl extends UserBuilder<User, UserBuilderImpl> {
private static final class UserBuilderImpl extends UserBuilder<User, UserBuilderImpl> {
@Override
protected UserBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/XmlItem.java
View File

@ -880,7 +880,7 @@ public class XmlItem implements Serializable {
return new XmlItemBuilderImpl();
}
private static class XmlItemBuilderImpl extends XmlItemBuilder<XmlItem, XmlItemBuilderImpl> {
private static final class XmlItemBuilderImpl extends XmlItemBuilder<XmlItem, XmlItemBuilderImpl> {
@Override
protected XmlItemBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View File

@ -145,7 +145,7 @@ public class AdditionalPropertiesClass implements Serializable {
return new AdditionalPropertiesClassBuilderImpl();
}
private static class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
private static final class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
@Override
protected AdditionalPropertiesClassBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java
View File

@ -112,7 +112,7 @@ public class AllOfWithSingleRef implements Serializable {
return new AllOfWithSingleRefBuilderImpl();
}
private static class AllOfWithSingleRefBuilderImpl extends AllOfWithSingleRefBuilder<AllOfWithSingleRef, AllOfWithSingleRefBuilderImpl> {
private static final class AllOfWithSingleRefBuilderImpl extends AllOfWithSingleRefBuilder<AllOfWithSingleRef, AllOfWithSingleRefBuilderImpl> {
@Override
protected AllOfWithSingleRefBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Animal.java
View File

@ -126,7 +126,7 @@ public class Animal implements Serializable {
return new AnimalBuilderImpl();
}
private static class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
private static final class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
@Override
protected AnimalBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
View File

@ -108,7 +108,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable {
return new ArrayOfArrayOfNumberOnlyBuilderImpl();
}
private static class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
private static final class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
@Override
protected ArrayOfArrayOfNumberOnlyBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
View File

@ -108,7 +108,7 @@ public class ArrayOfNumberOnly implements Serializable {
return new ArrayOfNumberOnlyBuilderImpl();
}
private static class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
private static final class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
@Override
protected ArrayOfNumberOnlyBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ArrayTest.java
View File

@ -186,7 +186,7 @@ public class ArrayTest implements Serializable {
return new ArrayTestBuilderImpl();
}
private static class ArrayTestBuilderImpl extends ArrayTestBuilder<ArrayTest, ArrayTestBuilderImpl> {
private static final class ArrayTestBuilderImpl extends ArrayTestBuilder<ArrayTest, ArrayTestBuilderImpl> {
@Override
protected ArrayTestBuilderImpl self() {
@ -202,7 +202,7 @@ public class ArrayTest implements Serializable {
public static abstract class ArrayTestBuilder<C extends ArrayTest, B extends ArrayTestBuilder<C, B>> {
private List<String> arrayOfString = new ArrayList<>();
private List<List<Long>> arrayArrayOfInteger = new ArrayList<>();
private List<List<@Valid ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
protected abstract B self();
public abstract C build();
@ -215,7 +215,7 @@ public class ArrayTest implements Serializable {
this.arrayArrayOfInteger = arrayArrayOfInteger;
return self();
}
public B arrayArrayOfModel(List<List<@Valid ReadOnlyFirst>> arrayArrayOfModel) {
public B arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
this.arrayArrayOfModel = arrayArrayOfModel;
return self();
}

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Capitalization.java
View File

@ -204,7 +204,7 @@ public class Capitalization implements Serializable {
return new CapitalizationBuilderImpl();
}
private static class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
private static final class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
@Override
protected CapitalizationBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Cat.java
View File

@ -100,7 +100,7 @@ public class Cat extends Animal implements Serializable {
return new CatBuilderImpl();
}
private static class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
private static final class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
@Override
protected CatBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Category.java
View File

@ -118,7 +118,7 @@ public class Category implements Serializable {
return new CategoryBuilderImpl();
}
private static class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
private static final class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
@Override
protected CategoryBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ChildWithNullable.java
View File

@ -92,7 +92,7 @@ public class ChildWithNullable extends ParentWithNullable implements Serializabl
return new ChildWithNullableBuilderImpl();
}
private static class ChildWithNullableBuilderImpl extends ChildWithNullableBuilder<ChildWithNullable, ChildWithNullableBuilderImpl> {
private static final class ChildWithNullableBuilderImpl extends ChildWithNullableBuilder<ChildWithNullable, ChildWithNullableBuilderImpl> {
@Override
protected ChildWithNullableBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ClassModel.java
View File

@ -90,7 +90,7 @@ public class ClassModel implements Serializable {
return new ClassModelBuilderImpl();
}
private static class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
private static final class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
@Override
protected ClassModelBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Client.java
View File

@ -88,7 +88,7 @@ public class Client implements Serializable {
return new ClientBuilderImpl();
}
private static class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
private static final class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
@Override
protected ClientBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/DeprecatedObject.java
View File

@ -88,7 +88,7 @@ public class DeprecatedObject implements Serializable {
return new DeprecatedObjectBuilderImpl();
}
private static class DeprecatedObjectBuilderImpl extends DeprecatedObjectBuilder<DeprecatedObject, DeprecatedObjectBuilderImpl> {
private static final class DeprecatedObjectBuilderImpl extends DeprecatedObjectBuilder<DeprecatedObject, DeprecatedObjectBuilderImpl> {
@Override
protected DeprecatedObjectBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Dog.java
View File

@ -100,7 +100,7 @@ public class Dog extends Animal implements Serializable {
return new DogBuilderImpl();
}
private static class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
private static final class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
@Override
protected DogBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/EnumArrays.java
View File

@ -224,7 +224,7 @@ public class EnumArrays implements Serializable {
return new EnumArraysBuilderImpl();
}
private static class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
private static final class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
@Override
protected EnumArraysBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/EnumTest.java
View File

@ -450,7 +450,7 @@ public class EnumTest implements Serializable {
return new EnumTestBuilderImpl();
}
private static class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
private static final class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
@Override
protected EnumTestBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java
View File

@ -131,7 +131,7 @@ public class FakeBigDecimalMap200Response implements Serializable {
return new FakeBigDecimalMap200ResponseBuilderImpl();
}
private static class FakeBigDecimalMap200ResponseBuilderImpl extends FakeBigDecimalMap200ResponseBuilder<FakeBigDecimalMap200Response, FakeBigDecimalMap200ResponseBuilderImpl> {
private static final class FakeBigDecimalMap200ResponseBuilderImpl extends FakeBigDecimalMap200ResponseBuilder<FakeBigDecimalMap200Response, FakeBigDecimalMap200ResponseBuilderImpl> {
@Override
protected FakeBigDecimalMap200ResponseBuilderImpl self() {

6
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
View File

@ -131,7 +131,7 @@ public class FileSchemaTestClass implements Serializable {
return new FileSchemaTestClassBuilderImpl();
}
private static class FileSchemaTestClassBuilderImpl extends FileSchemaTestClassBuilder<FileSchemaTestClass, FileSchemaTestClassBuilderImpl> {
private static final class FileSchemaTestClassBuilderImpl extends FileSchemaTestClassBuilder<FileSchemaTestClass, FileSchemaTestClassBuilderImpl> {
@Override
protected FileSchemaTestClassBuilderImpl self() {
@ -146,7 +146,7 @@ public class FileSchemaTestClass implements Serializable {
public static abstract class FileSchemaTestClassBuilder<C extends FileSchemaTestClass, B extends FileSchemaTestClassBuilder<C, B>> {
private ModelFile _file;
private List<@Valid ModelFile> files = new ArrayList<>();
private List<ModelFile> files = new ArrayList<>();
protected abstract B self();
public abstract C build();
@ -155,7 +155,7 @@ public class FileSchemaTestClass implements Serializable {
this._file = _file;
return self();
}
public B files(List<@Valid ModelFile> files) {
public B files(List<ModelFile> files) {
this.files = files;
return self();
}

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/Foo.java
View File

@ -88,7 +88,7 @@ public class Foo implements Serializable {
return new FooBuilderImpl();
}
private static class FooBuilderImpl extends FooBuilder<Foo, FooBuilderImpl> {
private static final class FooBuilderImpl extends FooBuilder<Foo, FooBuilderImpl> {
@Override
protected FooBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
View File

@ -90,7 +90,7 @@ public class FooGetDefaultResponse implements Serializable {
return new FooGetDefaultResponseBuilderImpl();
}
private static class FooGetDefaultResponseBuilderImpl extends FooGetDefaultResponseBuilder<FooGetDefaultResponse, FooGetDefaultResponseBuilderImpl> {
private static final class FooGetDefaultResponseBuilderImpl extends FooGetDefaultResponseBuilder<FooGetDefaultResponse, FooGetDefaultResponseBuilderImpl> {
@Override
protected FooGetDefaultResponseBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -465,7 +465,7 @@ public class FormatTest implements Serializable {
return new FormatTestBuilderImpl();
}
private static class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
private static final class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
@Override
protected FormatTestBuilderImpl self() {

2
samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
View File

@ -112,7 +112,7 @@ public class HasOnlyReadOnly implements Serializable {
return new HasOnlyReadOnlyBuilderImpl();
}
private static class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
private static final class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
@Override
protected HasOnlyReadOnlyBuilderImpl self() {

Some files were not shown because too many files have changed in this diff Show More