Skip to content

Commit 7beb7b1

Browse files
cadecodecadecode
committed
fix: 修改为惰性 new 异常
1 parent 2b04bb0 commit 7beb7b1

1 file changed

Lines changed: 44 additions & 42 deletions

File tree

  • uni-boot-common/src/main/java/top/cadecode/uniboot/common/util

‎uni-boot-common/src/main/java/top/cadecode/uniboot/common/util/AssertUtil.java‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import top.cadecode.uniboot.common.exception.UniErrorCode;
55
import top.cadecode.uniboot.common.exception.UniException;
66

7+
import java.util.function.Supplier;
8+
79
/**
810
* 断言工具类
911
*
@@ -15,12 +17,12 @@ public class AssertUtil {
1517
/**
1618
* 判断是否为 true，如果是就抛出运行时异常
1719
*
18-
* @param expression 布尔表达式
19-
* @param exception 运行时异常
20+
* @param expression 布尔表达式
21+
* @param exceptionSupplier 运行时异常提供者
2022
*/
21-
public static void isTrue(boolean expression, RuntimeException exception) {
23+
public static void isTrue(boolean expression, Supplier<RuntimeException> exceptionSupplier) {
2224
if (expression) {
23-
throw exception;
25+
throw exceptionSupplier.get();
2426
}
2527
}
2628

@@ -31,7 +33,7 @@ public static void isTrue(boolean expression, RuntimeException exception) {
3133
* @param moreInfo 异常信息
3234
*/
3335
public static void isTrue(boolean expression, String moreInfo) {
34-
isTrue(expression, UniException.of(moreInfo));
36+
isTrue(expression, () -> UniException.of(moreInfo));
3537
}
3638

3739
/**
@@ -42,7 +44,7 @@ public static void isTrue(boolean expression, String moreInfo) {
4244
* @param moreInfo 异常信息
4345
*/
4446
public static void isTrue(boolean expression, UniErrorCode errorCode, String moreInfo) {
45-
isTrue(expression, UniException.of(errorCode, moreInfo));
47+
isTrue(expression, () -> UniException.of(errorCode, moreInfo));
4648
}
4749

4850
/**
@@ -54,17 +56,17 @@ public static void isTrue(boolean expression, UniErrorCode errorCode, String mor
5456
* @param moreInfo 异常信息
5557
*/
5658
public static void isTrue(boolean expression, UniErrorCode errorCode, Throwable throwable, String moreInfo) {
57-
isTrue(expression, UniException.of(errorCode, throwable, moreInfo));
59+
isTrue(expression, () -> UniException.of(errorCode, throwable, moreInfo));
5860
}
5961

6062
/**
6163
* 判断是否为 false，如果是就抛出运行时异常
6264
*
63-
* @param expression 布尔表达式
64-
* @param exception 运行时异常
65+
* @param expression 布尔表达式
66+
* @param exceptionSupplier 运行时异常提供者
6567
*/
66-
public static void isFalse(boolean expression, RuntimeException exception) {
67-
isTrue(!expression, exception);
68+
public static void isFalse(boolean expression, Supplier<RuntimeException> exceptionSupplier) {
69+
isTrue(!expression, exceptionSupplier);
6870
}
6971

7072
/**
@@ -74,7 +76,7 @@ public static void isFalse(boolean expression, RuntimeException exception) {
7476
* @param moreInfo 异常信息
7577
*/
7678
public static void isFalse(boolean expression, String moreInfo) {
77-
isTrue(!expression, UniException.of(moreInfo));
79+
isTrue(!expression, () -> UniException.of(moreInfo));
7880
}
7981

8082
/**
@@ -85,7 +87,7 @@ public static void isFalse(boolean expression, String moreInfo) {
8587
* @param moreInfo 异常信息
8688
*/
8789
public static void isFalse(boolean expression, UniErrorCode errorCode, String moreInfo) {
88-
isTrue(!expression, UniException.of(errorCode, moreInfo));
90+
isTrue(!expression, () -> UniException.of(errorCode, moreInfo));
8991
}
9092

9193
/**
@@ -97,17 +99,17 @@ public static void isFalse(boolean expression, UniErrorCode errorCode, String mo
9799
* @param moreInfo 异常信息
98100
*/
99101
public static void isFalse(boolean expression, UniErrorCode errorCode, Throwable throwable, String moreInfo) {
100-
isTrue(!expression, UniException.of(errorCode, throwable, moreInfo));
102+
isTrue(!expression, () -> UniException.of(errorCode, throwable, moreInfo));
101103
}
102104

103105
/**
104106
* 判断是否为 null，如果是就抛出运行时异常
105107
*
106-
* @param o 对象
107-
* @param exception 运行时异常
108+
* @param o 对象
109+
* @param exceptionSupplier 运行时异常提供者
108110
*/
109-
public static void isNull(Object o, RuntimeException exception) {
110-
isTrue(ObjectUtil.isNull(o), exception);
111+
public static void isNull(Object o, Supplier<RuntimeException> exceptionSupplier) {
112+
isTrue(ObjectUtil.isNull(o), exceptionSupplier);
111113
}
112114

113115
/**
@@ -117,7 +119,7 @@ public static void isNull(Object o, RuntimeException exception) {
117119
* @param moreInfo 异常信息
118120
*/
119121
public static void isNull(Object o, String moreInfo) {
120-
isTrue(ObjectUtil.isNull(o), UniException.of(moreInfo));
122+
isTrue(ObjectUtil.isNull(o), () -> UniException.of(moreInfo));
121123
}
122124

123125
/**
@@ -128,7 +130,7 @@ public static void isNull(Object o, String moreInfo) {
128130
* @param moreInfo 异常信息
129131
*/
130132
public static void isNull(Object o, UniErrorCode errorCode, String moreInfo) {
131-
isTrue(ObjectUtil.isNull(o), UniException.of(errorCode, moreInfo));
133+
isTrue(ObjectUtil.isNull(o), () -> UniException.of(errorCode, moreInfo));
132134
}
133135

134136
/**
@@ -140,17 +142,17 @@ public static void isNull(Object o, UniErrorCode errorCode, String moreInfo) {
140142
* @param moreInfo 异常信息
141143
*/
142144
public static void isNull(Object o, UniErrorCode errorCode, Throwable throwable, String moreInfo) {
143-
isTrue(ObjectUtil.isNull(o), UniException.of(errorCode, throwable, moreInfo));
145+
isTrue(ObjectUtil.isNull(o), () -> UniException.of(errorCode, throwable, moreInfo));
144146
}
145147

146148
/**
147149
* 判断是否不为 null，如果是就抛出运行时异常
148150
*
149-
* @param o 对象
150-
* @param exception 运行时异常
151+
* @param o 对象
152+
* @param exceptionSupplier 运行时异常提供者
151153
*/
152-
public static void isNotNull(Object o, RuntimeException exception) {
153-
isTrue(ObjectUtil.isNotNull(o), exception);
154+
public static void isNotNull(Object o, Supplier<RuntimeException> exceptionSupplier) {
155+
isTrue(ObjectUtil.isNotNull(o), exceptionSupplier);
154156
}
155157

156158
/**
@@ -160,7 +162,7 @@ public static void isNotNull(Object o, RuntimeException exception) {
160162
* @param moreInfo 异常信息
161163
*/
162164
public static void isNotNull(Object o, String moreInfo) {
163-
isTrue(ObjectUtil.isNotNull(o), UniException.of(moreInfo));
165+
isTrue(ObjectUtil.isNotNull(o), () -> UniException.of(moreInfo));
164166
}
165167

166168
/**
@@ -171,7 +173,7 @@ public static void isNotNull(Object o, String moreInfo) {
171173
* @param moreInfo 异常信息
172174
*/
173175
public static void isNotNull(Object o, UniErrorCode errorCode, String moreInfo) {
174-
isTrue(ObjectUtil.isNotNull(o), UniException.of(errorCode, moreInfo));
176+
isTrue(ObjectUtil.isNotNull(o), () -> UniException.of(errorCode, moreInfo));
175177
}
176178

177179
/**
@@ -183,17 +185,17 @@ public static void isNotNull(Object o, UniErrorCode errorCode, String moreInfo)
183185
* @param moreInfo 异常信息
184186
*/
185187
public static void isNotNull(Object o, UniErrorCode errorCode, Throwable throwable, String moreInfo) {
186-
isTrue(ObjectUtil.isNotNull(o), UniException.of(errorCode, throwable, moreInfo));
188+
isTrue(ObjectUtil.isNotNull(o), () -> UniException.of(errorCode, throwable, moreInfo));
187189
}
188190

189191
/**
190192
* 判断是否为空，如果是就抛出运行时异常
191193
*
192-
* @param o 对象
193-
* @param exception 运行时异常
194+
* @param o 对象
195+
* @param exceptionSupplier 运行时异常提供者
194196
*/
195-
public static void isEmpty(Object o, RuntimeException exception) {
196-
isTrue(ObjectUtil.isEmpty(o), exception);
197+
public static void isEmpty(Object o, Supplier<RuntimeException> exceptionSupplier) {
198+
isTrue(ObjectUtil.isEmpty(o), exceptionSupplier);
197199
}
198200

199201
/**
@@ -203,7 +205,7 @@ public static void isEmpty(Object o, RuntimeException exception) {
203205
* @param moreInfo 异常信息
204206
*/
205207
public static void isEmpty(Object o, String moreInfo) {
206-
isTrue(ObjectUtil.isEmpty(o), UniException.of(moreInfo));
208+
isTrue(ObjectUtil.isEmpty(o), () -> UniException.of(moreInfo));
207209
}
208210

209211
/**
@@ -214,7 +216,7 @@ public static void isEmpty(Object o, String moreInfo) {
214216
* @param moreInfo 异常信息
215217
*/
216218
public static void isEmpty(Object o, UniErrorCode errorCode, String moreInfo) {
217-
isTrue(ObjectUtil.isEmpty(o), UniException.of(errorCode, moreInfo));
219+
isTrue(ObjectUtil.isEmpty(o), () -> UniException.of(errorCode, moreInfo));
218220
}
219221

220222
/**
@@ -226,17 +228,17 @@ public static void isEmpty(Object o, UniErrorCode errorCode, String moreInfo) {
226228
* @param moreInfo 异常信息
227229
*/
228230
public static void isEmpty(Object o, UniErrorCode errorCode, Throwable throwable, String moreInfo) {
229-
isTrue(ObjectUtil.isEmpty(o), UniException.of(errorCode, throwable, moreInfo));
231+
isTrue(ObjectUtil.isEmpty(o), () -> UniException.of(errorCode, throwable, moreInfo));
230232
}
231233

232234
/**
233235
* 判断是否不为空，如果是就抛出运行时异常
234236
*
235-
* @param o 对象
236-
* @param exception 运行时异常
237+
* @param o 对象
238+
* @param exceptionSupplier 运行时异常提供者
237239
*/
238-
public static void isNotEmpty(Object o, RuntimeException exception) {
239-
isTrue(ObjectUtil.isNotEmpty(o), exception);
240+
public static void isNotEmpty(Object o, Supplier<RuntimeException> exceptionSupplier) {
241+
isTrue(ObjectUtil.isNotEmpty(o), exceptionSupplier);
240242
}
241243

242244
/**
@@ -246,7 +248,7 @@ public static void isNotEmpty(Object o, RuntimeException exception) {
246248
* @param moreInfo 异常信息
247249
*/
248250
public static void isNotEmpty(Object o, String moreInfo) {
249-
isTrue(ObjectUtil.isNotEmpty(o), UniException.of(moreInfo));
251+
isTrue(ObjectUtil.isNotEmpty(o), () -> UniException.of(moreInfo));
250252
}
251253

252254
/**
@@ -257,7 +259,7 @@ public static void isNotEmpty(Object o, String moreInfo) {
257259
* @param moreInfo 异常信息
258260
*/
259261
public static void isNotEmpty(Object o, UniErrorCode errorCode, String moreInfo) {
260-
isTrue(ObjectUtil.isNotEmpty(o), UniException.of(errorCode, moreInfo));
262+
isTrue(ObjectUtil.isNotEmpty(o), () -> UniException.of(errorCode, moreInfo));
261263
}
262264

263265
/**
@@ -269,7 +271,7 @@ public static void isNotEmpty(Object o, UniErrorCode errorCode, String moreInfo)
269271
* @param moreInfo 异常信息
270272
*/
271273
public static void isNotEmpty(Object o, UniErrorCode errorCode, Throwable throwable, String moreInfo) {
272-
isTrue(ObjectUtil.isNotEmpty(o), UniException.of(errorCode, throwable, moreInfo));
274+
isTrue(ObjectUtil.isNotEmpty(o), () -> UniException.of(errorCode, throwable, moreInfo));
273275
}
274276

275277
}

0 commit comments

Comments
 (0)