Merge branch 'feature/redisSetUpAndRefreshToken' of https://github.com/f-lab-edu/Ticketing into feature/redisSetUpAndRefreshToken

server/src/main/java/com/ticketing/server/global/factory/YamlPropertySourceFactory.java

@@ -5,23 +5,19 @@ import java.util.Properties;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.core.io.support.PropertySourceFactory;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
 
 public class YamlPropertySourceFactory implements PropertySourceFactory {
 
 	@Override
-	public PropertySource<?> createPropertySource(@Nullable String name, EncodedResource resource) {
+	public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource) {
-		Properties yamlProperties = loadYamlProperties(resource);
+		Resource resource = encodedResource.getResource();
-		String sourceName = StringUtils.hasText(name) ? name : resource.getResource().getFilename();
+		YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
-		return new PropertiesPropertySource(Objects.requireNonNull(sourceName), Objects.requireNonNull(yamlProperties));
+		factoryBean.setResources(resource);
-	}
 
-	private Properties loadYamlProperties(EncodedResource resource) {
+		Properties properties = factoryBean.getObject();
-		YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+		return new PropertiesPropertySource(Objects.requireNonNull(resource.getFilename()), Objects.requireNonNull(properties));
-		factory.setResources(resource.getResource());
-		return factory.getObject();
 	}
 }

server/src/main/java/com/ticketing/server/global/security/jwt/JwtProperties.java

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.PropertySource;
 @Getter
 @RequiredArgsConstructor
 @ConstructorBinding
-@ConfigurationProperties(value = "jwt")
+@ConfigurationProperties("jwt")
 @PropertySource(value = "classpath:application.yml", factory = YamlPropertySourceFactory.class)
 public class JwtProperties {
 

server/src/main/java/com/ticketing/server/user/application/UserController.java

@@ -43,14 +43,14 @@ public class UserController {
 	@PostMapping
 	public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
 		User user = userService.register(request.toSignUpDto(passwordEncoder));
-		return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user));
+		return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.of(user));
 	}
 
 	@DeleteMapping
 	@Secured("ROLE_GUEST")
 	public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
 		User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
-		return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user));
+		return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.of(user));
 	}
 
 	@PutMapping("/password")
@@ -62,7 +62,7 @@ public class UserController {
 		}
 
 		User user = userService.changePassword(request.toChangePasswordDto(passwordEncoder));
-		return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
+		return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.of(user));
 	}
 
 	@PostMapping("/login")

server/src/main/java/com/ticketing/server/user/application/response/SignUpResponse.java

@@ -13,7 +13,7 @@ public class SignUpResponse {
 
 	private String email;
 
-	public static SignUpResponse from(User user) {
+	public static SignUpResponse of(User user) {
 		return new SignUpResponse(user.getName(), user.getEmail());
 	}
 

server/src/main/java/com/ticketing/server/user/application/response/UserChangePasswordResponse.java

@@ -13,7 +13,7 @@ public class UserChangePasswordResponse {
 
 	private String email;
 
-	public static UserChangePasswordResponse from(User user) {
+	public static UserChangePasswordResponse of(User user) {
 		return new UserChangePasswordResponse(user.getName(), user.getEmail());
 	}
 

server/src/main/java/com/ticketing/server/user/application/response/UserDeleteResponse.java

@@ -13,7 +13,7 @@ public class UserDeleteResponse {
 
 	private String email;
 
-	public static UserDeleteResponse from(User user) {
+	public static UserDeleteResponse of(User user) {
 		return new UserDeleteResponse(user.getName(), user.getEmail());
 	}
 

server/src/main/java/com/ticketing/server/user/service/dto/ChangePasswordDTO.java

@@ -6,6 +6,13 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 public class ChangePasswordDTO implements PasswordMatches {
 
+	public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) {
+		this.email = email;
+		this.oldPassword = oldPassword;
+		this.newPassword = newPassword;
+		this.passwordEncoder = passwordEncoder;
+	}
+
 	@NotEmpty(message = "{validation.not.empty.email}")
 	@Email(message = "{validation.email}")
 	private String email;
@@ -18,13 +25,6 @@ public class ChangePasswordDTO implements PasswordMatches {
 
 	private PasswordEncoder passwordEncoder;
 
-	public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) {
-		this.email = email;
-		this.oldPassword = oldPassword;
-		this.newPassword = newPassword;
-		this.passwordEncoder = passwordEncoder;
-	}
-
 	public String getEmail() {
 		return email;
 	}

server/src/main/java/com/ticketing/server/user/service/dto/DeleteUserDTO.java

@@ -6,6 +6,12 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 public class DeleteUserDTO implements PasswordMatches {
 
+	public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) {
+		this.email = email;
+		this.inputPassword = inputPassword;
+		this.passwordEncoder = passwordEncoder;
+	}
+
 	@NotEmpty(message = "{validation.not.empty.email}")
 	@Email(message = "{validation.email}")
 	private String email;
@@ -15,12 +21,6 @@ public class DeleteUserDTO implements PasswordMatches {
 
 	private PasswordEncoder passwordEncoder;
 
-	public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) {
-		this.email = email;
-		this.inputPassword = inputPassword;
-		this.passwordEncoder = passwordEncoder;
-	}
-
 	@Override
 	public boolean passwordMatches(String password) {
 		return passwordEncoder.matches(this.inputPassword, password);