Skip to content

Commit 94f35d2

Browse files
arjantijmsarjantijms
committed
Updated JAX-RS client validation sample to be more compatible
1 parent c715338 commit 94f35d2

11 files changed

Lines changed: 114 additions & 107 deletions

File tree

‎jaxrs/jaxrs-client/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<groupId>org.javaee7</groupId>
77
<artifactId>jaxrs</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
109
</parent>
10+
1111
<artifactId>jaxrs-jaxrs-client</artifactId>
1212
<packaging>war</packaging>
1313
<name>Java EE 7 Sample: jaxrs - jaxrs-client</name>
14+
1415
</project>

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Email.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,17 @@
3939
*/
4040
package org.javaee7.jaxrs.resource.validation;
4141

42+
import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
43+
import static java.lang.annotation.ElementType.CONSTRUCTOR;
44+
import static java.lang.annotation.ElementType.FIELD;
45+
import static java.lang.annotation.ElementType.METHOD;
46+
import static java.lang.annotation.ElementType.PARAMETER;
47+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
48+
4249
import java.lang.annotation.Documented;
43-
import java.lang.annotation.ElementType;
4450
import java.lang.annotation.Retention;
45-
import java.lang.annotation.RetentionPolicy;
4651
import java.lang.annotation.Target;
52+
4753
import javax.validation.Constraint;
4854
import javax.validation.Payload;
4955
import javax.validation.constraints.NotNull;
@@ -53,12 +59,8 @@
5359
* @author Arun Gupta
5460
*/
5561
@Documented
56-
@Target({ ElementType.ANNOTATION_TYPE,
57-
ElementType.METHOD,
58-
ElementType.FIELD,
59-
ElementType.CONSTRUCTOR,
60-
ElementType.PARAMETER })
61-
@Retention(RetentionPolicy.RUNTIME)
62+
@Target({ ANNOTATION_TYPE, METHOD, FIELD, CONSTRUCTOR, PARAMETER })
63+
@Retention(RUNTIME)
6264
@Constraint(validatedBy = EmailValidator.class)
6365
@Size(min = 5, message = "{org.javaee7.jaxrs.resource_validation.min_size}")
6466
@NotNull(message = "{org.javaee7.jaxrs.resource_validation.cannot_be_null}")

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/EmailValidator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
/**
4646
* @author Arun Gupta
4747
*/
48-
public class EmailValidator
49-
implements ConstraintValidator<Email, String> {
48+
public class EmailValidator implements ConstraintValidator<Email, String> {
5049

5150
@Override
5251
public void initialize(Email constraintAnnotation) {

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Name.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,33 @@
3939
*/
4040
package org.javaee7.jaxrs.resource.validation;
4141

42+
import static javax.xml.bind.annotation.XmlAccessType.FIELD;
43+
4244
import javax.validation.constraints.NotNull;
4345
import javax.validation.constraints.Size;
46+
import javax.xml.bind.annotation.XmlAccessorType;
47+
import javax.xml.bind.annotation.XmlElement;
4448
import javax.xml.bind.annotation.XmlRootElement;
4549

4650
/**
4751
* @author Arun Gupta
4852
*/
4953
@XmlRootElement
54+
@XmlAccessorType(FIELD)
5055
public class Name {
5156

5257
@NotNull
5358
@Size(min = 1)
59+
@XmlElement(required = true)
5460
private String firstName;
5561

5662
@NotNull
5763
@Size(min = 1)
64+
@XmlElement(required = true)
5865
private String lastName;
5966

6067
@Email
68+
@XmlElement(required = true)
6169
private String email;
6270

6371
public Name() {
@@ -69,6 +77,18 @@ public Name(String firstName, String lastName, String email) {
6977
this.email = email;
7078
}
7179

80+
public void setFirstName(String firstName) {
81+
this.firstName = firstName;
82+
}
83+
84+
public void setLastName(String lastName) {
85+
this.lastName = lastName;
86+
}
87+
88+
public void setEmail(String email) {
89+
this.email = email;
90+
}
91+
7292
public String getFirstName() {
7393
return firstName;
7494
}

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameAddResource.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
*/
4040
package org.javaee7.jaxrs.resource.validation;
4141

42+
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
43+
4244
import javax.validation.Valid;
4345
import javax.ws.rs.Consumes;
4446
import javax.ws.rs.POST;
@@ -53,7 +55,7 @@ public class NameAddResource {
5355
static final String PATH = "/nameadd";
5456

5557
@POST
56-
@Consumes("application/json")
58+
@Consumes(APPLICATION_XML)
5759
public String addUser(@Valid Name name) {
5860
return name.getFirstName() + " " + name.getLastName() + " with email " + name.getEmail() + " added";
5961
}

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void setEmail(@Email String email) {
6969
this.email = email;
7070
}
7171

72-
// @Email
72+
// @Email
7373
public String getEmail() {
7474
return email;
7575
}

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource2.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ public class NameResource2 {
5353

5454
@POST
5555
@Consumes("application/x-www-form-urlencoded")
56-
public String registerUser(@NotNull @FormParam("firstName") String firstName,
57-
@NotNull @FormParam("lastName") String lastName,
58-
@Email @FormParam("email") String email) {
56+
public String registerUser(
57+
@NotNull @FormParam("firstName") String firstName,
58+
@NotNull @FormParam("lastName") String lastName,
59+
@Email @FormParam("email") String email) {
60+
5961
return firstName + " " + lastName + " with email " + email + " registered";
6062
}
6163

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource3.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void setEmail(@Email String email) {
6464
this.email = email;
6565
}
6666

67-
// @Email
67+
// @Email
6868
public String getEmail() {
6969
return email;
7070
}

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NotNullAndNonEmptyNames.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,14 @@
3939
*/
4040
package org.javaee7.jaxrs.resource.validation;
4141

42+
import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
43+
import static java.lang.annotation.ElementType.TYPE;
44+
import static java.lang.annotation.RetentionPolicy.RUNTIME;
45+
4246
import java.lang.annotation.Documented;
43-
import java.lang.annotation.ElementType;
4447
import java.lang.annotation.Retention;
45-
import java.lang.annotation.RetentionPolicy;
4648
import java.lang.annotation.Target;
49+
4750
import javax.validation.Constraint;
4851
import javax.validation.Payload;
4952
import javax.validation.constraints.NotNull;
@@ -53,9 +56,8 @@
5356
* @author Arun Gupta
5457
*/
5558
@Documented
56-
@Target({ ElementType.ANNOTATION_TYPE,
57-
ElementType.TYPE })
58-
@Retention(RetentionPolicy.RUNTIME)
59+
@Target({ ANNOTATION_TYPE, TYPE })
60+
@Retention(RUNTIME)
5961
@Constraint(validatedBy = EmailValidator.class)
6062
@Size(min = 1, message = "{org.javaee7.jaxrs.resource_validation.min_size}")
6163
@NotNull(message = "{org.javaee7.jaxrs.resource_validation.cannot_be_null}")

‎jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/TestServlet.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import java.io.PrintWriter;
4444
import java.util.ArrayList;
4545
import java.util.List;
46+
4647
import javax.servlet.ServletException;
4748
import javax.servlet.annotation.WebServlet;
4849
import javax.servlet.http.HttpServlet;
@@ -61,6 +62,8 @@
6162
@WebServlet(urlPatterns = { "/TestServlet" })
6263
public class TestServlet extends HttpServlet {
6364

65+
private static final long serialVersionUID = 8732053426774472750L;
66+
6467
/**
6568
* Processes requests for both HTTP <code>GET</code> and <code>POST</code>
6669
* methods.

0 commit comments

Comments
 (0)