datasource, transaction 설정 수정

src/main/java/cokr/xit/foundation/boot/DatasourceConfig.java

@@ -11,7 +11,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 
 import cokr.xit.foundation.Assert;
-import lombok.Setter;
 
 /**데이터베이스 접속 관련 설정
  * <ul><li>{@link #dataSource() 데이터소스} 설정</li>
@@ -21,57 +20,25 @@ import lombok.Setter;
  * @author mjkhan
  */
 @Configuration
-@ConfigurationProperties(prefix = "spring.datasource")
-@Setter
 public class DatasourceConfig {
-	private String driverClassName;
+	private DataSource dataSource;
-	private String url;
+
-	private String username;
-	private String password;
-/*
-	@Value("${spring.datasource.driver-class-name}")
-	private String driverClassName;
-	@Value("${spring.datasource.url}")
-	private String url;
-	@Value("${spring.datasource.username}")
-	private String username;
-	@Value("${spring.datasource.password}")
-	private String password;
-*/
 	/**데이터소스 Bean을 반환한다. JDBC 접속은 application.yml 파일에 다음과 같이 설정한다.
 	 * <pre><code> spring:
 	 *   datasource:
-	 *     driver-class-name: JDBC 드라이버 클래스 이름
+	 *     hikari:
-	 *     url: 데이터베이스 접속 URL
+	 *       driver-class-name: JDBC 드라이버 클래스 이름
-	 *     username: 데이터베이스 접속 아이디
+	 *       jdbc-url: 데이터베이스 접속 URL
-	 *     password: 데이터베이스 접속 비밀번호</code></pre>
+	 *       username: 데이터베이스 접속 아이디
+	 *       password: 데이터베이스 접속 비밀번호</code></pre>
 	 * @return 데이터소스
 	 */
-	@Bean
+	@Bean("dataSource")
+	@ConfigurationProperties(prefix = "spring.datasource.hikari")
 	public DataSource dataSource() {
-		setConfig();
+		return dataSource != null ? dataSource : (dataSource = DataSourceBuilder.create().build());
-		return DataSourceBuilder.create()
-			.driverClassName(driverClassName)
-			.url(url)
-			.username(username)
-			.password(password)
-			.build();
     }
 
-	private void setConfig() {
-		if (driverClassName != null) return;
-
-		try {
-			Yml yml = new Yml("application.yml", "application.yml");
-			driverClassName = yml.getValue("spring.datasource.driver-class-name");
-			url = yml.getValue("spring.datasource.url");
-			username = yml.getValue("spring.datasource.username");
-			password = yml.getValue("spring.datasource.password");
-		} catch (Exception e) {
-			throw Assert.runtimeException(e);
-		}
-	}
-
 	/**SqlSessionFactoryBean을 반환한다.<br />
 	 * MyBatis의 설정 파일들은 다음 경로에 있어야 한다.
 	 * <ul><li>MyBatis 설정: classpath:sql/mybatis-config.xml</li>

src/main/java/cokr/xit/foundation/boot/TransactionConfig.java

@@ -1,6 +1,7 @@
 package cokr.xit.foundation.boot;
 
-import java.util.Properties;
+import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.sql.DataSource;
@@ -13,7 +14,9 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.interceptor.NameMatchTransactionAttributeSource;
 import org.springframework.transaction.interceptor.RollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
@@ -39,25 +42,31 @@ public class TransactionConfig {
 
 	@Bean
 	public TransactionInterceptor txAdvice() {
-		RuleBasedTransactionAttribute write = new RuleBasedTransactionAttribute();
+		RuleBasedTransactionAttribute read = new RuleBasedTransactionAttribute(
-		write.getRollbackRules().add(new RollbackRuleAttribute(Throwable.class));
+			TransactionDefinition.PROPAGATION_REQUIRED,
+			List.of(new RollbackRuleAttribute(Throwable.class))
+		);
+		read.setReadOnly(true);
+		RuleBasedTransactionAttribute write = new RuleBasedTransactionAttribute(
+			TransactionDefinition.PROPAGATION_REQUIRED,
+			List.of(new RollbackRuleAttribute(Throwable.class))
+		);
 
-		Properties txAttrs = new Properties();
+		NameMatchTransactionAttributeSource txAttrSrc = new NameMatchTransactionAttributeSource();
-		txAttrs.setProperty("*", write.toString());
+		txAttrSrc.setNameMap(Map.of(
+			"get*", read,
+			"*", write
+		));
 
 		TransactionInterceptor bean = new TransactionInterceptor();
 		bean.setTransactionManager(txManager());
-		bean.setTransactionAttributes(txAttrs);
+		bean.setTransactionAttributeSource(txAttrSrc);
 		return bean;
 	}
 
 	@Bean
 	public Advisor txAdvisor() {
-		String expression = "execution(* cokr.xit..service.bean..*ServiceBean.*(..))";
+		String expression = "execution(* cokr.xit..service.bean.*ServiceBean.*(..))";
-
-		AspectJExpressionPointcut serviceMethod = new AspectJExpressionPointcut();
-		serviceMethod.setExpression(expression);
-
 		AspectJExpressionPointcut requiredTx = new AspectJExpressionPointcut();
 		requiredTx.setExpression(expression);