PART07: jex06 - VO, Mapper 재생성 및 패키지 구조 변경

mybatis-dynamic-sql 라이브러리에 의해,
자동 생성되는 VO, Mapper등은 별도의 generated 패키지에 생성되도록 하고,

커스터마이징이 필요할 경우 DTO로 분리, Mapper 추가 정의로 대응했다.

결국 목표는...

mvn mybatis-generator:generate

위 명령으로 VO, Mapper들을 재생성하더라도
프로젝트에 영향을 최소화하기 위해 분리함

Author: fp024

part07/jex06/generatorConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC
     "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-    "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+    "https://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
   <!-- MyBatis Dynamic SQL Library를 사용. XML매퍼는 생성하지 않음. -->
   <!-- 참조: https://mybatis.org/generator/quickstart.html -->
@@ -14,6 +14,7 @@
     <!-- 자동생성 주석 금지 -->
     <commentGenerator>
       <property name="suppressAllComments" value="true"/>
+      <property name="useLegacyGeneratedAnnotation" value="true"/>
     </commentGenerator>
 
     <jdbcConnection
@@ -25,15 +26,15 @@
 
     <!-- Java 도메인 모델 생성 -->
     <javaModelGenerator
-        targetPackage="org.fp024.domain"
+        targetPackage="org.fp024.domain.generated"
         targetProject="src/main/java"> <!-- eclipse의 generator에서는 프로젝트 폴더명부터 시작해야하지만, Maven 플러그인으로 실행시는 src부터 시작한다. -->
       <property name="enableSubPackages" value="true"/>
       <property name="trimStrings" value="true"/>
     </javaModelGenerator>
 
     <!-- 메퍼 인터페이스 (레파지토리 인터페이스 ) -->
     <javaClientGenerator
-        targetPackage="org.fp024.mapper"
+        targetPackage="org.fp024.mapper.generated"
         targetProject="src/main/java">
       <property name="enableSubPackages" value="true"/>
     </javaClientGenerator>
@@ -61,7 +62,6 @@
     </table>
 
 
-
     <!--
       타켓 테이블 - 권한 테이블
       ex06 프로젝트에서는 회원테이블과 권한테이블을 JOIN해서 회원정보를 가져왔기 때문에,

part07/jex06/src/main/java/org/fp024/config/RootConfig.java

@@ -40,7 +40,7 @@ public HikariDataSource dataSource(
   public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
     SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
     sqlSessionFactoryBean.setDataSource(dataSource);
-    sqlSessionFactoryBean.setTypeAliasesPackage("org.fp024.domain");
+    sqlSessionFactoryBean.setTypeAliasesPackage("org.fp024.domain.generated,org.fp024.domain");
     return sqlSessionFactoryBean.getObject();
   }
 

part07/jex06/src/main/java/org/fp024/config/SecurityConfig.java

@@ -1,12 +1,11 @@
 package org.fp024.config;
 
-import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
-
 import javax.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.fp024.security.CustomLoginSuccessHandler;
 import org.fp024.security.CustomUserDetailsService;
+import org.fp024.service.MemberService;
 import org.fp024.type.MemberAuthType;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -96,8 +95,8 @@ public UserDetailsManager users(DataSource dataSource) {
   */
 
   @Bean
-  public UserDetailsService customUserDetailsService() {
-    return new CustomUserDetailsService();
+  public UserDetailsService customUserDetailsService(MemberService memberService) {
+    return new CustomUserDetailsService(memberService);
   }
 
   @Bean

part07/jex06/src/main/java/org/fp024/domain/AuthVO.java

@@ -0,0 +1,19 @@
+package org.fp024.domain;
+
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.fp024.domain.generated.AuthVO;
+import org.fp024.domain.generated.MemberVO;
+
+/**
+ * 회원 DTO
+ */
+@Getter
+@Setter
+@ToString
+public class MemberDTO {
+  private MemberVO memberVO;
+  private List<AuthVO> authList;
+}

part07/jex06/src/main/java/org/fp024/domain/MemberDTO.java

@@ -0,0 +1,45 @@
+package org.fp024.domain.generated;
+
+import javax.annotation.Generated;
+import org.fp024.type.MemberAuthType;
+
+public class AuthVO {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String userId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private MemberAuthType auth;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getUserId() {
+        return userId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setUserId(String userId) {
+        this.userId = userId == null ? null : userId.trim();
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public MemberAuthType getAuth() {
+        return auth;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setAuth(MemberAuthType auth) {
+        this.auth = auth;
+    }
+
+    @Override
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", userId=").append(userId);
+        sb.append(", auth=").append(auth);
+        sb.append("]");
+        return sb.toString();
+    }
+}

part07/jex06/src/main/java/org/fp024/domain/MemberVO.java

@@ -0,0 +1,102 @@
+package org.fp024.domain.generated;
+
+import java.time.LocalDateTime;
+import javax.annotation.Generated;
+import org.fp024.type.EnabledType;
+
+public class MemberVO {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String userId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String userPassword;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String userName;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private LocalDateTime registerDate;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private LocalDateTime updateDate;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private EnabledType enabled;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getUserId() {
+        return userId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setUserId(String userId) {
+        this.userId = userId == null ? null : userId.trim();
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getUserPassword() {
+        return userPassword;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setUserPassword(String userPassword) {
+        this.userPassword = userPassword == null ? null : userPassword.trim();
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getUserName() {
+        return userName;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public LocalDateTime getRegisterDate() {
+        return registerDate;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setRegisterDate(LocalDateTime registerDate) {
+        this.registerDate = registerDate;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public LocalDateTime getUpdateDate() {
+        return updateDate;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setUpdateDate(LocalDateTime updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public EnabledType getEnabled() {
+        return enabled;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setEnabled(EnabledType enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", userId=").append(userId);
+        sb.append(", userPassword=").append(userPassword);
+        sb.append(", userName=").append(userName);
+        sb.append(", registerDate=").append(registerDate);
+        sb.append(", updateDate=").append(updateDate);
+        sb.append(", enabled=").append(enabled);
+        sb.append("]");
+        return sb.toString();
+    }
+}