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.

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

Lombok 어노테이션 사용 행태에 대한 점검 및 수정 #19

Merged
merged 3 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 14 additions & 4 deletions src/main/java/com/stream/controller/LoginController.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
import jakarta.validation.Valid;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestController
public class LoginController {
private LoginFacade loginFacade;
private final LoginFacade loginFacade;

@Autowired
public LoginController(LoginFacade loginFacade) {
Expand All @@ -53,8 +53,8 @@ private ResponseCookie createCookie(LoginResult result) {
.build();
}

@Builder
@Getter
@ToString
public static class LoginRequest {
@NotNull(message = "이메일을 입력해주세요.")
@Email(message = "유효한 이메일을 입력해주세요.")
Expand All @@ -63,14 +63,24 @@ public static class LoginRequest {
@NotNull(message = "비밀번호를 입력해주세요.")
private String inputPassword;

@Builder
public LoginRequest(String email, String inputPassword) {
this.email = email;
this.inputPassword = inputPassword;
}

public LoginCommand toCommand() {
return LoginCommand.builder().email(email).inputPassword(inputPassword).build();
}
}

@Getter
@AllArgsConstructor
@ToString
public static class LoginResponse {
private String accessToken;

public LoginResponse(String accessToken) {
this.accessToken = accessToken;
}
}
}
18 changes: 14 additions & 4 deletions src/main/java/com/stream/controller/SignupController.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
import jakarta.validation.Valid;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestController
public class SignupController {
private SignupFacade signupFacade;
private final SignupFacade signupFacade;

@Autowired
public SignupController(SignupFacade signupFacade) {
Expand All @@ -39,8 +39,8 @@ public ResponseEntity<SignupResponse> signup(@Valid @RequestBody final SignupReq
return ResponseEntity.ok().body(new SignupResponse(result.getEmail(), result.getSignupDate()));
}

@Builder
@Getter
@ToString
public static class SignupRequest {
@NotNull(message = "이메일을 입력해주세요.")
@Email(message = "유효한 이메일을 입력해주세요.")
Expand All @@ -49,15 +49,25 @@ public static class SignupRequest {
@NotNull(message = "비밀번호를 입력해주세요.")
private String inputPassword;

@Builder
public SignupRequest(String email, String inputPassword) {
this.email = email;
this.inputPassword = inputPassword;
}

public SignupCommand toCommand() {
return SignupCommand.builder().email(email).password(inputPassword).build();
}
}

@AllArgsConstructor
public static class SignupResponse {
private String email;
private Date signupDate;

public SignupResponse(String email, Date signupDate) {
this.email = email;
this.signupDate = signupDate;
}
}

}
3 changes: 2 additions & 1 deletion src/main/java/com/stream/domain/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "members")
@NoArgsConstructor
@Getter
public class Member {
@Id
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/stream/domain/member/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Service
@Transactional(readOnly = true)
public class MemberService {
private MemberRepository memberRepository;
private final MemberRepository memberRepository;

@Autowired
public MemberService(MemberRepository memberRepository) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@

import lombok.Builder;
import lombok.Getter;
import lombok.ToString;

@Builder
@Getter
@ToString
public class CreateMemberCommand {
private String email;
private String encryptedPassword;
private Role role;

@Builder
public CreateMemberCommand(String email, String encryptedPassword, Role role) {
this.email = email;
this.encryptedPassword = encryptedPassword;
this.role = role;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@

import lombok.Builder;
import lombok.Getter;
import lombok.ToString;

@Builder
@Getter
@ToString
public class LoginCommand {
private String email;
private String inputPassword;

@Builder
public LoginCommand(String email, String inputPassword) {
this.email = email;
this.inputPassword = inputPassword;
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package com.stream.domain.member.dto.login;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.ToString;

@Getter
@AllArgsConstructor
@ToString
public class LoginResult {
private String accessToken;
private int accessTokenExpireMs;

public LoginResult(String accessToken, int accessTokenExpireMs) {
this.accessToken = accessToken;
this.accessTokenExpireMs = accessTokenExpireMs;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@

import lombok.Builder;
import lombok.Getter;
import lombok.ToString;

@Builder
@Getter
@ToString
public class SignupCommand {
private String email;
private String password;

@Builder
public SignupCommand(String email, String password) {
this.email = email;
this.password = password;
}
}
3 changes: 2 additions & 1 deletion src/main/java/com/stream/domain/role/Role.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "roles")
@NoArgsConstructor
@Getter
public class Role {
@Id
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/stream/domain/role/RoleService.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@Service
@Transactional(readOnly = true)
public class RoleService {
private RoleRepository roleRepository;
private final RoleRepository roleRepository;

@Autowired
public RoleService(RoleRepository roleRepository) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

import com.stream.domain.role.RolesEnum;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.ToString;

@AllArgsConstructor
@Getter
@ToString
public class CreateRoleCommand {
private RolesEnum roleName;

public CreateRoleCommand(RolesEnum rolesEnum) {
this.roleName = rolesEnum;
}
}
3 changes: 2 additions & 1 deletion src/main/java/com/stream/domain/video/Video.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "videos")
@NoArgsConstructor
@Getter
public class Video {
@Id
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/com/stream/domain/video/dto/UploadVideoDto.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@
import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;

@Builder
@Getter
@ToString
public class UploadVideoDto {
@NotNull(message = "확장자를 제외한 파일명을 입력해주세요. (ex. ~)")
private String fileName;

@NotNull(message = "확장자를 입력해주세요. (ex. MOV)")
private String extension;

private String description;

@Builder
public UploadVideoDto(String fileName, String extension, String description) {
this.fileName = fileName;
this.extension = extension;
this.description = description;
}
}
18 changes: 12 additions & 6 deletions src/main/java/com/stream/domain/video/dto/VideoDto.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@

import com.stream.domain.video.Video;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;

@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
@Builder
@Getter
@ToString
public class VideoDto {
private long id;
private String fileTag;
Expand All @@ -22,6 +18,16 @@ public class VideoDto {
private String description;
private Date createdAt;

@Builder
public VideoDto(long id, String fileTag, String extension, long size, String description, Date createdAt) {
this.id = id;
this.fileTag = fileTag;
this.extension = extension;
this.size = size;
this.description = description;
this.createdAt = createdAt;
}

public static VideoDto convertDomainToDto(Video video) {
return VideoDto.builder()
.id(video.getId())
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/stream/facade/LoginFacade.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

@Service
public class LoginFacade {
private MemberService memberService;
private PasswordEncoder passwordEncoder;
private JwtManager jwtManager;
private final MemberService memberService;
private final PasswordEncoder passwordEncoder;
private final JwtManager jwtManager;

@Autowired
public LoginFacade(MemberService memberService, PasswordEncoder passwordEncoder, JwtManager jwtManager) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/stream/facade/SignupFacade.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

@Service
public class SignupFacade {
private MemberService memberService;
private RoleService roleService;
private PasswordEncoder passwordEncoder;
private final MemberService memberService;
private final RoleService roleService;
private final PasswordEncoder passwordEncoder;

@Autowired
public SignupFacade(MemberService memberService, RoleService roleService, PasswordEncoder passwordEncoder) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

import com.stream.domain.role.Role;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.ToString;

@Getter
@AllArgsConstructor
@ToString
public class DecodedJwtAccessToken {
private String email;
private Role role;

public DecodedJwtAccessToken(String email, Role role) {
this.email = email;
this.role = role;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
SecurityContextHolder.getContext().setAuthentication(auth);

logger.debug(
"Jwt Auth Success (path: " + request.getServletPath() + ", email: " + email + ", role: " + roleName + " )");
"Jwt Auth Success (path: " + request.getServletPath() + " token: " + decodedToken + " )");

filterChain.doFilter(request, response);
}
Expand Down
Loading
Loading