[Java] Remove bean validation annotations on builder

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

@@ -657,6 +657,9 @@ public void processOpts() {
             }
             writer.write(content);
         });
+        additionalProperties.put("removeAnnotations", (Mustache.Lambda) (fragment, writer) -> {
+            writer.write(removeAnnotations(fragment.execute()));
+        });
     }
 
     /**
@@ -1802,18 +1805,16 @@ public void postProcessResponseWithProperty(CodegenResponse response, CodegenPro
             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*))*+", "");
+    private String removeAnnotations(String dataType) {
+        if (dataType != null && dataType.contains("@")) {
+            return dataType.replaceAll("(?:(?i)@[a-z0-9]*+([(].*[)]|\\s*))*+", "");
+        }
+        return dataType;
     }
 
     @Override

modules/openapi-generator/src/main/resources/Java/javaBuilder.mustache

@@ -14,30 +14,30 @@ 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}};
     {{/vendorExtensions.x-is-jackson-optional-nullable}}
       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;
     }
     {{/vendorExtensions.x-is-jackson-optional-nullable}}
     {{/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;
     }

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache

@@ -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();
     }

modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache

@@ -24,25 +24,25 @@
     {{#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;
     }
     {{/isNullable}}{{/openApiNullable}}
 {{/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;
     }

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

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

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

@@ -452,7 +452,7 @@ private String toIndentedString(Object o) {
     return new AdditionalPropertiesClassBuilderImpl();
   }
 
-  private static class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
+  private static final class AdditionalPropertiesClassBuilderImpl extends AdditionalPropertiesClassBuilder<AdditionalPropertiesClass, AdditionalPropertiesClassBuilderImpl> {
 
     @Override
     protected AdditionalPropertiesClassBuilderImpl self() {

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

@@ -129,7 +129,7 @@ private String toIndentedString(Object o) {
     return new AnimalBuilderImpl();
   }
 
-  private static class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
+  private static final class AnimalBuilderImpl extends AnimalBuilder<Animal, AnimalBuilderImpl> {
 
     @Override
     protected AnimalBuilderImpl self() {

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

@@ -110,7 +110,7 @@ private String toIndentedString(Object o) {
     return new ArrayOfArrayOfNumberOnlyBuilderImpl();
   }
 
-  private static class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
+  private static final class ArrayOfArrayOfNumberOnlyBuilderImpl extends ArrayOfArrayOfNumberOnlyBuilder<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilderImpl> {
 
     @Override
     protected ArrayOfArrayOfNumberOnlyBuilderImpl self() {

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

@@ -110,7 +110,7 @@ private String toIndentedString(Object o) {
     return new ArrayOfNumberOnlyBuilderImpl();
   }
 
-  private static class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
+  private static final class ArrayOfNumberOnlyBuilderImpl extends ArrayOfNumberOnlyBuilder<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilderImpl> {
 
     @Override
     protected ArrayOfNumberOnlyBuilderImpl self() {

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

@@ -188,7 +188,7 @@ private String toIndentedString(Object o) {
     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 ArrayTest build() {
   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 B arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
       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();
     }

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

@@ -149,7 +149,7 @@ private String toIndentedString(Object o) {
     return new BigCatBuilderImpl();
   }
 
-  private static class BigCatBuilderImpl extends BigCatBuilder<BigCat, BigCatBuilderImpl> {
+  private static final class BigCatBuilderImpl extends BigCatBuilder<BigCat, BigCatBuilderImpl> {
 
     @Override
     protected BigCatBuilderImpl self() {

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

@@ -206,7 +206,7 @@ private String toIndentedString(Object o) {
     return new CapitalizationBuilderImpl();
   }
 
-  private static class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
+  private static final class CapitalizationBuilderImpl extends CapitalizationBuilder<Capitalization, CapitalizationBuilderImpl> {
 
     @Override
     protected CapitalizationBuilderImpl self() {

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

@@ -102,7 +102,7 @@ private String toIndentedString(Object o) {
     return new CatBuilderImpl();
   }
 
-  private static class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
+  private static final class CatBuilderImpl extends CatBuilder<Cat, CatBuilderImpl> {
 
     @Override
     protected CatBuilderImpl self() {

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

@@ -120,7 +120,7 @@ private String toIndentedString(Object o) {
     return new CategoryBuilderImpl();
   }
 
-  private static class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
+  private static final class CategoryBuilderImpl extends CategoryBuilder<Category, CategoryBuilderImpl> {
 
     @Override
     protected CategoryBuilderImpl self() {

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

@@ -92,7 +92,7 @@ private String toIndentedString(Object o) {
     return new ClassModelBuilderImpl();
   }
 
-  private static class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
+  private static final class ClassModelBuilderImpl extends ClassModelBuilder<ClassModel, ClassModelBuilderImpl> {
 
     @Override
     protected ClassModelBuilderImpl self() {

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

@@ -90,7 +90,7 @@ private String toIndentedString(Object o) {
     return new ClientBuilderImpl();
   }
 
-  private static class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
+  private static final class ClientBuilderImpl extends ClientBuilder<Client, ClientBuilderImpl> {
 
     @Override
     protected ClientBuilderImpl self() {

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

@@ -102,7 +102,7 @@ private String toIndentedString(Object o) {
     return new DogBuilderImpl();
   }
 
-  private static class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
+  private static final class DogBuilderImpl extends DogBuilder<Dog, DogBuilderImpl> {
 
     @Override
     protected DogBuilderImpl self() {

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

@@ -226,7 +226,7 @@ private String toIndentedString(Object o) {
     return new EnumArraysBuilderImpl();
   }
 
-  private static class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
+  private static final class EnumArraysBuilderImpl extends EnumArraysBuilder<EnumArrays, EnumArraysBuilderImpl> {
 
     @Override
     protected EnumArraysBuilderImpl self() {

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

@@ -379,7 +379,7 @@ private String toIndentedString(Object o) {
     return new EnumTestBuilderImpl();
   }
 
-  private static class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
+  private static final class EnumTestBuilderImpl extends EnumTestBuilder<EnumTest, EnumTestBuilderImpl> {
 
     @Override
     protected EnumTestBuilderImpl self() {

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

@@ -133,7 +133,7 @@ private String toIndentedString(Object o) {
     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 FileSchemaTestClass build() {
 
   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 B _file(ModelFile _file) {
       this._file = _file;
       return self();
     }
-    public B files(List<@Valid ModelFile> files) {
+    public B files(List<ModelFile> files) {
       this.files = files;
       return self();
     }

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

@@ -419,7 +419,7 @@ private String toIndentedString(Object o) {
     return new FormatTestBuilderImpl();
   }
 
-  private static class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
+  private static final class FormatTestBuilderImpl extends FormatTestBuilder<FormatTest, FormatTestBuilderImpl> {
 
     @Override
     protected FormatTestBuilderImpl self() {

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

@@ -114,7 +114,7 @@ private String toIndentedString(Object o) {
     return new HasOnlyReadOnlyBuilderImpl();
   }
 
-  private static class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
+  private static final class HasOnlyReadOnlyBuilderImpl extends HasOnlyReadOnlyBuilder<HasOnlyReadOnly, HasOnlyReadOnlyBuilderImpl> {
 
     @Override
     protected HasOnlyReadOnlyBuilderImpl self() {

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

@@ -272,7 +272,7 @@ private String toIndentedString(Object o) {
     return new MapTestBuilderImpl();
   }
 
-  private static class MapTestBuilderImpl extends MapTestBuilder<MapTest, MapTestBuilderImpl> {
+  private static final class MapTestBuilderImpl extends MapTestBuilder<MapTest, MapTestBuilderImpl> {
 
     @Override
     protected MapTestBuilderImpl self() {

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

@@ -157,7 +157,7 @@ private String toIndentedString(Object o) {
     return new MixedPropertiesAndAdditionalPropertiesClassBuilderImpl();
   }
 
-  private static class MixedPropertiesAndAdditionalPropertiesClassBuilderImpl extends MixedPropertiesAndAdditionalPropertiesClassBuilder<MixedPropertiesAndAdditionalPropertiesClass, MixedPropertiesAndAdditionalPropertiesClassBuilderImpl> {
+  private static final class MixedPropertiesAndAdditionalPropertiesClassBuilderImpl extends MixedPropertiesAndAdditionalPropertiesClassBuilder<MixedPropertiesAndAdditionalPropertiesClass, MixedPropertiesAndAdditionalPropertiesClassBuilderImpl> {
 
     @Override
     protected MixedPropertiesAndAdditionalPropertiesClassBuilderImpl self() {

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

@@ -116,7 +116,7 @@ private String toIndentedString(Object o) {
     return new Model200ResponseBuilderImpl();
   }
 
-  private static class Model200ResponseBuilderImpl extends Model200ResponseBuilder<Model200Response, Model200ResponseBuilderImpl> {
+  private static final class Model200ResponseBuilderImpl extends Model200ResponseBuilder<Model200Response, Model200ResponseBuilderImpl> {
 
     @Override
     protected Model200ResponseBuilderImpl self() {

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

@@ -137,7 +137,7 @@ private String toIndentedString(Object o) {
     return new ModelApiResponseBuilderImpl();
   }
 
-  private static class ModelApiResponseBuilderImpl extends ModelApiResponseBuilder<ModelApiResponse, ModelApiResponseBuilderImpl> {
+  private static final class ModelApiResponseBuilderImpl extends ModelApiResponseBuilder<ModelApiResponse, ModelApiResponseBuilderImpl> {
 
     @Override
     protected ModelApiResponseBuilderImpl self() {

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

@@ -94,7 +94,7 @@ private String toIndentedString(Object o) {
     return new ModelFileBuilderImpl();
   }
 
-  private static class ModelFileBuilderImpl extends ModelFileBuilder<ModelFile, ModelFileBuilderImpl> {
+  private static final class ModelFileBuilderImpl extends ModelFileBuilder<ModelFile, ModelFileBuilderImpl> {
 
     @Override
     protected ModelFileBuilderImpl self() {

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

@@ -91,7 +91,7 @@ private String toIndentedString(Object o) {
     return new ModelListBuilderImpl();
   }
 
-  private static class ModelListBuilderImpl extends ModelListBuilder<ModelList, ModelListBuilderImpl> {
+  private static final class ModelListBuilderImpl extends ModelListBuilder<ModelList, ModelListBuilderImpl> {
 
     @Override
     protected ModelListBuilderImpl self() {

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

@@ -93,7 +93,7 @@ private String toIndentedString(Object o) {
     return new ModelReturnBuilderImpl();
   }
 
-  private static class ModelReturnBuilderImpl extends ModelReturnBuilder<ModelReturn, ModelReturnBuilderImpl> {
+  private static final class ModelReturnBuilderImpl extends ModelReturnBuilder<ModelReturn, ModelReturnBuilderImpl> {
 
     @Override
     protected ModelReturnBuilderImpl self() {

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

@@ -168,7 +168,7 @@ private String toIndentedString(Object o) {
     return new NameBuilderImpl();
   }
 
-  private static class NameBuilderImpl extends NameBuilder<Name, NameBuilderImpl> {
+  private static final class NameBuilderImpl extends NameBuilder<Name, NameBuilderImpl> {
 
     @Override
     protected NameBuilderImpl self() {