diff --git a/src/main/java/app/mealsmadeeasy/api/jwt/JwtServiceImpl.java b/src/main/java/app/mealsmadeeasy/api/jwt/JwtServiceImpl.java index 1a1c6d1..92fed9f 100644 --- a/src/main/java/app/mealsmadeeasy/api/jwt/JwtServiceImpl.java +++ b/src/main/java/app/mealsmadeeasy/api/jwt/JwtServiceImpl.java @@ -1,7 +1,6 @@ package app.mealsmadeeasy.api.jwt; import app.mealsmadeeasy.api.security.AuthToken; -import app.mealsmadeeasy.api.security.SimpleAuthToken; import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.io.Serializer; @@ -43,7 +42,7 @@ public final class JwtServiceImpl implements JwtService { .signWith(this.secretKey) .json(this.serializer) .compact(); - return new SimpleAuthToken( + return new AuthToken( token, this.accessTokenLifetime, LocalDateTime.ofInstant(expires, ZoneId.systemDefault()) diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java b/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java index 7162179..9d85a88 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java @@ -12,7 +12,7 @@ import java.time.OffsetDateTime; import java.util.HashSet; import java.util.Set; -@Entity(name = "Recipe") +@Entity @Data public final class Recipe { diff --git a/src/main/java/app/mealsmadeeasy/api/security/AuthToken.java b/src/main/java/app/mealsmadeeasy/api/security/AuthToken.java index a79dbf2..a96210b 100644 --- a/src/main/java/app/mealsmadeeasy/api/security/AuthToken.java +++ b/src/main/java/app/mealsmadeeasy/api/security/AuthToken.java @@ -1,9 +1,12 @@ package app.mealsmadeeasy.api.security; +import lombok.Value; + import java.time.LocalDateTime; -public interface AuthToken { - String getToken(); - long getLifetime(); - LocalDateTime getExpires(); +@Value +public class AuthToken { + String token; + long lifetime; + LocalDateTime expires; } diff --git a/src/main/java/app/mealsmadeeasy/api/security/SecurityExceptionView.java b/src/main/java/app/mealsmadeeasy/api/security/SecurityExceptionView.java index 8940a08..7666a0a 100644 --- a/src/main/java/app/mealsmadeeasy/api/security/SecurityExceptionView.java +++ b/src/main/java/app/mealsmadeeasy/api/security/SecurityExceptionView.java @@ -1,31 +1,16 @@ package app.mealsmadeeasy.api.security; +import lombok.Value; + +@Value public class SecurityExceptionView { public enum Action { LOGIN, REFRESH } - private final int status; - private final Action action; - private final String message; - - public SecurityExceptionView(int status, Action action, String message) { - this.status = status; - this.action = action; - this.message = message; - } - - public int getStatus() { - return this.status; - } - - public Action getAction() { - return this.action; - } - - public String getMessage() { - return this.message; - } + int status; + Action action; + String message; } diff --git a/src/main/java/app/mealsmadeeasy/api/security/SimpleAuthToken.java b/src/main/java/app/mealsmadeeasy/api/security/SimpleAuthToken.java deleted file mode 100644 index 13462c5..0000000 --- a/src/main/java/app/mealsmadeeasy/api/security/SimpleAuthToken.java +++ /dev/null @@ -1,32 +0,0 @@ -package app.mealsmadeeasy.api.security; - -import java.time.LocalDateTime; - -public final class SimpleAuthToken implements AuthToken { - - private final String token; - private final long lifetime; - private final LocalDateTime expires; - - public SimpleAuthToken(String token, long lifetime, LocalDateTime expires) { - this.token = token; - this.lifetime = lifetime; - this.expires = expires; - } - - @Override - public String getToken() { - return this.token; - } - - @Override - public long getLifetime() { - return this.lifetime; - } - - @Override - public LocalDateTime getExpires() { - return this.expires; - } - -} diff --git a/src/main/java/app/mealsmadeeasy/api/user/User.java b/src/main/java/app/mealsmadeeasy/api/user/User.java index fa8285c..15f0da8 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/User.java +++ b/src/main/java/app/mealsmadeeasy/api/user/User.java @@ -12,7 +12,7 @@ import java.util.Set; @Entity(name = "User") @Table(name = "\"user\"") @Data -public final class User implements UserDetails { +public class User implements UserDetails { public static User getDefaultDraft() { final var user = new User(); diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthority.java b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthority.java index a290b8f..8487e5f 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthority.java +++ b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthority.java @@ -4,10 +4,10 @@ import jakarta.persistence.*; import lombok.Data; import org.springframework.security.core.GrantedAuthority; -@Entity(name = "UserGrantedAuthority") +@Entity @Table(name = "user_granted_authority") @Data -public final class UserGrantedAuthority implements GrantedAuthority { +public class UserGrantedAuthority implements GrantedAuthority { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthorityRepository.java b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthorityRepository.java index 51d0fdb..1744129 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthorityRepository.java +++ b/src/main/java/app/mealsmadeeasy/api/user/UserGrantedAuthorityRepository.java @@ -2,4 +2,4 @@ package app.mealsmadeeasy.api.user; import org.springframework.data.jpa.repository.JpaRepository; -public interface UserGrantedAuthorityRepository extends JpaRepository {} +public interface UserGrantedAuthorityRepository extends JpaRepository {} diff --git a/src/main/java/app/mealsmadeeasy/api/user/view/UserInfoView.java b/src/main/java/app/mealsmadeeasy/api/user/view/UserInfoView.java index 0e983e7..b28870f 100644 --- a/src/main/java/app/mealsmadeeasy/api/user/view/UserInfoView.java +++ b/src/main/java/app/mealsmadeeasy/api/user/view/UserInfoView.java @@ -1,33 +1,16 @@ package app.mealsmadeeasy.api.user.view; import app.mealsmadeeasy.api.user.User; +import lombok.Value; +@Value public class UserInfoView { public static UserInfoView from(User user) { - final UserInfoView userInfoView = new UserInfoView(); - userInfoView.setId(user.getId()); - userInfoView.setUsername(user.getUsername()); - return userInfoView; + return new UserInfoView(user.getId(), user.getUsername()); } - private Integer id; - private String username; - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getUsername() { - return this.username; - } - - public void setUsername(String username) { - this.username = username; - } + Integer id; + String username; } diff --git a/src/main/java/app/mealsmadeeasy/api/util/AccessDeniedView.java b/src/main/java/app/mealsmadeeasy/api/util/AccessDeniedView.java index 8241de7..192ede9 100644 --- a/src/main/java/app/mealsmadeeasy/api/util/AccessDeniedView.java +++ b/src/main/java/app/mealsmadeeasy/api/util/AccessDeniedView.java @@ -1,21 +1,9 @@ package app.mealsmadeeasy.api.util; -public final class AccessDeniedView { - - private final int statusCode; - private final String message; - - public AccessDeniedView(int statusCode, String message) { - this.statusCode = statusCode; - this.message = message; - } - - public int getStatusCode() { - return this.statusCode; - } - - public String getMessage() { - return this.message; - } +import lombok.Value; +@Value +public class AccessDeniedView { + int statusCode; + String message; }