Add Email bean validation annotation for "format":"email"

Closes #954
joelittlejohn · Feb 4, 2023 · 35c3e57 · 35c3e57
1 parent d2f8dea
commit 35c3e57
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertyRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertyRule.java
@@ -16,6 +16,7 @@
 
 package org.jsonschema2pojo.rules;
 
+import jakarta.validation.constraints.Email;
 import org.apache.commons.lang.StringUtils;
 import org.jsonschema2pojo.GenerationConfig;
 import org.jsonschema2pojo.JsonPointerUtils;
@@ -201,6 +202,12 @@ private void formatAnnotation(JFieldVar field, JDefinedClass clazz, JsonNode nod
             ruleFactory.getAnnotator().dateField(field, clazz, node);
         } else if ("time".equalsIgnoreCase(format)) {
             ruleFactory.getAnnotator().timeField(field, clazz, node);
+        } else if ("email".equalsIgnoreCase(format) && ruleFactory.getGenerationConfig().isIncludeJsr303Annotations()) {
+            if (ruleFactory.getGenerationConfig().isUseJakartaValidation()) {
+                field.annotate(jakarta.validation.constraints.Email.class);
+            } else {
+                field.annotate(javax.validation.constraints.Email.class);
+            }
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -307,7 +307,7 @@
             <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
-                <version>1.1.0.Final</version>
+                <version>2.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.validation</groupId>