Skip to content

Commit 761bb0d

Browse files
fp024fp024
committed
PART07 - jex06 확인 : mybatis-generator-maven-plugin 2.0.0 버전업
1 parent 8446b59 commit 761bb0d

7 files changed

Lines changed: 56 additions & 128 deletions

File tree

‎part07/jex06/generatorConfig.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
<context id="MyBatis3DynamicSqlTest" targetRuntime="MyBatis3DynamicSql">
99
<property name="javaFileEncoding" value="UTF-8"/>
1010

11+
<!--
12+
XML Mapper가 자동으로 합쳐지는 것을 방지:
13+
overwrite를 true로 해도 append가 되는 현상이 있어서 이 플러그인이 필요하다.
14+
-->
15+
<plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin"/>
16+
1117
<!-- https://mybatis.org/generator/reference/plugins.html -->
1218
<plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
1319

@@ -25,19 +31,19 @@
2531
/>
2632

2733
<!-- Java 도메인 모델 생성 -->
28-
<javaModelGenerator
34+
<modelGenerator
2935
targetPackage="org.fp024.domain.generated"
3036
targetProject="src/main/java"> <!-- eclipse의 generator에서는 프로젝트 폴더명부터 시작해야하지만, Maven 플러그인으로 실행시는 src부터 시작한다. -->
3137
<property name="enableSubPackages" value="true"/>
3238
<property name="trimStrings" value="true"/>
33-
</javaModelGenerator>
39+
</modelGenerator>
3440

3541
<!-- 메퍼 인터페이스 (레파지토리 인터페이스 ) -->
36-
<javaClientGenerator
42+
<clientGenerator
3743
targetPackage="org.fp024.mapper.generated"
3844
targetProject="src/main/java">
3945
<property name="enableSubPackages" value="true"/>
40-
</javaClientGenerator>
46+
</clientGenerator>
4147

4248

4349
<!--

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,29 @@
11
package org.fp024.domain.generated;
22

3-
import javax.annotation.Generated;
43
import org.fp024.type.MemberAuthType;
54

65
public class AuthVO {
7-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
86
private String userId;
97

10-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
118
private MemberAuthType auth;
129

13-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
1410
public String getUserId() {
1511
return userId;
1612
}
1713

18-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
1914
public void setUserId(String userId) {
2015
this.userId = userId == null ? null : userId.trim();
2116
}
2217

23-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
2418
public MemberAuthType getAuth() {
2519
return auth;
2620
}
2721

28-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
2922
public void setAuth(MemberAuthType auth) {
3023
this.auth = auth;
3124
}
3225

3326
@Override
34-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
3527
public String toString() {
3628
StringBuilder sb = new StringBuilder();
3729
sb.append(getClass().getSimpleName());

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,70 @@
11
package org.fp024.domain.generated;
22

33
import java.time.LocalDateTime;
4-
import javax.annotation.Generated;
54
import org.fp024.type.EnabledType;
65

76
public class MemberVO {
8-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
97
private String userId;
108

11-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
129
private String userPassword;
1310

14-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
1511
private String userName;
1612

17-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
1813
private LocalDateTime registerDate;
1914

20-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
2115
private LocalDateTime updateDate;
2216

23-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
2417
private EnabledType enabled;
2518

26-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
2719
public String getUserId() {
2820
return userId;
2921
}
3022

31-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
3223
public void setUserId(String userId) {
3324
this.userId = userId == null ? null : userId.trim();
3425
}
3526

36-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
3727
public String getUserPassword() {
3828
return userPassword;
3929
}
4030

41-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
4231
public void setUserPassword(String userPassword) {
4332
this.userPassword = userPassword == null ? null : userPassword.trim();
4433
}
4534

46-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
4735
public String getUserName() {
4836
return userName;
4937
}
5038

51-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
5239
public void setUserName(String userName) {
5340
this.userName = userName == null ? null : userName.trim();
5441
}
5542

56-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
5743
public LocalDateTime getRegisterDate() {
5844
return registerDate;
5945
}
6046

61-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
6247
public void setRegisterDate(LocalDateTime registerDate) {
6348
this.registerDate = registerDate;
6449
}
6550

66-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
6751
public LocalDateTime getUpdateDate() {
6852
return updateDate;
6953
}
7054

71-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
7255
public void setUpdateDate(LocalDateTime updateDate) {
7356
this.updateDate = updateDate;
7457
}
7558

76-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
7759
public EnabledType getEnabled() {
7860
return enabled;
7961
}
8062

81-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
8263
public void setEnabled(EnabledType enabled) {
8364
this.enabled = enabled;
8465
}
8566

8667
@Override
87-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
8868
public String toString() {
8969
StringBuilder sb = new StringBuilder();
9070
sb.append(getClass().getSimpleName());

‎part07/jex06/src/main/java/org/fp024/mapper/generated/AuthMapper.java‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.Collection;
66
import java.util.List;
77
import java.util.Optional;
8-
import javax.annotation.Generated;
98
import org.apache.ibatis.annotations.Mapper;
109
import org.apache.ibatis.annotations.Result;
1110
import org.apache.ibatis.annotations.ResultMap;
@@ -15,13 +14,12 @@
1514
import org.fp024.domain.generated.AuthVO;
1615
import org.fp024.typehandler.CustomEnumTypeHandler;
1716
import org.mybatis.dynamic.sql.BasicColumn;
18-
import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
19-
import org.mybatis.dynamic.sql.select.CountDSLCompleter;
20-
import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
17+
import org.mybatis.dynamic.sql.dsl.CountDSLCompleter;
18+
import org.mybatis.dynamic.sql.dsl.DeleteDSLCompleter;
19+
import org.mybatis.dynamic.sql.dsl.SelectDSLCompleter;
20+
import org.mybatis.dynamic.sql.dsl.UpdateDSL;
21+
import org.mybatis.dynamic.sql.dsl.UpdateDSLCompleter;
2122
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
22-
import org.mybatis.dynamic.sql.update.UpdateDSL;
23-
import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
24-
import org.mybatis.dynamic.sql.update.UpdateModel;
2523
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
2624
import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
2725
import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper;
@@ -31,84 +29,70 @@
3129

3230
@Mapper
3331
public interface AuthMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper<AuthVO>, CommonUpdateMapper {
34-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
3532
BasicColumn[] selectList = BasicColumn.columnList(userId, auth);
3633

37-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
3834
@SelectProvider(type=SqlProviderAdapter.class, method="select")
3935
@Results(id="AuthVOResult", value = {
4036
@Result(column="USERID", property="userId", jdbcType=JdbcType.VARCHAR),
4137
@Result(column="AUTH", property="auth", typeHandler=CustomEnumTypeHandler.class, jdbcType=JdbcType.VARCHAR)
4238
})
4339
List<AuthVO> selectMany(SelectStatementProvider selectStatement);
4440

45-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
4641
@SelectProvider(type=SqlProviderAdapter.class, method="select")
4742
@ResultMap("AuthVOResult")
4843
Optional<AuthVO> selectOne(SelectStatementProvider selectStatement);
4944

50-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
5145
default long count(CountDSLCompleter completer) {
5246
return MyBatis3Utils.countFrom(this::count, authVO, completer);
5347
}
5448

55-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
5649
default int delete(DeleteDSLCompleter completer) {
5750
return MyBatis3Utils.deleteFrom(this::delete, authVO, completer);
5851
}
5952

60-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
6153
default int insert(AuthVO row) {
6254
return MyBatis3Utils.insert(this::insert, row, authVO, c ->
63-
c.map(userId).toProperty("userId")
64-
.map(auth).toProperty("auth")
55+
c.withMappedColumn(userId)
56+
.withMappedColumn(auth)
6557
);
6658
}
6759

68-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
6960
default int insertMultiple(Collection<AuthVO> records) {
7061
return MyBatis3Utils.insertMultiple(this::insertMultiple, records, authVO, c ->
71-
c.map(userId).toProperty("userId")
72-
.map(auth).toProperty("auth")
62+
c.withMappedColumn(userId)
63+
.withMappedColumn(auth)
7364
);
7465
}
7566

76-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
7767
default int insertSelective(AuthVO row) {
7868
return MyBatis3Utils.insert(this::insert, row, authVO, c ->
79-
c.map(userId).toPropertyWhenPresent("userId", row::getUserId)
80-
.map(auth).toPropertyWhenPresent("auth", row::getAuth)
69+
c.withMappedColumnWhenPresent(userId, row::getUserId)
70+
.withMappedColumnWhenPresent(auth, row::getAuth)
8171
);
8272
}
8373

84-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
8574
default Optional<AuthVO> selectOne(SelectDSLCompleter completer) {
8675
return MyBatis3Utils.selectOne(this::selectOne, selectList, authVO, completer);
8776
}
8877

89-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
9078
default List<AuthVO> select(SelectDSLCompleter completer) {
9179
return MyBatis3Utils.selectList(this::selectMany, selectList, authVO, completer);
9280
}
9381

94-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
9582
default List<AuthVO> selectDistinct(SelectDSLCompleter completer) {
9683
return MyBatis3Utils.selectDistinct(this::selectMany, selectList, authVO, completer);
9784
}
9885

99-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
10086
default int update(UpdateDSLCompleter completer) {
10187
return MyBatis3Utils.update(this::update, authVO, completer);
10288
}
10389

104-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
105-
static UpdateDSL<UpdateModel> updateAllColumns(AuthVO row, UpdateDSL<UpdateModel> dsl) {
90+
static UpdateDSL updateAllColumns(AuthVO row, UpdateDSL dsl) {
10691
return dsl.set(userId).equalTo(row::getUserId)
10792
.set(auth).equalTo(row::getAuth);
10893
}
10994

110-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
111-
static UpdateDSL<UpdateModel> updateSelectiveColumns(AuthVO row, UpdateDSL<UpdateModel> dsl) {
95+
static UpdateDSL updateSelectiveColumns(AuthVO row, UpdateDSL dsl) {
11296
return dsl.set(userId).equalToWhenPresent(row::getUserId)
11397
.set(auth).equalToWhenPresent(row::getAuth);
11498
}

‎part07/jex06/src/main/java/org/fp024/mapper/generated/AuthVODynamicSqlSupport.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
package org.fp024.mapper.generated;
22

33
import java.sql.JDBCType;
4-
import javax.annotation.Generated;
54
import org.fp024.type.MemberAuthType;
65
import org.mybatis.dynamic.sql.AliasableSqlTable;
76
import org.mybatis.dynamic.sql.SqlColumn;
87

98
public final class AuthVODynamicSqlSupport {
10-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
119
public static final AuthVO authVO = new AuthVO();
1210

13-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
1411
public static final SqlColumn<String> userId = authVO.userId;
1512

16-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
1713
public static final SqlColumn<MemberAuthType> auth = authVO.auth;
1814

19-
@Generated("org.mybatis.generator.api.MyBatisGenerator")
2015
public static final class AuthVO extends AliasableSqlTable<AuthVO> {
21-
public final SqlColumn<String> userId = column("USERID", JDBCType.VARCHAR);
16+
public final SqlColumn<String> userId = column("USERID", JDBCType.VARCHAR).withJavaProperty("userId");
2217

23-
public final SqlColumn<MemberAuthType> auth = column("AUTH", JDBCType.VARCHAR, "org.fp024.typehandler.CustomEnumTypeHandler");
18+
public final SqlColumn<MemberAuthType> auth = column("AUTH", JDBCType.VARCHAR, "org.fp024.typehandler.CustomEnumTypeHandler").withJavaProperty("auth");
2419

2520
public AuthVO() {
2621
super("TBL_MEMBER_AUTH", AuthVO::new);

0 commit comments

Comments
 (0)