From 928958dd45aeb71ba8c012c003f80c54c6db2c28 Mon Sep 17 00:00:00 2001
From: Kim DongHyo <60608509+kdhyo@users.noreply.github.com>
Date: Thu, 16 Jun 2022 19:35:30 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=9D=B8=EC=88=98=20name=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#33)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/YamlPropertySourceFactory.java     | 18 +++++++++++-------
 .../global/security/jwt/JwtProperties.java     |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/com/ticketing/server/global/factory/YamlPropertySourceFactory.java b/server/src/main/java/com/ticketing/server/global/factory/YamlPropertySourceFactory.java
index 457e925..747b2a8 100644
--- a/server/src/main/java/com/ticketing/server/global/factory/YamlPropertySourceFactory.java
+++ b/server/src/main/java/com/ticketing/server/global/factory/YamlPropertySourceFactory.java
@@ -5,19 +5,23 @@ 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(String name, EncodedResource encodedResource) {
-		Resource resource = encodedResource.getResource();
-		YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
-		factoryBean.setResources(resource);
+	public PropertySource<?> createPropertySource(@Nullable String name, EncodedResource resource) {
+		Properties yamlProperties = loadYamlProperties(resource);
+		String sourceName = StringUtils.hasText(name) ? name : resource.getResource().getFilename();
+		return new PropertiesPropertySource(Objects.requireNonNull(sourceName), Objects.requireNonNull(yamlProperties));
+	}
 
-		Properties properties = factoryBean.getObject();
-		return new PropertiesPropertySource(Objects.requireNonNull(resource.getFilename()), Objects.requireNonNull(properties));
+	private Properties loadYamlProperties(EncodedResource resource) {
+		YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+		factory.setResources(resource.getResource());
+		return factory.getObject();
 	}
 }
diff --git a/server/src/main/java/com/ticketing/server/global/security/jwt/JwtProperties.java b/server/src/main/java/com/ticketing/server/global/security/jwt/JwtProperties.java
index ef1679f..320afc3 100644
--- a/server/src/main/java/com/ticketing/server/global/security/jwt/JwtProperties.java
+++ b/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("jwt")
+@ConfigurationProperties(value = "jwt")
 @PropertySource(value = "classpath:application.yml", factory = YamlPropertySourceFactory.class)
 public class JwtProperties {