fix: solved hibernate validation issues

rocketbase-io · Aug 6, 2024 · 77dc2ba · 77dc2ba
1 parent 6d1d2b5
commit 77dc2ba
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/commons-auth-core/src/main/java/io/rocketbase/commons/model/AppInviteEntity.java b/commons-auth-core/src/main/java/io/rocketbase/commons/model/AppInviteEntity.java
@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.List;
 
@@ -13,7 +15,7 @@ public interface AppInviteEntity extends EntityWithKeyValue<AppInviteEntity>, Ha
 
     String getInvitor();
 
-    void setInvitor(String invitor);
+    void setInvitor(@NotNull String invitor);
 
     String getMessage();
 
@@ -29,7 +31,7 @@ public interface AppInviteEntity extends EntityWithKeyValue<AppInviteEntity>, Ha
 
     String getEmail();
 
-    void setEmail(String email);
+    void setEmail(@NotNull @Email String email);
 
     List<String> getRoles();
 
@@ -39,7 +41,7 @@ public interface AppInviteEntity extends EntityWithKeyValue<AppInviteEntity>, Ha
 
     Instant getExpiration();
 
-    void setExpiration(Instant expiration);
+    void setExpiration(@NotNull Instant expiration);
 
     /**
      * fullname fallback if null use email

diff --git a/commons-auth-core/src/main/java/io/rocketbase/commons/model/AppUserEntity.java b/commons-auth-core/src/main/java/io/rocketbase/commons/model/AppUserEntity.java
@@ -3,24 +3,26 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.security.core.userdetails.UserDetails;
 
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.List;
 
 public interface AppUserEntity extends UserDetails, AppUserToken, EntityWithKeyValue<AppUserEntity> {
 
     void setId(String id);
 
-    void setUsername(String username);
+    void setUsername(@NotNull String username);
 
     String getPassword();
 
-    void setPassword(String password);
+    void setPassword(@NotNull String password);
 
     void setFirstName(String firstName);
 
     void setLastName(String lastName);
 
-    void setEmail(String email);
+    void setEmail(@NotNull @Email String email);
 
     void setAvatar(String avatar);
 

diff --git a/commons-auth-jpa/src/main/java/io/rocketbase/commons/model/AppInviteJpaEntity.java b/commons-auth-jpa/src/main/java/io/rocketbase/commons/model/AppInviteJpaEntity.java
@@ -5,8 +5,6 @@
 import org.springframework.data.annotation.CreatedDate;
 
 import javax.persistence.*;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
@@ -26,7 +24,6 @@ public class AppInviteJpaEntity implements AppInviteEntity {
     @Column(length = 36, nullable = false)
     private String id;
 
-    @NotNull
     private String invitor;
 
     @Column(length = 4000)
@@ -36,8 +33,6 @@ public class AppInviteJpaEntity implements AppInviteEntity {
 
     private String lastName;
 
-    @NotNull
-    @Email
     private String email;
 
     @Column(name = "roles")
@@ -57,12 +52,10 @@ public class AppInviteJpaEntity implements AppInviteEntity {
     @Builder.Default
     private Map<String, String> keyValueMap = new HashMap<>();
 
-    @NotNull
     @CreatedDate
     @Column(nullable = false)
     private Instant created;
 
-    @NotNull
     @Column(nullable = false)
     private Instant expiration;
 

diff --git a/commons-auth-jpa/src/main/java/io/rocketbase/commons/model/AppUserJpaEntity.java b/commons-auth-jpa/src/main/java/io/rocketbase/commons/model/AppUserJpaEntity.java
@@ -6,8 +6,6 @@
 import org.springframework.security.core.GrantedAuthority;
 
 import javax.persistence.*;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotNull;
 import java.time.Instant;
 import java.util.Collection;
 import java.util.HashMap;
@@ -30,19 +28,14 @@ public class AppUserJpaEntity implements AppUserEntity {
     @Column(length = 36)
     private String id;
 
-    @NotNull
     private String username;
 
-
     private String firstName;
 
     private String lastName;
 
-    @NotNull
     private String password;
 
-    @NotNull
-    @Email
     private String email;
 
     @Column(length = 2000)
@@ -72,7 +65,6 @@ public class AppUserJpaEntity implements AppUserEntity {
 
     private boolean enabled;
 
-    @NotNull
     @CreatedDate
     @Column(nullable = false)
     private Instant created;