Skip to content

Commit 578a071

Browse files
zhou-haozhou-hao
committed
refactor: 移除事务readonly配置
1 parent 5e9e4a2 commit 578a071

9 files changed

Lines changed: 37 additions & 42 deletions

File tree

‎hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/service/CrudService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ default SyncDelete createDelete() {
3434
return getRepository().createDelete();
3535
}
3636

37-
@Transactional( readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
37+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
3838
@SneakyThrows
3939
default Optional<E> findById(K id) {
4040
return getRepository()
4141
.findById(id);
4242
}
4343

44-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
44+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
4545
@SneakyThrows
4646
default List<E> findById(Collection<K> id) {
4747
if (CollectionUtils.isEmpty(id)) {
@@ -103,13 +103,13 @@ default int deleteById(K idArr) {
103103
return deleteById(Collections.singletonList(idArr));
104104
}
105105

106-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
106+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
107107
@SneakyThrows
108108
default List<E> query(QueryParamEntity queryParam) {
109109
return createQuery().setParam(queryParam).fetch();
110110
}
111111

112-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
112+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
113113
@SneakyThrows
114114
default PagerResult<E> queryPager(QueryParamEntity param) {
115115

@@ -122,7 +122,7 @@ default PagerResult<E> queryPager(QueryParamEntity param) {
122122
return PagerResult.of(count, query(param), param);
123123
}
124124

125-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
125+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
126126
@SneakyThrows
127127
default int count(QueryParam param) {
128128
return getRepository()

‎hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/service/ReactiveCrudService.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ default Flux<E> findById(Collection<K> publisher) {
102102
.findById(publisher);
103103
}
104104

105-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
105+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
106106
default Mono<E> findById(Mono<K> publisher) {
107107
return getRepository()
108108
.findById(publisher);
109109
}
110110

111-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
111+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
112112
default Flux<E> findById(Flux<K> publisher) {
113113
return getRepository()
114114
.findById(publisher);
@@ -175,26 +175,26 @@ default Mono<Integer> deleteById(K id) {
175175
}
176176

177177

178-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
178+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
179179
default Flux<E> query(Mono<? extends QueryParamEntity> queryParamMono) {
180180
return queryParamMono
181181
.flatMapMany(this::query);
182182
}
183183

184-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
184+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
185185
default Flux<E> query(QueryParamEntity param) {
186186
return getRepository()
187187
.createQuery()
188188
.setParam(param)
189189
.fetch();
190190
}
191191

192-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
192+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
193193
default Mono<PagerResult<E>> queryPager(QueryParamEntity queryParamMono) {
194194
return queryPager(queryParamMono, Function.identity());
195195
}
196196

197-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
197+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
198198
default <T> Mono<PagerResult<T>> queryPager(QueryParamEntity query, Function<E, T> mapper) {
199199
//如果查询参数指定了总数,表示不需要再进行count操作.
200200
//建议前端在使用分页查询时,切换下一页时,将第一次查询到total结果传入查询参数,可以提升查询性能.
@@ -233,27 +233,27 @@ default <T> Mono<PagerResult<T>> queryPager(QueryParamEntity query, Function<E,
233233
});
234234
}
235235

236-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
236+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
237237
default <T> Mono<PagerResult<T>> queryPager(Mono<? extends QueryParamEntity> queryParamMono, Function<E, T> mapper) {
238238
return queryParamMono
239239
.cast(QueryParamEntity.class)
240240
.flatMap(param -> queryPager(param, mapper));
241241
}
242242

243-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
243+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
244244
default Mono<PagerResult<E>> queryPager(Mono<? extends QueryParamEntity> queryParamMono) {
245245
return queryPager(queryParamMono, Function.identity());
246246
}
247247

248-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
248+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
249249
default Mono<Integer> count(QueryParamEntity queryParam) {
250250
return getRepository()
251251
.createQuery()
252252
.setParam(queryParam)
253253
.count();
254254
}
255255

256-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
256+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
257257
default Mono<Integer> count(Mono<? extends QueryParamEntity> queryParamMono) {
258258
return queryParamMono.flatMap(this::count);
259259
}

‎hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/service/ReactiveTreeSortEntityService.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ default Mono<List<E>> queryResultToTree(Mono<? extends QueryParamEntity> paramEn
5151
* @param paramEntity 查询参数
5252
* @return 树形结构
5353
*/
54-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
54+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
5555
default Mono<List<E>> queryResultToTree(QueryParamEntity paramEntity) {
5656
return query(paramEntity)
5757
.collectList()
@@ -66,7 +66,7 @@ default Mono<List<E>> queryResultToTree(QueryParamEntity paramEntity) {
6666
* @param paramEntity 查询参数
6767
* @return 树形结构
6868
*/
69-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
69+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
7070
default Mono<List<E>> queryIncludeChildrenTree(QueryParamEntity paramEntity) {
7171
return queryIncludeChildren(paramEntity)
7272
.collectList()
@@ -81,7 +81,7 @@ default Mono<List<E>> queryIncludeChildrenTree(QueryParamEntity paramEntity) {
8181
* @param idList ID集合
8282
* @return 包含子节点的所有节点
8383
*/
84-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
84+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
8585
default Flux<E> queryIncludeChildren(Collection<K> idList) {
8686
return queryIncludeChildren(findById(idList));
8787
}
@@ -93,7 +93,7 @@ default Flux<E> queryIncludeChildren(Collection<K> idList) {
9393
* @return 包含子节点的所有节点
9494
* @since 4.0.18
9595
*/
96-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
96+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
9797
default Flux<E> queryIncludeChildren(Flux<E> entities) {
9898
Set<String> duplicateCheck = new HashSet<>();
9999
return entities
@@ -114,7 +114,7 @@ default Flux<E> queryIncludeChildren(Flux<E> entities) {
114114
* @param idList ID集合
115115
* @return 包含父节点的所有节点
116116
*/
117-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
117+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
118118
default Flux<E> queryIncludeParent(Collection<K> idList) {
119119
return queryIncludeParent(findById(idList));
120120
}
@@ -126,7 +126,7 @@ default Flux<E> queryIncludeParent(Collection<K> idList) {
126126
* @return 包含父节点的所有节点
127127
* @since 4.0.18
128128
*/
129-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
129+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
130130
default Flux<E> queryIncludeParent(Flux<E> entities) {
131131
Set<String> duplicateCheck = new HashSet<>();
132132

@@ -149,7 +149,7 @@ default Flux<E> queryIncludeParent(Flux<E> entities) {
149149
* @param queryParam 查询参数
150150
* @return 树形结构
151151
*/
152-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
152+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
153153
default Flux<E> queryIncludeChildren(QueryParamEntity queryParam) {
154154
Set<String> duplicateCheck = new HashSet<>();
155155

‎hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/service/TreeSortEntityService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
public interface TreeSortEntityService<E extends TreeSortSupportEntity<K>, K>
2828
extends CrudService<E, K> {
2929

30-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
30+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
3131
default List<E> queryResultToTree(QueryParamEntity paramEntity) {
3232
return TreeSupportEntity
3333
.list2tree(query(paramEntity),
3434
this::setChildren,
3535
this::createRootNodePredicate);
3636
}
3737

38-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
38+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
3939
default List<E> queryIncludeChildrenTree(QueryParamEntity paramEntity) {
4040

4141
return TreeSupportEntity
@@ -44,7 +44,7 @@ default List<E> queryIncludeChildrenTree(QueryParamEntity paramEntity) {
4444
this::createRootNodePredicate);
4545
}
4646

47-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
47+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
4848
default List<E> queryIncludeChildren(Collection<K> idList) {
4949
return findById(idList)
5050
.stream()
@@ -56,7 +56,7 @@ default List<E> queryIncludeChildren(Collection<K> idList) {
5656
.collect(Collectors.toList());
5757
}
5858

59-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
59+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
6060
default List<E> queryIncludeChildren(QueryParamEntity queryParam) {
6161
return query(queryParam)
6262
.stream()

‎hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/sql/DefaultJdbcExecutor.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package org.hswebframework.web.crud.sql;
22

3-
import lombok.Setter;
43
import lombok.extern.slf4j.Slf4j;
54
import org.hswebframework.ezorm.rdb.executor.SqlRequest;
65
import org.hswebframework.ezorm.rdb.executor.jdbc.JdbcSyncSqlExecutor;
76
import org.hswebframework.ezorm.rdb.executor.wrapper.ResultWrapper;
87
import org.hswebframework.web.api.crud.entity.TransactionManagers;
98
import org.hswebframework.web.datasource.DataSourceHolder;
109
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.dao.support.PersistenceExceptionTranslator;
1210
import org.springframework.jdbc.datasource.DataSourceUtils;
13-
import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
14-
import org.springframework.jdbc.support.SQLExceptionTranslator;
1511
import org.springframework.transaction.annotation.Propagation;
1612
import org.springframework.transaction.annotation.Transactional;
1713

@@ -87,7 +83,7 @@ public int update(SqlRequest request) {
8783
}
8884

8985
@Override
90-
@Transactional(readOnly = true, transactionManager = TransactionManagers.jdbcTransactionManager)
86+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
9187
public <T, R> R select(SqlRequest request, ResultWrapper<T, R> wrapper) {
9288
return super.select(request, wrapper);
9389
}

‎hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/sql/DefaultJdbcReactiveExecutor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected <T> Flux<T> doInConnection(Function<Connection, Publisher<T>> handler)
7272
}
7373

7474
@Override
75-
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager, readOnly = true)
75+
@Transactional(transactionManager = TransactionManagers.jdbcTransactionManager)
7676
public <E> Flux<E> select(String sql, ResultWrapper<E, ?> wrapper) {
7777
return super.select(sql, wrapper);
7878
}

‎hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/sql/DefaultR2dbcExecutor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,25 +176,25 @@ public Mono<Integer> update(String sql, Object... args) {
176176
}
177177

178178
@Override
179-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
179+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
180180
public <E> Flux<E> select(Publisher<SqlRequest> request, ResultWrapper<E, ?> wrapper) {
181181
return super.select(request, wrapper);
182182
}
183183

184184
@Override
185-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
185+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
186186
public Flux<Map<String, Object>> select(String sql, Object... args) {
187187
return super.select(sql, args);
188188
}
189189

190190
@Override
191-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
191+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
192192
public <E> Flux<E> select(String sql, ResultWrapper<E, ?> wrapper) {
193193
return super.select(sql, wrapper);
194194
}
195195

196196
@Override
197-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
197+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
198198
public <E> Flux<E> select(SqlRequest sqlRequest, ResultWrapper<E, ?> wrapper) {
199199
return super.select(sqlRequest, wrapper);
200200
}

‎hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultDimensionService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ public Flux<? extends Dimension> getDimensionsById(DimensionType type, Collectio
8787
}
8888

8989
@Override
90-
@Transactional(readOnly = true)
9190
public Flux<DynamicDimension> getDimensionByUserId(String userId) {
9291
return getAllType()
9392
.collect(Collectors.toMap(DimensionType::getId, Function.identity()))

‎hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveUserService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ protected Mono<UserEntity> doUpdate(UserEntity old, UserEntity newer) {
142142
}
143143

144144
@Override
145-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
145+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
146146
public Mono<UserEntity> findById(String id) {
147147
return getRepository().findById(Mono.just(id));
148148
}
149149

150150
@Override
151-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
151+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
152152
public Mono<UserEntity> findByUsername(String username) {
153153
return Mono.justOrEmpty(username)
154154
.flatMap(_name -> repository
@@ -158,7 +158,7 @@ public Mono<UserEntity> findByUsername(String username) {
158158
}
159159

160160
@Override
161-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
161+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
162162
public Mono<UserEntity> findByUsernameAndPassword(String username, String plainPassword) {
163163
return Mono.justOrEmpty(username)
164164
.flatMap(_name -> repository
@@ -218,7 +218,7 @@ public Mono<Boolean> changePassword(String userId, String oldPassword, String ne
218218
}
219219

220220
@Override
221-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
221+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
222222
public Flux<UserEntity> findUser(QueryParam queryParam) {
223223
return repository
224224
.createQuery()
@@ -227,7 +227,7 @@ public Flux<UserEntity> findUser(QueryParam queryParam) {
227227
}
228228

229229
@Override
230-
@Transactional(readOnly = true, transactionManager = TransactionManagers.reactiveTransactionManager)
230+
@Transactional(transactionManager = TransactionManagers.reactiveTransactionManager)
231231
public Mono<Integer> countUser(QueryParam queryParam) {
232232
return repository
233233
.createQuery()

0 commit comments

Comments
 (0)