From 8055319b893e39a420490ca8775e922d2a7714db Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 1 Aug 2018 14:12:40 +0100 Subject: [PATCH] Use Bean Validations @NotBlank rather than Hibernate Validator's Closes gh-536 --- .../src/main/java/com/example/notes/NoteInput.java | 4 ++-- .../src/main/java/com/example/notes/NullOrNotBlank.java | 2 +- .../src/main/java/com/example/notes/TagInput.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NoteInput.java b/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NoteInput.java index 27b04f7b..babef187 100644 --- a/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NoteInput.java +++ b/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NoteInput.java @@ -20,13 +20,13 @@ import java.net.URI; import java.util.Collections; import java.util.List; -import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; public class NoteInput { - + @NotBlank private final String title; diff --git a/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NullOrNotBlank.java b/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NullOrNotBlank.java index 7421a0ea..c8d26e06 100644 --- a/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NullOrNotBlank.java +++ b/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/NullOrNotBlank.java @@ -23,11 +23,11 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.Null; import org.hibernate.validator.constraints.CompositionType; import org.hibernate.validator.constraints.ConstraintComposition; -import org.hibernate.validator.constraints.NotBlank; @ConstraintComposition(CompositionType.OR) @Constraint(validatedBy = {}) diff --git a/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/TagInput.java b/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/TagInput.java index 2df23e5f..aa6224aa 100644 --- a/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/TagInput.java +++ b/samples/rest-notes-spring-hateoas/src/main/java/com/example/notes/TagInput.java @@ -16,7 +16,7 @@ package com.example.notes; -import org.hibernate.validator.constraints.NotBlank; +import javax.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty;