Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch manual validation to automatic #28

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Switch manual validation to automatic #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/java/io/openliberty/sample/application/CrewMembers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,23 @@
import java.util.List;
import java.util.stream.Stream;

import jakarta.data.repository.BasicRepository;
import jakarta.data.repository.DataRepository;
import jakarta.data.repository.OrderBy;
import jakarta.data.repository.Repository;
import jakarta.data.repository.Save;
import jakarta.validation.Valid;

@Repository
public interface CrewMembers extends BasicRepository<CrewMember, String> {
public interface CrewMembers extends DataRepository<CrewMember, String> {
@Save
CrewMember save(@Valid CrewMember m);

List<CrewMember> findByRank(Rank rank);

@OrderBy("name")
Stream<CrewMember> findAll();

void deleteByCrewID(String crewID);

void deleteAll();
}
16 changes: 6 additions & 10 deletions src/main/java/io/openliberty/sample/application/CrewService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonObject;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.Validator;
import jakarta.validation.ConstraintViolationException;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
Expand All @@ -35,26 +35,22 @@ public class CrewService {
@Inject
CrewMembers crewMembers;

@Inject
Validator validator;

@POST
@Path("/{id}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public String add(CrewMember crewMember) {

Set<ConstraintViolation<CrewMember>> violations = validator.validate(crewMember);
if(violations.size() > 0) {

try {
crewMembers.save(crewMember);
} catch (ConstraintViolationException x) {
JsonArrayBuilder messages = Json.createArrayBuilder();
for (ConstraintViolation<CrewMember> v : violations) {
for (ConstraintViolation<?> v : x.getConstraintViolations()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had tried this before, but I was missing this piece. I didn't realize we could get the violations out of the exception, so we can still return them to the UI

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think I was validating at the REST layer, instead of with jakarta data.

messages.add(v.getMessage());
}
return messages.build().toString();
}

crewMembers.save(crewMember);

return "";
}

Expand Down