diff --git a/.etc/checkstyle/checkstyle.xml b/.etc/checkstyle/checkstyle.xml
index caaff17e8..5349e5070 100644
--- a/.etc/checkstyle/checkstyle.xml
+++ b/.etc/checkstyle/checkstyle.xml
@@ -45,28 +45,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/BooleanEnum.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/BooleanEnum.java
index 4d78181d2..60dff8cbb 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/BooleanEnum.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/BooleanEnum.java
@@ -40,11 +40,11 @@ public enum BooleanEnum {
private final Integer intValue;
public Boolean booleanValue() {
- return booleanValue;
+ return this.booleanValue;
}
public Integer intValue() {
- return intValue;
+ return this.intValue;
}
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/CompatibleSSLFactory.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/CompatibleSSLFactory.java
index 30b6fe81b..f8df5e379 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/CompatibleSSLFactory.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/CompatibleSSLFactory.java
@@ -59,52 +59,52 @@ public CompatibleSSLFactory(String protocol, KeyManager[] keyManagers, TrustMana
@Override
public String[] getDefaultCipherSuites() {
- return factory.getDefaultCipherSuites();
+ return this.factory.getDefaultCipherSuites();
}
@Override
public String[] getSupportedCipherSuites() {
- return factory.getSupportedCipherSuites();
+ return this.factory.getSupportedCipherSuites();
}
@Override
public Socket createSocket() throws IOException {
- return enabledProtocols(factory.createSocket());
+ return enabledProtocols(this.factory.createSocket());
}
@Override
public Socket createSocket(Socket socket, InputStream inputStream, boolean b) throws IOException {
- return enabledProtocols(factory.createSocket(socket, inputStream, b));
+ return enabledProtocols(this.factory.createSocket(socket, inputStream, b));
}
@Override
public Socket createSocket(Socket socket, String s, int i, boolean b) throws IOException {
- return enabledProtocols(factory.createSocket(socket, s, i, b));
+ return enabledProtocols(this.factory.createSocket(socket, s, i, b));
}
@Override
public Socket createSocket(String s, int i) throws IOException {
- return enabledProtocols(factory.createSocket(s, i));
+ return enabledProtocols(this.factory.createSocket(s, i));
}
@Override
public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) throws IOException {
- return enabledProtocols(factory.createSocket(s, i, inetAddress, i1));
+ return enabledProtocols(this.factory.createSocket(s, i, inetAddress, i1));
}
@Override
public Socket createSocket(InetAddress inetAddress, int i) throws IOException {
- return enabledProtocols(factory.createSocket(inetAddress, i));
+ return enabledProtocols(this.factory.createSocket(inetAddress, i));
}
@Override
public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) throws IOException {
- return enabledProtocols(factory.createSocket(inetAddress, i, inetAddress1, i1));
+ return enabledProtocols(this.factory.createSocket(inetAddress, i, inetAddress1, i1));
}
private Socket enabledProtocols(Socket socket) {
- if (!ArrayUtils.isEmpty(protocols) && socket instanceof SSLSocket) {
- ((SSLSocket) socket).setEnabledProtocols(protocols);
+ if (!ArrayUtils.isEmpty(this.protocols) && socket instanceof SSLSocket) {
+ ((SSLSocket) socket).setEnabledProtocols(this.protocols);
}
return socket;
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/ModifyParameterRequestWrapper.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/ModifyParameterRequestWrapper.java
index e6a573de7..43639575b 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/ModifyParameterRequestWrapper.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/ModifyParameterRequestWrapper.java
@@ -53,7 +53,7 @@ public String getParameter(String name) {
@Override
public Enumeration getParameterNames() {
- return Collections.enumeration(parameterMap.keySet());
+ return Collections.enumeration(this.parameterMap.keySet());
}
@Override
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java
index 57ea3af18..0cef93665 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java
@@ -51,12 +51,13 @@ public RepeatBodyRequestWrapper(HttpServletRequest request) {
@Override
public BufferedReader getReader() {
- return ObjectUtils.isEmpty(bodyByteArray) ? null : new BufferedReader(new InputStreamReader(getInputStream()));
+ return ObjectUtils.isEmpty(this.bodyByteArray) ? null
+ : new BufferedReader(new InputStreamReader(getInputStream()));
}
@Override
public ServletInputStream getInputStream() {
- final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bodyByteArray);
+ final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(this.bodyByteArray);
return new ServletInputStream() {
@Override
public boolean isFinished() {
@@ -81,7 +82,7 @@ public int read() {
}
public byte[] getBodyByteArray() {
- return bodyByteArray;
+ return this.bodyByteArray;
}
private static byte[] getByteBody(HttpServletRequest request) {
@@ -102,7 +103,7 @@ private static byte[] getByteBody(HttpServletRequest request) {
*/
@Override
public Map getParameterMap() {
- return parameterMap;
+ return this.parameterMap;
}
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractBlockingQueueThread.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractBlockingQueueThread.java
index abc624197..ff908b8f2 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractBlockingQueueThread.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractBlockingQueueThread.java
@@ -33,20 +33,20 @@ public abstract class AbstractBlockingQueueThread extends AbstractQueueThread
public void put(T t) {
if (t != null) {
try {
- queue.put(t);
+ this.queue.put(t);
}
catch (InterruptedException e) {
currentThread().interrupt();
}
catch (Exception e) {
- log.error("{} put Object error, param: {}", this.getClass().toString(), t, e);
+ this.log.error("{} put Object error, param: {}", this.getClass().toString(), t, e);
}
}
}
@Override
protected T poll(long time) throws InterruptedException {
- return queue.poll(time, TimeUnit.MILLISECONDS);
+ return this.queue.poll(time, TimeUnit.MILLISECONDS);
}
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractDynamicTimer.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractDynamicTimer.java
index 1ba64481a..67e71d193 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractDynamicTimer.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractDynamicTimer.java
@@ -54,16 +54,16 @@ public void put(T t) {
}
try {
- lock.runByInterruptibly(() -> {
- queue.add(t);
- lock.signalAll();
+ this.lock.runByInterruptibly(() -> {
+ this.queue.add(t);
+ this.lock.signalAll();
});
}
catch (InterruptedException e) {
interrupt();
}
catch (Exception e) {
- log.error("{} put error, param: {}", this.getClass().toString(), t, e);
+ this.log.error("{} put error, param: {}", this.getClass().toString(), t, e);
}
}
@@ -80,9 +80,9 @@ public void run() {
while (isRun()) {
try {
T t = pool();
- lock.runByInterruptibly(() -> {
+ this.lock.runByInterruptibly(() -> {
if (t == null) {
- lock.await(24, TimeUnit.HOURS);
+ this.lock.await(24, TimeUnit.HOURS);
return;
}
@@ -90,7 +90,7 @@ public void run() {
// 需要休眠
if (sleepTime > 0) {
// 如果是被唤醒
- if (lock.await(sleepTime, TimeUnit.MILLISECONDS)) {
+ if (this.lock.await(sleepTime, TimeUnit.MILLISECONDS)) {
replay(t);
return;
}
@@ -111,17 +111,17 @@ public void run() {
}
protected T pool() {
- return queue.poll();
+ return this.queue.poll();
}
protected abstract void process(T t);
protected void error(Exception e) {
- log.error("类: {}; 线程: {}; 运行异常! ", getSimpleName(), getId(), e);
+ this.log.error("类: {}; 线程: {}; 运行异常! ", getSimpleName(), getId(), e);
}
protected void shutdown() {
- log.warn("类: {}; 线程: {}; 被中断! 剩余数据: {}", getSimpleName(), getId(), queue.size());
+ this.log.warn("类: {}; 线程: {}; 被中断! 剩余数据: {}", getSimpleName(), getId(), this.queue.size());
}
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractQueueThread.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractQueueThread.java
index 5f61a9e9d..958600678 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractQueueThread.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractQueueThread.java
@@ -132,7 +132,7 @@ public void run() {
}
// Throwable 异常直接结束. 这里捕获用来保留信息. 方便排查问题
catch (Throwable t) {
- log.error("线程队列运行异常!", t);
+ this.log.error("线程队列运行异常!", t);
throw t;
}
}
@@ -170,7 +170,7 @@ public E poll() {
e = poll(getPollTimeout());
}
catch (InterruptedException ex) {
- log.error("{} 类的poll线程被中断!id: {}", getClass().getSimpleName(), getId());
+ this.log.error("{} 类的poll线程被中断!id: {}", getClass().getSimpleName(), getId());
interrupt();
}
return e;
@@ -188,7 +188,7 @@ public E poll() {
* @param list 当前数据
*/
protected void shutdown(List list) {
- log.warn("{} 线程: {} 被关闭. 数据:{}", this.getClass().getSimpleName(), getId(), list);
+ this.log.warn("{} 线程: {} 被关闭. 数据:{}", this.getClass().getSimpleName(), getId(), list);
}
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractThreadContextComponent.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractThreadContextComponent.java
index 0bb7cefc7..8b7aeaeb7 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractThreadContextComponent.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractThreadContextComponent.java
@@ -44,7 +44,7 @@ public void onApplicationStart() {
@Override
public void onApplicationStop() {
- log.warn("{} 线程: {}; 开始关闭!", getClass().getSimpleName(), getId());
+ this.log.warn("{} 线程: {}; 开始关闭!", getClass().getSimpleName(), getId());
interrupt();
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractTimer.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractTimer.java
index afabb899d..f244c5050 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractTimer.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractTimer.java
@@ -39,11 +39,11 @@ public long getTimeout() {
* 线程被中断触发.
*/
protected void shutdown() {
- log.warn("{} 类 线程: {} 被中断!", getClass().getSimpleName(), getId());
+ this.log.warn("{} 类 线程: {} 被中断!", getClass().getSimpleName(), getId());
}
protected void error(Exception e) {
- log.error("{} 类 线程: {} 出现异常!", getClass().getSimpleName(), getId(), e);
+ this.log.error("{} 类 线程: {} 出现异常!", getClass().getSimpleName(), getId(), e);
}
@Override
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java
index 68c4c3c3d..1fce9bff0 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java
@@ -34,16 +34,16 @@ public class EnumValueValidatorOfClass implements ConstraintValidator clazz : classList) {
+ for (Class clazz : this.classList) {
if (clazz.isAssignableFrom(value)) {
return true;
}
diff --git a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java
index 6284a30d8..ad460b14e 100644
--- a/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java
+++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java
@@ -34,16 +34,16 @@ public class EnumValueValidatorOfInt implements ConstraintValidator eClass : targetEnum) {
+ for (Class eClass : this.targetEnum) {
// 包装类和原始类型的处理
Class clazz = ClassUtils.isPrimitiveWrapper(value.getClass())
? ClassUtils.wrapperToPrimitive(value.getClass()) : value.getClass();
try {
- Object enumInstance = MethodUtils.invokeStaticMethod(eClass, checkMethod, new Object[] { value },
+ Object enumInstance = MethodUtils.invokeStaticMethod(eClass, this.checkMethod, new Object[] { value },
new Class[] { clazz });
return enumInstance != null;
}
diff --git a/common/ballcat-common-core/src/test/java/org/ballcat/common/core/thread/AbstractDynamicTimerTest.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/thread/AbstractDynamicTimerTest.java
index 926c9d4a5..0cf586873 100644
--- a/common/ballcat-common-core/src/test/java/org/ballcat/common/core/thread/AbstractDynamicTimerTest.java
+++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/thread/AbstractDynamicTimerTest.java
@@ -42,13 +42,13 @@ class AbstractDynamicTimerTest {
@BeforeEach
void before() {
- timer = new DynamicTimer();
- timer.onApplicationStart();
+ this.timer = new DynamicTimer();
+ this.timer.onApplicationStart();
}
@AfterEach
void after() {
- timer.onApplicationStop();
+ this.timer.onApplicationStop();
}
@Test
@@ -58,19 +58,19 @@ void test() throws InterruptedException {
Action a2 = new Action("2", now.plusSeconds(2));
Action a4 = new Action("4", now.plusSeconds(4));
- timer.put(a1);
- timer.put(a2);
- timer.put(a4);
+ this.timer.put(a1);
+ this.timer.put(a2);
+ this.timer.put(a4);
TimeUnit.MILLISECONDS.sleep(1050);
- Assertions.assertEquals(1, timer.getProcessedCount());
+ Assertions.assertEquals(1, this.timer.getProcessedCount());
TimeUnit.SECONDS.sleep(1);
- Assertions.assertEquals(2, timer.getProcessedCount());
+ Assertions.assertEquals(2, this.timer.getProcessedCount());
- timer.put(a2);
+ this.timer.put(a2);
TimeUnit.MILLISECONDS.sleep(2050);
- Assertions.assertEquals(4, timer.getProcessedCount());
+ Assertions.assertEquals(4, this.timer.getProcessedCount());
}
@Data
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/JavaReentrantLock.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/JavaReentrantLock.java
index b7bb7e058..763a49d04 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/JavaReentrantLock.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/JavaReentrantLock.java
@@ -36,7 +36,7 @@ public class JavaReentrantLock {
/**
* 激活与休眠线程
*/
- protected final Condition defaultCondition = lock.newCondition();
+ protected final Condition defaultCondition = this.lock.newCondition();
public Condition newCondition() {
return getLock().newCondition();
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/markdown/MarkdownBuilder.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/markdown/MarkdownBuilder.java
index 525fec25a..a0286c338 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/markdown/MarkdownBuilder.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/markdown/MarkdownBuilder.java
@@ -67,7 +67,7 @@ public MarkdownBuilder() {
* @param content 自定义内容
*/
public MarkdownBuilder append(Object content) {
- lineTextBuilder.append(toString(content));
+ this.lineTextBuilder.append(toString(content));
return this;
}
@@ -100,7 +100,7 @@ public MarkdownBuilder orderList(Object content) {
*/
public MarkdownBuilder orderList(int index, Object content) {
lineBreak();
- lineTextBuilder.append(index).append(ORDER_LIST_PREFIX).append(toString(content));
+ this.lineTextBuilder.append(index).append(ORDER_LIST_PREFIX).append(toString(content));
return this;
}
@@ -110,7 +110,7 @@ public MarkdownBuilder orderList(int index, Object content) {
public MarkdownBuilder unorderedList(Object content) {
// 换行
lineBreak();
- lineTextBuilder.append(UNORDERED_LIST_PREFIX).append(toString(content));
+ this.lineTextBuilder.append(UNORDERED_LIST_PREFIX).append(toString(content));
return this;
}
@@ -128,7 +128,7 @@ public MarkdownBuilder pic(String url) {
* @param url 图片路径
*/
public MarkdownBuilder pic(Object title, String url) {
- lineTextBuilder.append("![").append(title).append("](").append(url).append(")");
+ this.lineTextBuilder.append("![").append(title).append("](").append(url).append(")");
return this;
}
@@ -138,7 +138,7 @@ public MarkdownBuilder pic(Object title, String url) {
* @param url http 路径
*/
public MarkdownBuilder link(Object title, String url) {
- lineTextBuilder.append("[").append(title).append("](").append(url).append(")");
+ this.lineTextBuilder.append("[").append(title).append("](").append(url).append(")");
return this;
}
@@ -146,7 +146,7 @@ public MarkdownBuilder link(Object title, String url) {
* 斜体
*/
public MarkdownBuilder italic(Object content) {
- lineTextBuilder.append(ITALIC_PREFIX).append(toString(content)).append(ITALIC_PREFIX);
+ this.lineTextBuilder.append(ITALIC_PREFIX).append(toString(content)).append(ITALIC_PREFIX);
return this;
}
@@ -154,7 +154,7 @@ public MarkdownBuilder italic(Object content) {
* 加粗
*/
public MarkdownBuilder bold(Object content) {
- lineTextBuilder.append(BOLD_PREFIX).append(toString(content)).append(BOLD_PREFIX);
+ this.lineTextBuilder.append(BOLD_PREFIX).append(toString(content)).append(BOLD_PREFIX);
return this;
}
@@ -164,9 +164,9 @@ public MarkdownBuilder bold(Object content) {
*/
public MarkdownBuilder quote(Object... content) {
lineBreak();
- lineTextBuilder.append(QUOTE_PREFIX);
+ this.lineTextBuilder.append(QUOTE_PREFIX);
for (Object o : content) {
- lineTextBuilder.append(toString(o));
+ this.lineTextBuilder.append(toString(o));
}
return this;
}
@@ -186,13 +186,13 @@ public MarkdownBuilder quoteBreak(Object... content) {
*/
public MarkdownBuilder code(String type, Object... code) {
lineBreak();
- lineTextBuilder.append(CODE_PREFIX).append(type);
+ this.lineTextBuilder.append(CODE_PREFIX).append(type);
lineBreak();
for (Object o : code) {
- lineTextBuilder.append(toString(o));
+ this.lineTextBuilder.append(toString(o));
}
lineBreak();
- lineTextBuilder.append(CODE_SUFFIX);
+ this.lineTextBuilder.append(CODE_SUFFIX);
return lineBreak();
}
@@ -220,8 +220,8 @@ private String multiJson(Object obj) {
* 强制换行
*/
public MarkdownBuilder forceLineBreak() {
- content.add(lineTextBuilder.toString());
- lineTextBuilder = new StringBuilder();
+ this.content.add(this.lineTextBuilder.toString());
+ this.lineTextBuilder = new StringBuilder();
return this;
}
@@ -229,7 +229,7 @@ public MarkdownBuilder forceLineBreak() {
* 换行 当已编辑文本长度不为0时换行
*/
public MarkdownBuilder lineBreak() {
- if (lineTextBuilder.length() != 0) {
+ if (this.lineTextBuilder.length() != 0) {
return forceLineBreak();
}
return this;
@@ -244,10 +244,10 @@ private MarkdownBuilder title(int i, Object content) {
// 如果当前操作行已有字符，需要换行
lineBreak();
for (int j = 0; j < i; j++) {
- lineTextBuilder.append(TITLE_PREFIX);
+ this.lineTextBuilder.append(TITLE_PREFIX);
}
- this.content.add(lineTextBuilder.append(" ").append(toString(content)).toString());
- lineTextBuilder = new StringBuilder();
+ this.content.add(this.lineTextBuilder.append(" ").append(toString(content)).toString());
+ this.lineTextBuilder = new StringBuilder();
return this;
}
@@ -290,7 +290,7 @@ public String toString() {
public String build() {
lineBreak();
StringBuilder res = new StringBuilder();
- content.forEach(line -> res.append(line).append(" \n"));
+ this.content.forEach(line -> res.append(line).append(" \n"));
return res.toString();
}
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/CircularQueue.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/CircularQueue.java
index 161cb818e..7ed1db29f 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/CircularQueue.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/CircularQueue.java
@@ -38,25 +38,25 @@ public class CircularQueue {
private Iterator iterator;
public CircularQueue add(T t) throws InterruptedException {
- lock.runByInterruptibly(() -> source.add(t));
+ this.lock.runByInterruptibly(() -> this.source.add(t));
return this;
}
public CircularQueue addAll(Collection collection) throws InterruptedException {
- lock.runByInterruptibly(() -> source.addAll(collection));
+ this.lock.runByInterruptibly(() -> this.source.addAll(collection));
return this;
}
public T pool() throws InterruptedException {
- return lock.getByInterruptibly(() -> {
- if (CollectionUtils.isEmpty(source)) {
+ return this.lock.getByInterruptibly(() -> {
+ if (CollectionUtils.isEmpty(this.source)) {
return null;
}
- if (iterator == null || !iterator.hasNext()) {
- iterator = source.iterator();
+ if (this.iterator == null || !this.iterator.hasNext()) {
+ this.iterator = this.source.iterator();
}
- return iterator.next();
+ return this.iterator.next();
});
}
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/WaitQueue.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/WaitQueue.java
index ded55b6d2..53dbeeed0 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/WaitQueue.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/WaitQueue.java
@@ -38,7 +38,7 @@ public WaitQueue(LinkedBlockingQueue queue) {
}
public V get() {
- return queue.poll();
+ return this.queue.poll();
}
public V poll() throws InterruptedException {
@@ -48,18 +48,18 @@ public V poll() throws InterruptedException {
public V poll(long timeout, TimeUnit unit) throws InterruptedException {
V v;
do {
- v = queue.poll(timeout, unit);
+ v = this.queue.poll(timeout, unit);
}
while (v == null);
return v;
}
public void clear() {
- queue.clear();
+ this.queue.clear();
}
public void add(V seat) {
- queue.add(seat);
+ this.queue.add(seat);
}
public void addAll(Collection accounts) {
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/system/Command.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/Command.java
index 2dc7ea052..64d04dac9 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/system/Command.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/Command.java
@@ -71,9 +71,9 @@ private Command(String init, String nextLine, String exit, Charset charset) thro
this.stdErr = FileUtils.createTemp();
// 重定向标准输出和标准错误到文件, 避免写入到缓冲区然后占满导致 waitFor 死锁
- ProcessBuilder builder = new ProcessBuilder(cmdArray).redirectError(stdErr).redirectOutput(stdOut);
+ ProcessBuilder builder = new ProcessBuilder(cmdArray).redirectError(this.stdErr).redirectOutput(this.stdOut);
this.process = builder.start();
- this.stdIn = process.getOutputStream();
+ this.stdIn = this.process.getOutputStream();
this.nextLine = nextLine;
this.exit = exit;
this.charset = charset;
@@ -101,8 +101,8 @@ public static Command of(String init, String nextLine, String exit, Charset char
}
public Command write(String str) throws IOException {
- stdIn.write(str.getBytes(charset));
- stdIn.flush();
+ this.stdIn.write(str.getBytes(this.charset));
+ this.stdIn.flush();
return this;
}
@@ -110,14 +110,14 @@ public Command write(String str) throws IOException {
* 换到下一行
*/
public Command line() throws IOException {
- return write(nextLine);
+ return write(this.nextLine);
}
/**
* 写入通道退出指令
*/
public Command exit() throws IOException {
- write(exit);
+ write(this.exit);
return line();
}
@@ -144,8 +144,8 @@ public Command exec(String str) throws IOException {
*
*/
public CommandResult result() throws InterruptedException {
- process.waitFor();
- return CommandResult.of(stdOut, stdErr, startTime, LocalDateTime.now(), charset);
+ this.process.waitFor();
+ return CommandResult.of(this.stdOut, this.stdErr, this.startTime, LocalDateTime.now(), this.charset);
}
/**
@@ -162,16 +162,16 @@ public CommandResult result() throws InterruptedException {
* @return live.lingting.tools.system.CommandResult
*/
public CommandResult result(long millis) throws InterruptedException, CommandTimeoutException {
- if (process.waitFor(millis, TimeUnit.MILLISECONDS)) {
+ if (this.process.waitFor(millis, TimeUnit.MILLISECONDS)) {
return result();
}
// 超时. 强行杀死子线程
- process.destroyForcibly();
+ this.process.destroyForcibly();
throw new CommandTimeoutException();
}
public void close() {
- process.destroy();
+ this.process.destroy();
}
}
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/system/CommandResult.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/CommandResult.java
index bbafd2583..81597467b 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/system/CommandResult.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/CommandResult.java
@@ -61,48 +61,48 @@ public static CommandResult of(File stdOut, File stdErr, LocalDateTime startTime
}
public File stdOut() {
- return stdOut;
+ return this.stdOut;
}
public File stdErr() {
- return stdErr;
+ return this.stdErr;
}
public String stdOutStr() throws IOException {
- if (!StringUtils.hasText(strOutput)) {
- try (FileInputStream output = new FileInputStream(stdOut)) {
- strOutput = StreamUtils.toString(output, StreamUtils.DEFAULT_SIZE, charset);
+ if (!StringUtils.hasText(this.strOutput)) {
+ try (FileInputStream output = new FileInputStream(this.stdOut)) {
+ this.strOutput = StreamUtils.toString(output, StreamUtils.DEFAULT_SIZE, this.charset);
}
}
- return strOutput;
+ return this.strOutput;
}
public String stdErrStr() throws IOException {
- if (!StringUtils.hasText(strError)) {
- try (FileInputStream error = new FileInputStream(stdErr)) {
- strError = StreamUtils.toString(error, StreamUtils.DEFAULT_SIZE, charset);
+ if (!StringUtils.hasText(this.strError)) {
+ try (FileInputStream error = new FileInputStream(this.stdErr)) {
+ this.strError = StreamUtils.toString(error, StreamUtils.DEFAULT_SIZE, this.charset);
}
}
- return strError;
+ return this.strError;
}
public InputStream stdOutStream() throws IOException {
- return Files.newInputStream(stdOut.toPath());
+ return Files.newInputStream(this.stdOut.toPath());
}
public InputStream stdErrStream() throws IOException {
- return Files.newInputStream(stdErr.toPath());
+ return Files.newInputStream(this.stdErr.toPath());
}
public void clean() {
try {
- Files.delete(stdOut.toPath());
+ Files.delete(this.stdOut.toPath());
}
catch (Exception e) {
//
}
try {
- Files.delete(stdErr.toPath());
+ Files.delete(this.stdErr.toPath());
}
catch (Exception e) {
//
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/system/StopWatch.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/StopWatch.java
index 56e4e4a08..4c30f0829 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/system/StopWatch.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/StopWatch.java
@@ -39,25 +39,25 @@ public class StopWatch {
* 开始计时, 如果已开始, 则从延续之前的计时
*/
public void start() {
- if (startTimeNanos != null) {
+ if (this.startTimeNanos != null) {
return;
}
- durationNanos = null;
- startTimeNanos = System.nanoTime();
+ this.durationNanos = null;
+ this.startTimeNanos = System.nanoTime();
}
/**
* 是否正在运行
*/
public boolean isRunning() {
- return startTimeNanos != null;
+ return this.startTimeNanos != null;
}
public void stop() {
- if (startTimeNanos != null) {
- durationNanos = System.nanoTime() - startTimeNanos;
+ if (this.startTimeNanos != null) {
+ this.durationNanos = System.nanoTime() - this.startTimeNanos;
}
- startTimeNanos = null;
+ this.startTimeNanos = null;
}
public void restart() {
@@ -75,10 +75,10 @@ public void restart() {
*
*/
public long timeNanos() {
- if (durationNanos == null) {
- return startTimeNanos == null ? 0 : System.nanoTime() - startTimeNanos;
+ if (this.durationNanos == null) {
+ return this.startTimeNanos == null ? 0 : System.nanoTime() - this.startTimeNanos;
}
- return durationNanos;
+ return this.durationNanos;
}
public long timeMillis() {
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/thread/ThreadPool.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/thread/ThreadPool.java
index e2cc12db2..4fa59e343 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/thread/ThreadPool.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/thread/ThreadPool.java
@@ -168,11 +168,11 @@ public void execute(String name, ThrowingRunnable runnable) {
}
public CompletableFuture async(Supplier supplier) {
- return CompletableFuture.supplyAsync(supplier, pool);
+ return CompletableFuture.supplyAsync(supplier, this.pool);
}
public Future submit(Callable callable) {
- return pool.submit(callable);
+ return this.pool.submit(callable);
}
}
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/TypeReference.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/TypeReference.java
index 5297273a1..c1d607c46 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/TypeReference.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/TypeReference.java
@@ -32,11 +32,11 @@ protected TypeReference() {
throw new IllegalArgumentException(
"Internal error: TypeReference constructed without actual type information");
}
- type = ((ParameterizedType) superClass).getActualTypeArguments()[0];
+ this.type = ((ParameterizedType) superClass).getActualTypeArguments()[0];
}
public Type getType() {
- return type;
+ return this.type;
}
@Override
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeUtils.java
index 71a4c3c28..612fe5872 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeUtils.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeUtils.java
@@ -30,15 +30,16 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import lombok.experimental.UtilityClass;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
/**
* @author Hccake 2020/6/21 17:21
*/
-@UtilityClass
-public class TreeUtils {
+public final class TreeUtils {
+
+ private TreeUtils() {
+ }
/**
* 根据一个TreeNode集合，返回构建好的树列表
@@ -48,7 +49,7 @@ public class TreeUtils {
* @param TreeNodeId的类型
* @return 树列表
*/
- public , I> List buildTree(List nodes, I rootId) {
+ public static , I> List buildTree(List nodes, I rootId) {
return TreeUtils.buildTree(nodes, rootId, Function.identity(), null);
}
@@ -61,7 +62,8 @@ public , I> List buildTree(List nodes, I rootId) {
* @param TreeNodeId的类型
* @return 树列表
*/
- public , I> List buildTree(List nodes, I rootId, Comparator comparator) {
+ public static , I> List buildTree(List nodes, I rootId,
+ Comparator comparator) {
return TreeUtils.buildTree(nodes, rootId, Function.identity(), comparator);
}
@@ -75,7 +77,8 @@ public , I> List buildTree(List nodes, I rootId, Com
* @param 源数据类型
* @return 树列表
*/
- public , I, R> List buildTree(List list, I rootId, Function convertToTree) {
+ public static , I, R> List buildTree(List list, I rootId,
+ Function convertToTree) {
return TreeUtils.buildTree(list, rootId, convertToTree, null);
}
@@ -90,7 +93,7 @@ public , I, R> List buildTree(List list, I rootId, F
* @param 源数据类型
* @return 树列表
*/
- public , I, R> List buildTree(List list, I rootId, Function convertToTree,
+ public static , I, R> List buildTree(List list, I rootId, Function convertToTree,
Comparator comparator) {
if (list == null || list.isEmpty()) {
return new ArrayList<>();
@@ -120,7 +123,7 @@ public , I, R> List buildTree(List list, I rootId, F
* @param parent 父节点
* @param childrenMap 子节点集合Map(k: parentId, v: Node)
*/
- public , I> void setChildren(T parent, Map> childrenMap) {
+ public static , I> void setChildren(T parent, Map> childrenMap) {
I parentId = parent.getKey();
List children = childrenMap.get(parentId);
// 如果有孩子节点则赋值，且给孩子节点的孩子节点赋值
@@ -140,7 +143,7 @@ public , I> void setChildren(T parent, Map> chi
* @param 树节点的 id 类型
* @return 叶子节点
*/
- public , I> List getLeafs(T parent) {
+ public static , I> List getLeafs(T parent) {
List leafs = new ArrayList<>();
fillLeaf(parent, leafs);
return leafs;
@@ -152,7 +155,7 @@ public , I> List getLeafs(T parent) {
* @param leafs 叶子节点列表
* @param 实际节点类型
*/
- public , I> void fillLeaf(T parent, List leafs) {
+ public static , I> void fillLeaf(T parent, List leafs) {
List children = parent.getChildren();
// 如果节点没有子节点则说明为叶子节点
if (CollectionUtils.isEmpty(children)) {
@@ -172,7 +175,7 @@ public , I> void fillLeaf(T parent, List leafs) {
* @param TreeNodeId 类型
* @return List 节点Id列表
*/
- public , I> List getTreeNodeIds(List treeList) {
+ public static , I> List getTreeNodeIds(List treeList) {
List ids = new ArrayList<>();
fillTreeNodeIds(ids, treeList);
return ids;
@@ -185,7 +188,7 @@ public , I> List getTreeNodeIds(List treeList) {
* @param TreeNode实现类
* @param TreeNodeId 类型
*/
- public , I> void fillTreeNodeIds(List ids, List treeList) {
+ public static , I> void fillTreeNodeIds(List ids, List treeList) {
// 如果节点没有子节点则说明为叶子节点
if (CollectionUtils.isEmpty(treeList)) {
return;
@@ -206,7 +209,7 @@ public , I> void fillTreeNodeIds(List ids, List tree
* @param 树节点的 id 类型
* @return 所有树节点组成的列表
*/
- public , I> List treeToList(T treeNode) {
+ public static , I> List treeToList(T treeNode) {
return treeToList(treeNode, Function.identity());
}
@@ -219,7 +222,7 @@ public , I> List treeToList(T treeNode) {
* @param 转换器转换后的类型
* @return List
*/
- public , I, R> List treeToList(T treeNode, Function converter) {
+ public static , I, R> List treeToList(T treeNode, Function converter) {
List list = new ArrayList<>();
// 使用队列存储未处理的树节点
@@ -254,7 +257,7 @@ public , I, R> List treeToList(T treeNode, Function 树节点的 id 类型
* @return 所有树节点组成的列表
*/
- public , I> List treeToList(List treeNodes) {
+ public static , I> List treeToList(List treeNodes) {
return treeToList(treeNodes, Function.identity());
}
@@ -267,7 +270,7 @@ public , I> List treeToList(List treeNodes) {
* @param 转换器转换后的类型
* @return 所有树节点组成的列表
*/
- public , I, R> List treeToList(List treeNodes, Function converter) {
+ public static , I, R> List treeToList(List treeNodes, Function converter) {
return treeNodes.stream()
.map(node -> treeToList(node, converter))
.flatMap(Collection::stream)
@@ -281,7 +284,7 @@ public , I, R> List treeToList(List treeNodes, Funct
* @param matcher 匹配规则
* @return 剪枝完成后的树节点列表
*/
- public , I> List pruneTree(List treeNodes, Predicate matcher) {
+ public static , I> List pruneTree(List treeNodes, Predicate matcher) {
List result = new ArrayList<>();
if (CollectionUtils.isEmpty(treeNodes)) {
return result;
@@ -307,7 +310,7 @@ else if (matcher.test(treeNode)) {
* @param matcher 匹配规则
* @return 剪枝完成后的树节点
*/
- public , I> T pruneTree(T treeNode, Predicate matcher) {
+ public static , I> T pruneTree(T treeNode, Predicate matcher) {
List children = pruneTree(treeNode.getChildren(), matcher);
boolean childrenMatched = !CollectionUtils.isEmpty(children);
if (childrenMatched) {
@@ -320,7 +323,7 @@ public , I> T pruneTree(T treeNode, Predicate matcher)
/**
* 遍历树节点（深度优先）
*/
- public , I> void forEachDFS(T treeNode, T parentTreeNode, BiConsumer action) {
+ public static , I> void forEachDFS(T treeNode, T parentTreeNode, BiConsumer action) {
action.accept(treeNode, parentTreeNode);
List children = treeNode.getChildren();
forEachDFS(children, parentTreeNode, action);
@@ -329,7 +332,8 @@ public , I> void forEachDFS(T treeNode, T parentTreeNode,
/**
* 遍历树节点（深度优先）
*/
- public , I> void forEachDFS(List treeNodes, T parentTreeNode, BiConsumer action) {
+ public static , I> void forEachDFS(List treeNodes, T parentTreeNode,
+ BiConsumer action) {
if (treeNodes == null || treeNodes.isEmpty()) {
return;
}
diff --git a/common/ballcat-common-util/src/main/java/org/ballcat/common/value/WaitValue.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/value/WaitValue.java
index 063456c30..a47a5dfd3 100644
--- a/common/ballcat-common-util/src/main/java/org/ballcat/common/value/WaitValue.java
+++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/value/WaitValue.java
@@ -53,9 +53,9 @@ public void update(T t) throws InterruptedException {
}
public void update(UnaryOperator operator) throws InterruptedException {
- lock.runByInterruptibly(() -> {
- value = operator.apply(value);
- lock.signalAll();
+ this.lock.runByInterruptibly(() -> {
+ this.value = operator.apply(this.value);
+ this.lock.signalAll();
});
}
@@ -84,18 +84,18 @@ else if (v instanceof String) {
}
public T wait(Predicate predicate) throws InterruptedException {
- lock.lockInterruptibly();
+ this.lock.lockInterruptibly();
try {
while (true) {
- if (predicate.test(value)) {
- return value;
+ if (predicate.test(this.value)) {
+ return this.value;
}
- lock.await(1, TimeUnit.HOURS);
+ this.lock.await(1, TimeUnit.HOURS);
}
}
finally {
- lock.unlock();
+ this.lock.unlock();
}
}
diff --git a/common/ballcat-common-util/src/main/java/org/bson/types/ObjectId.java b/common/ballcat-common-util/src/main/java/org/bson/types/ObjectId.java
index 20dda72ae..25bddaa5c 100644
--- a/common/ballcat-common-util/src/main/java/org/bson/types/ObjectId.java
+++ b/common/ballcat-common-util/src/main/java/org/bson/types/ObjectId.java
@@ -234,10 +234,10 @@ public ObjectId(final ByteBuffer buffer) {
// Note: Cannot use ByteBuffer.getInt because it depends on tbe buffer's byte
// order
// and ObjectId's are always in big-endian order.
- timestamp = makeInt(buffer.get(), buffer.get(), buffer.get(), buffer.get());
- randomValue1 = makeInt((byte) 0, buffer.get(), buffer.get(), buffer.get());
- randomValue2 = makeShort(buffer.get(), buffer.get());
- counter = makeInt((byte) 0, buffer.get(), buffer.get(), buffer.get());
+ this.timestamp = makeInt(buffer.get(), buffer.get(), buffer.get(), buffer.get());
+ this.randomValue1 = makeInt((byte) 0, buffer.get(), buffer.get(), buffer.get());
+ this.randomValue2 = makeShort(buffer.get(), buffer.get());
+ this.counter = makeInt((byte) 0, buffer.get(), buffer.get(), buffer.get());
}
/**
@@ -267,18 +267,18 @@ public void putToByteBuffer(final ByteBuffer buffer) {
throw new IllegalArgumentException("state should be: buffer.remaining() >=12");
}
- buffer.put(int3(timestamp));
- buffer.put(int2(timestamp));
- buffer.put(int1(timestamp));
- buffer.put(int0(timestamp));
- buffer.put(int2(randomValue1));
- buffer.put(int1(randomValue1));
- buffer.put(int0(randomValue1));
- buffer.put(short1(randomValue2));
- buffer.put(short0(randomValue2));
- buffer.put(int2(counter));
- buffer.put(int1(counter));
- buffer.put(int0(counter));
+ buffer.put(int3(this.timestamp));
+ buffer.put(int2(this.timestamp));
+ buffer.put(int1(this.timestamp));
+ buffer.put(int0(this.timestamp));
+ buffer.put(int2(this.randomValue1));
+ buffer.put(int1(this.randomValue1));
+ buffer.put(int0(this.randomValue1));
+ buffer.put(short1(this.randomValue2));
+ buffer.put(short0(this.randomValue2));
+ buffer.put(int2(this.counter));
+ buffer.put(int1(this.counter));
+ buffer.put(int0(this.counter));
}
/**
@@ -286,7 +286,7 @@ public void putToByteBuffer(final ByteBuffer buffer) {
* @return the timestamp
*/
public int getTimestamp() {
- return timestamp;
+ return this.timestamp;
}
/**
@@ -294,7 +294,7 @@ public int getTimestamp() {
* @return the Date
*/
public Date getDate() {
- return new Date((timestamp & 0xFFFFFFFFL) * 1000L);
+ return new Date((this.timestamp & 0xFFFFFFFFL) * 1000L);
}
/**
@@ -322,18 +322,18 @@ public boolean equals(final Object o) {
ObjectId objectId = (ObjectId) o;
- if (counter != objectId.counter) {
+ if (this.counter != objectId.counter) {
return false;
}
- if (timestamp != objectId.timestamp) {
+ if (this.timestamp != objectId.timestamp) {
return false;
}
- if (randomValue1 != objectId.randomValue1) {
+ if (this.randomValue1 != objectId.randomValue1) {
return false;
}
- if (randomValue2 != objectId.randomValue2) {
+ if (this.randomValue2 != objectId.randomValue2) {
return false;
}
@@ -342,10 +342,10 @@ public boolean equals(final Object o) {
@Override
public int hashCode() {
- int result = timestamp;
- result = 31 * result + counter;
- result = 31 * result + randomValue1;
- result = 31 * result + randomValue2;
+ int result = this.timestamp;
+ result = 31 * result + this.counter;
+ result = 31 * result + this.randomValue1;
+ result = 31 * result + this.randomValue2;
return result;
}
@@ -402,11 +402,11 @@ private static class SerializationProxy implements Serializable {
private final byte[] bytes;
SerializationProxy(final ObjectId objectId) {
- bytes = objectId.toByteArray();
+ this.bytes = objectId.toByteArray();
}
private Object readResolve() {
- return new ObjectId(bytes);
+ return new ObjectId(this.bytes);
}
}
@@ -494,4 +494,4 @@ private static byte short0(final short x) {
return (byte) (x);
}
-}
\ No newline at end of file
+}
diff --git a/common/ballcat-common-util/src/test/java/org/ballcat/common/util/TreeUtilsTest.java b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/TreeUtilsTest.java
index 4618ec798..cf0709002 100644
--- a/common/ballcat-common-util/src/test/java/org/ballcat/common/util/TreeUtilsTest.java
+++ b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/TreeUtilsTest.java
@@ -74,6 +74,8 @@ void treeTest() {
Assertions.assertEquals(list, abstractIdTreeNodes);
}
+ @lombok.Setter
+ @lombok.Getter
static class TestTreeNode implements TreeNode {
/**
@@ -93,12 +95,12 @@ static class TestTreeNode implements TreeNode {
@Override
public Long getKey() {
- return id;
+ return this.id;
}
@Override
public Long getParentKey() {
- return parentId;
+ return this.parentId;
}
@Override
@@ -110,23 +112,7 @@ public > void setChildren(List children) {
@Override
@SuppressWarnings("unchecked")
public > List getChildren() {
- return (List) children;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getParentId() {
- return parentId;
- }
-
- public void setParentId(Long parentId) {
- this.parentId = parentId;
+ return (List) this.children;
}
}
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionRule.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionRule.java
index be3a8ab92..eb3d8a65c 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionRule.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionRule.java
@@ -56,7 +56,7 @@ public DataPermissionRule(DataPermission dataPermission) {
* @return boolean 默认返回 false
*/
public boolean ignore() {
- return ignore;
+ return this.ignore;
}
/**
@@ -65,7 +65,7 @@ public boolean ignore() {
* @return 资源类型数组
*/
public String[] includeResources() {
- return includeResources;
+ return this.includeResources;
}
/**
@@ -74,7 +74,7 @@ public String[] includeResources() {
* @return 资源类型数组
*/
public String[] excludeResources() {
- return excludeResources;
+ return this.excludeResources;
}
public DataPermissionRule setIgnore(boolean ignore) {
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DefaultDataPermissionHandler.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DefaultDataPermissionHandler.java
index 5f35e4d89..a4ccf8661 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DefaultDataPermissionHandler.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DefaultDataPermissionHandler.java
@@ -45,7 +45,7 @@ public class DefaultDataPermissionHandler implements DataPermissionHandler {
*/
@Override
public List dataScopes() {
- return dataScopes;
+ return this.dataScopes;
}
/**
@@ -85,7 +85,7 @@ public boolean ignorePermissionControl(List dataScopeList, String map
*/
protected List filterDataScopes(DataPermissionRule dataPermissionRule) {
if (dataPermissionRule == null) {
- return dataScopes;
+ return this.dataScopes;
}
if (dataPermissionRule.ignore()) {
@@ -95,16 +95,16 @@ protected List filterDataScopes(DataPermissionRule dataPermissionRule
// 当指定了只包含的资源时，只对该资源的DataScope
if (dataPermissionRule.includeResources().length > 0) {
Set a = new HashSet<>(Arrays.asList(dataPermissionRule.includeResources()));
- return dataScopes.stream().filter(x -> a.contains(x.getResource())).collect(Collectors.toList());
+ return this.dataScopes.stream().filter(x -> a.contains(x.getResource())).collect(Collectors.toList());
}
// 当未指定只包含的资源，且指定了排除的资源时，则排除此部分资源的 DataScope
if (dataPermissionRule.excludeResources().length > 0) {
Set a = new HashSet<>(Arrays.asList(dataPermissionRule.excludeResources()));
- return dataScopes.stream().filter(x -> !a.contains(x.getResource())).collect(Collectors.toList());
+ return this.dataScopes.stream().filter(x -> !a.contains(x.getResource())).collect(Collectors.toList());
}
- return dataScopes;
+ return this.dataScopes;
}
}
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionInterceptor.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionInterceptor.java
index 6805d1a33..948119193 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionInterceptor.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionInterceptor.java
@@ -62,13 +62,13 @@ public Object intercept(Invocation invocation) throws Throwable {
String mappedStatementId = ms.getId();
// 获取当前需要控制的 dataScope 集合
- List filterDataScopes = dataPermissionHandler.filterDataScopes(mappedStatementId);
+ List filterDataScopes = this.dataPermissionHandler.filterDataScopes(mappedStatementId);
if (filterDataScopes == null || filterDataScopes.isEmpty()) {
return invocation.proceed();
}
// 根据用户权限判断是否需要拦截，例如管理员可以查看所有，则直接放行
- if (dataPermissionHandler.ignorePermissionControl(filterDataScopes, mappedStatementId)) {
+ if (this.dataPermissionHandler.ignorePermissionControl(filterDataScopes, mappedStatementId)) {
return invocation.proceed();
}
@@ -77,14 +77,14 @@ public Object intercept(Invocation invocation) throws Throwable {
try {
// 根据 DataScopes 进行数据权限的 sql 处理
if (sct == SqlCommandType.SELECT) {
- mpBs.sql(dataScopeSqlProcessor.parserSingle(mpBs.sql(), filterDataScopes));
+ mpBs.sql(this.dataScopeSqlProcessor.parserSingle(mpBs.sql(), filterDataScopes));
}
else if (sct == SqlCommandType.INSERT || sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) {
- mpBs.sql(dataScopeSqlProcessor.parserMulti(mpBs.sql(), filterDataScopes));
+ mpBs.sql(this.dataScopeSqlProcessor.parserMulti(mpBs.sql(), filterDataScopes));
}
// 如果解析后发现当前 mappedStatementId 对应的 sql，没有任何数据权限匹配，则记录下来，后续可以直接跳过不解析
Integer matchNum = DataScopeMatchNumHolder.pollMatchNum();
- List allDataScopes = dataPermissionHandler.dataScopes();
+ List allDataScopes = this.dataPermissionHandler.dataScopes();
if (allDataScopes.size() == filterDataScopes.size() && matchNum != null && matchNum == 0) {
MappedStatementIdsWithoutDataScope.addToWithoutSet(filterDataScopes, mappedStatementId);
}
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTest.java
index 13cf6b9c6..ba19abfd2 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTest.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTest.java
@@ -39,7 +39,7 @@ class DataPermissionTest {
@Test
void testAnnotationMatchingPointcut() throws NoSuchMethodException {
- MethodMatcher methodMatcher = dataPermissionAnnotationAdvisor.getPointcut().getMethodMatcher();
+ MethodMatcher methodMatcher = this.dataPermissionAnnotationAdvisor.getPointcut().getMethodMatcher();
boolean match = methodMatcher.matches(TestServiceImpl.class.getMethod("methodA"), TestServiceImpl.class);
Assertions.assertTrue(match, "切点未正确匹配被注解的方法");
}
@@ -47,17 +47,17 @@ void testAnnotationMatchingPointcut() throws NoSuchMethodException {
@Test
void test() {
// 使用方法本身注解
- DataPermissionRule dataPermissionA = testService.methodA();
+ DataPermissionRule dataPermissionA = this.testService.methodA();
Assertions.assertArrayEquals(new String[] { "order" }, dataPermissionA.excludeResources(),
"dataPermission 解析错误");
// 继承自类注解
- DataPermissionRule dataPermissionB = testService.methodB();
+ DataPermissionRule dataPermissionB = this.testService.methodB();
Assertions.assertArrayEquals(new String[] { "class" }, dataPermissionB.excludeResources(),
"dataPermission 解析错误");
// 继承自类注解
- DataPermissionRule dataPermissionC = testService.methodC();
+ DataPermissionRule dataPermissionC = this.testService.methodC();
Assertions.assertArrayEquals(new String[] { "class" }, dataPermissionC.excludeResources(),
"dataPermission 解析错误");
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/StudentMapperTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/StudentMapperTest.java
index 7a02a7a90..73bcf0d21 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/StudentMapperTest.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/StudentMapperTest.java
@@ -81,21 +81,21 @@ void testExclude() {
DataPermissionRule dataPermissionRule = new DataPermissionRule()
.setExcludeResources(new String[] { ClassDataScope.RESOURCE_NAME, SchoolDataScope.RESOURCE_NAME });
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule,
- () -> Assertions.assertEquals(10, studentService.listStudent().size()));
+ () -> Assertions.assertEquals(10, this.studentService.listStudent().size()));
Integer size = DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule,
- () -> studentService.listStudent().size());
+ () -> this.studentService.listStudent().size());
Assertions.assertEquals(10, size);
// 再使用完整的 datascope 规则进行查询
- List studentList1 = studentService.listStudent();
+ List studentList1 = this.studentService.listStudent();
Assertions.assertEquals(2, studentList1.size());
}
@Test
void testTeacherSelect() {
// 实验中学，一班总共有 2 名学生
- List studentList1 = studentService.listStudent();
+ List studentList1 = this.studentService.listStudent();
Assertions.assertEquals(2, studentList1.size());
// 更改当前登录用户权限，让它只能看德高中学的学生
@@ -103,14 +103,15 @@ void testTeacherSelect() {
loginUser.setSchoolNameList(Collections.singletonList("德高中学"));
// 德高中学，一班总共有 3 名学生
- List studentList2 = studentService.listStudent();
+ List studentList2 = this.studentService.listStudent();
Assertions.assertEquals(3, studentList2.size());
/* 忽略权限控制，一共有 10 名学生 */
// === 编程式 ===
- DataPermissionUtils.executeAndIgnoreAll(() -> Assertions.assertEquals(10, studentService.listStudent().size()));
+ DataPermissionUtils
+ .executeAndIgnoreAll(() -> Assertions.assertEquals(10, this.studentService.listStudent().size()));
// === 注解 ====
- List studentList4 = studentService.listStudentWithoutDataPermission();
+ List studentList4 = this.studentService.listStudentWithoutDataPermission();
Assertions.assertEquals(10, studentList4.size());
/* 只控制班级的数据权限，实验中学 + 德高中学 一班总共有 5 名学生 */
@@ -118,9 +119,9 @@ void testTeacherSelect() {
DataPermissionRule dataPermissionRule1 = new DataPermissionRule()
.setIncludeResources(new String[] { ClassDataScope.RESOURCE_NAME });
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule1,
- () -> Assertions.assertEquals(5, studentService.listStudent().size()));
+ () -> Assertions.assertEquals(5, this.studentService.listStudent().size()));
// === 注解 ====
- List studentList5 = studentService.listStudentOnlyFilterClass();
+ List studentList5 = this.studentService.listStudentOnlyFilterClass();
Assertions.assertEquals(5, studentList5.size());
/* 只控制学校的数据权限，"德高中学"、一班、二班 总共有 6 名学生 */
@@ -128,9 +129,9 @@ void testTeacherSelect() {
DataPermissionRule dataPermissionRule2 = new DataPermissionRule()
.setIncludeResources(new String[] { SchoolDataScope.RESOURCE_NAME });
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule2,
- () -> Assertions.assertEquals(6, studentService.listStudent().size()));
+ () -> Assertions.assertEquals(6, this.studentService.listStudent().size()));
// === 注解 ====
- List studentList6 = studentService.listStudentOnlyFilterSchool();
+ List studentList6 = this.studentService.listStudentOnlyFilterSchool();
Assertions.assertEquals(6, studentList6.size());
}
@@ -143,13 +144,13 @@ void testStudentSelect() {
// id 为 1 的学生叫 张三
loginUser.setId(1L);
- List studentList1 = studentService.listStudent();
+ List studentList1 = this.studentService.listStudent();
Assertions.assertEquals(1, studentList1.size());
Assertions.assertEquals("张三", studentList1.get(0).getName());
// id 为 2 的学生叫 李四
loginUser.setId(2L);
- List studentList2 = studentService.listStudent();
+ List studentList2 = this.studentService.listStudent();
Assertions.assertEquals(1, studentList2.size());
Assertions.assertEquals("李四", studentList2.get(0).getName());
@@ -161,7 +162,7 @@ void testStudentSelect() {
@Test
void testRulePriority() {
// 全局数据权限，默认是全部 DataScope 都控制
- List studentList = studentService.listStudent();
+ List studentList = this.studentService.listStudent();
Assertions.assertEquals(2, studentList.size());
// 编程式数据权限，
@@ -169,21 +170,21 @@ void testRulePriority() {
.setIncludeResources(new String[] { ClassDataScope.RESOURCE_NAME });
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule, () -> {
// 编程式数据权限内部方法，走指定的规则
- List studentList2 = studentService.listStudent();
+ List studentList2 = this.studentService.listStudent();
Assertions.assertEquals(5, studentList2.size());
// 嵌套的权限控制
DataPermissionRule dataPermissionRule1 = new DataPermissionRule(true);
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule1, () -> {
// 规则嵌套时，优先使用内部规则
- List studentList1 = studentService.listStudent();
+ List studentList1 = this.studentService.listStudent();
Assertions.assertEquals(10, studentList1.size());
// 由于调用的方法上添加了注解，走该方法注解的权限规则
- List students1 = studentService.listStudentOnlyFilterClass();
+ List students1 = this.studentService.listStudentOnlyFilterClass();
Assertions.assertEquals(5, students1.size());
// 注解权限控制
- List students2 = studentService.listStudentOnlyFilterSchool();
+ List students2 = this.studentService.listStudentOnlyFilterSchool();
Assertions.assertEquals(4, students2.size());
});
});
@@ -193,20 +194,20 @@ void testRulePriority() {
void testExecuteWithDataPermissionRule() {
DataPermissionUtils.executeAndIgnoreAll(() -> {
- List dataScopes = dataPermissionHandler.filterDataScopes(null);
+ List dataScopes = this.dataPermissionHandler.filterDataScopes(null);
Assertions.assertTrue(dataScopes.isEmpty());
});
DataPermissionRule dataPermissionRule = new DataPermissionRule(true);
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule, () -> {
- List dataScopes = dataPermissionHandler.filterDataScopes(null);
+ List dataScopes = this.dataPermissionHandler.filterDataScopes(null);
Assertions.assertTrue(dataScopes.isEmpty());
});
DataPermissionRule dataPermissionRule1 = new DataPermissionRule()
.setIncludeResources(new String[] { ClassDataScope.RESOURCE_NAME });
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule1, () -> {
- List dataScopes = dataPermissionHandler.filterDataScopes(null);
+ List dataScopes = this.dataPermissionHandler.filterDataScopes(null);
Assertions.assertFalse(dataScopes.isEmpty());
Assertions.assertEquals(1, dataScopes.size());
Assertions.assertEquals(ClassDataScope.RESOURCE_NAME, dataScopes.get(0).getResource());
@@ -215,7 +216,7 @@ void testExecuteWithDataPermissionRule() {
DataPermissionRule dataPermissionRule2 = new DataPermissionRule()
.setExcludeResources(new String[] { SchoolDataScope.RESOURCE_NAME, StudentDataScope.RESOURCE_NAME });
DataPermissionUtils.executeWithDataPermissionRule(dataPermissionRule2, () -> {
- List dataScopes = dataPermissionHandler.filterDataScopes(null);
+ List dataScopes = this.dataPermissionHandler.filterDataScopes(null);
Assertions.assertFalse(dataScopes.isEmpty());
Assertions.assertEquals(1, dataScopes.size());
Assertions.assertEquals(ClassDataScope.RESOURCE_NAME, dataScopes.get(0).getResource());
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/ClassDataScope.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/ClassDataScope.java
index a03210f88..ffaf88995 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/ClassDataScope.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/ClassDataScope.java
@@ -50,7 +50,7 @@ public class ClassDataScope implements DataScope {
private final Set tableNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
public ClassDataScope() {
- tableNames.addAll(Arrays.asList("h2student", "h2teacher"));
+ this.tableNames.addAll(Arrays.asList("h2student", "h2teacher"));
}
@Override
@@ -61,7 +61,7 @@ public String getResource() {
@Override
public boolean includes(String tableName) {
// 使用 new TreeSet<>(String.CASE_INSENSITIVE_ORDER) 的形式判断，可忽略表名大小写
- return tableNames.contains(tableName);
+ return this.tableNames.contains(tableName);
}
@Override
@@ -85,7 +85,7 @@ public Expression getExpression(String tableName, Alias tableAlias) {
.stream()
.map(StringValue::new)
.collect(Collectors.toList());
- Column column = new Column(tableAlias == null ? columnId : tableAlias.getName() + "." + columnId);
+ Column column = new Column(tableAlias == null ? this.columnId : tableAlias.getName() + "." + this.columnId);
ExpressionList expressionList = new ExpressionList();
expressionList.setExpressions(list);
return new InExpression(column, expressionList);
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/SchoolDataScope.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/SchoolDataScope.java
index f5922481c..2e1327349 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/SchoolDataScope.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/SchoolDataScope.java
@@ -76,7 +76,7 @@ public Expression getExpression(String tableName, Alias tableAlias) {
.stream()
.map(StringValue::new)
.collect(Collectors.toList());
- Column column = new Column(tableAlias == null ? columnId : tableAlias.getName() + "." + columnId);
+ Column column = new Column(tableAlias == null ? this.columnId : tableAlias.getName() + "." + this.columnId);
ExpressionList expressionList = new ExpressionList();
expressionList.setExpressions(list);
return new InExpression(column, expressionList);
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/service/StudentService.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/service/StudentService.java
index 92198d172..9c1515c70 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/service/StudentService.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/service/StudentService.java
@@ -36,22 +36,22 @@ public class StudentService {
private StudentMapper studentMapper;
public List listStudent() {
- return studentMapper.listStudent();
+ return this.studentMapper.listStudent();
}
@DataPermission(includeResources = ClassDataScope.RESOURCE_NAME)
public List listStudentOnlyFilterClass() {
- return studentMapper.listStudent();
+ return this.studentMapper.listStudent();
}
@DataPermission(includeResources = SchoolDataScope.RESOURCE_NAME)
public List listStudentOnlyFilterSchool() {
- return studentMapper.listStudent();
+ return this.studentMapper.listStudent();
}
@DataPermission(ignore = true)
public List listStudentWithoutDataPermission() {
- return studentMapper.listStudent();
+ return this.studentMapper.listStudent();
}
}
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/DataScopeMatchTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/DataScopeMatchTest.java
index bf29a19da..a7a85853f 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/DataScopeMatchTest.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/DataScopeMatchTest.java
@@ -53,7 +53,7 @@ public boolean includes(String tableName) {
@Override
public Expression getExpression(String tableName, Alias tableAlias) {
- Column column = new Column(tableAlias == null ? columnId : tableAlias.getName() + "." + columnId);
+ Column column = new Column(tableAlias == null ? this.columnId : tableAlias.getName() + "." + this.columnId);
ExpressionList expressionList = new ExpressionList();
expressionList.setExpressions(Arrays.asList(new StringValue("1"), new StringValue("2")));
return new InExpression(column, expressionList);
@@ -61,7 +61,7 @@ public Expression getExpression(String tableName, Alias tableAlias) {
};
DataPermissionHandler dataPermissionHandler = new DefaultDataPermissionHandler(
- Collections.singletonList(dataScope));
+ Collections.singletonList(this.dataScope));
DataScopeSqlProcessor dataScopeSqlProcessor = new DataScopeSqlProcessor();
@@ -73,7 +73,7 @@ void testMatchNum() {
DataScopeMatchNumHolder.initMatchNum();
try {
- String parseSql = dataScopeSqlProcessor.parserSingle(sql, dataPermissionHandler.dataScopes());
+ String parseSql = this.dataScopeSqlProcessor.parserSingle(sql, this.dataPermissionHandler.dataScopes());
System.out.println(parseSql);
Integer matchNum = DataScopeMatchNumHolder.pollMatchNum();
@@ -93,7 +93,7 @@ void testNoMatch() {
+ "where oi.order_price > 100";
DataScopeMatchNumHolder.initMatchNum();
try {
- String parseSql = dataScopeSqlProcessor.parserSingle(sql, dataPermissionHandler.dataScopes());
+ String parseSql = this.dataScopeSqlProcessor.parserSingle(sql, this.dataPermissionHandler.dataScopes());
System.out.println(parseSql);
Integer matchNum = DataScopeMatchNumHolder.pollMatchNum();
@@ -120,7 +120,7 @@ void testNestedMatchNum() {
testNoMatch();
- String parseSql = dataScopeSqlProcessor.parserSingle(sql, dataPermissionHandler.dataScopes());
+ String parseSql = this.dataScopeSqlProcessor.parserSingle(sql, this.dataPermissionHandler.dataScopes());
System.out.println(parseSql);
Integer matchNum = DataScopeMatchNumHolder.pollMatchNum();
diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/SqlParseTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/SqlParseTest.java
index 6006c08d3..720f8624f 100644
--- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/SqlParseTest.java
+++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/SqlParseTest.java
@@ -42,7 +42,7 @@ class SqlParseTest {
DataScope tenantDataScope = new TenantDataScope();
DataPermissionHandler dataPermissionHandler = new DefaultDataPermissionHandler(
- Collections.singletonList(tenantDataScope));
+ Collections.singletonList(this.tenantDataScope));
DataScopeSqlProcessor dataScopeSqlProcessor = new DataScopeSqlProcessor();
@@ -350,13 +350,13 @@ void testJsqlParseAlias() {
String sql = "SELECT\n" + "r.id, r.name, r.code, r.type, r.scope_type, r.scope_resources\n" + "FROM\n"
+ "sys_user_role ur\n" + "left join\n" + "sys_role r\n" + "on r.code = ur.role_code\n"
+ "WHERE ur.user_id = ?\n" + "and r.deleted = 0";
- Assertions
- .assertDoesNotThrow(() -> dataScopeSqlProcessor.parserSingle(sql, dataPermissionHandler.dataScopes()));
+ Assertions.assertDoesNotThrow(
+ () -> this.dataScopeSqlProcessor.parserSingle(sql, this.dataPermissionHandler.dataScopes()));
}
void assertSql(String sql, String targetSql) {
- String parsedSql = dataScopeSqlProcessor.parserSingle(sql, dataPermissionHandler.dataScopes());
+ String parsedSql = this.dataScopeSqlProcessor.parserSingle(sql, this.dataPermissionHandler.dataScopes());
Assertions.assertEquals(targetSql, parsedSql);
}
@@ -381,7 +381,7 @@ public boolean includes(String tableName) {
@Override
public Expression getExpression(String tableName, Alias tableAlias) {
- Column column = SqlParseUtils.getAliasColumn(tableName, tableAlias, columnName);
+ Column column = SqlParseUtils.getAliasColumn(tableName, tableAlias, this.columnName);
return new EqualsTo(column, new LongValue("1"));
}
diff --git a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/AnnotationHandlerHolder.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/AnnotationHandlerHolder.java
index 561c9a87e..4062e5142 100644
--- a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/AnnotationHandlerHolder.java
+++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/AnnotationHandlerHolder.java
@@ -46,9 +46,9 @@ public final class AnnotationHandlerHolder {
private final Map, DesensitizeFunction> annotationHandlers;
private AnnotationHandlerHolder() {
- annotationHandlers = new ConcurrentHashMap<>();
+ this.annotationHandlers = new ConcurrentHashMap<>();
- annotationHandlers.put(JsonSimpleDesensitize.class, (annotation, value) -> {
+ this.annotationHandlers.put(JsonSimpleDesensitize.class, (annotation, value) -> {
// Simple 类型处理
JsonSimpleDesensitize an = (JsonSimpleDesensitize) annotation;
Class handlerClass = an.handler();
@@ -60,7 +60,7 @@ private AnnotationHandlerHolder() {
return desensitizationHandler.handle(value);
});
- annotationHandlers.put(JsonRegexDesensitize.class, (annotation, value) -> {
+ this.annotationHandlers.put(JsonRegexDesensitize.class, (annotation, value) -> {
// 正则类型脱敏处理
JsonRegexDesensitize an = (JsonRegexDesensitize) annotation;
RegexDesensitizationTypeEnum type = an.type();
@@ -71,7 +71,7 @@ private AnnotationHandlerHolder() {
: regexDesensitizationHandler.handle(value, type);
});
- annotationHandlers.put(JsonSlideDesensitize.class, (annotation, value) -> {
+ this.annotationHandlers.put(JsonSlideDesensitize.class, (annotation, value) -> {
// 滑动类型脱敏处理
JsonSlideDesensitize an = (JsonSlideDesensitize) annotation;
SlideDesensitizationTypeEnum type = an.type();
diff --git a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/DesensitizationHandlerHolder.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/DesensitizationHandlerHolder.java
index 13b72d06d..3b8fb50d8 100644
--- a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/DesensitizationHandlerHolder.java
+++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/DesensitizationHandlerHolder.java
@@ -42,16 +42,16 @@ public final class DesensitizationHandlerHolder {
private final Map, DesensitizationHandler> desensitizationHandlerMap;
private DesensitizationHandlerHolder() {
- desensitizationHandlerMap = new ConcurrentHashMap<>(16);
+ this.desensitizationHandlerMap = new ConcurrentHashMap<>(16);
// 滑动脱敏处理器
- desensitizationHandlerMap.put(SlideDesensitizationHandler.class, new SlideDesensitizationHandler());
+ this.desensitizationHandlerMap.put(SlideDesensitizationHandler.class, new SlideDesensitizationHandler());
// 正则脱敏处理器
- desensitizationHandlerMap.put(RegexDesensitizationHandler.class, new RegexDesensitizationHandler());
+ this.desensitizationHandlerMap.put(RegexDesensitizationHandler.class, new RegexDesensitizationHandler());
// SPI 加载所有的 Simple脱敏类型处理
ServiceLoader loadedDrivers = ServiceLoader
.load(SimpleDesensitizationHandler.class);
for (SimpleDesensitizationHandler desensitizationHandler : loadedDrivers) {
- desensitizationHandlerMap.put(desensitizationHandler.getClass(), desensitizationHandler);
+ this.desensitizationHandlerMap.put(desensitizationHandler.getClass(), desensitizationHandler);
}
}
diff --git a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializer.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializer.java
index 6b3a9c254..b053c7d0f 100644
--- a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializer.java
+++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializer.java
@@ -56,17 +56,17 @@ public void serialize(Object value, JsonGenerator jsonGenerator, SerializerProvi
String fieldName = jsonGenerator.getOutputContext().getCurrentName();
// 未开启脱敏
- if (desensitizeStrategy != null && desensitizeStrategy.ignoreField(fieldName)) {
+ if (this.desensitizeStrategy != null && this.desensitizeStrategy.ignoreField(fieldName)) {
jsonGenerator.writeString(str);
return;
}
DesensitizeFunction handleFunction = AnnotationHandlerHolder
- .getHandleFunction(jsonDesensitizeAnnotation.annotationType());
+ .getHandleFunction(this.jsonDesensitizeAnnotation.annotationType());
if (handleFunction == null) {
jsonGenerator.writeString(str);
return;
}
- jsonGenerator.writeString(handleFunction.desensitize(jsonDesensitizeAnnotation, str));
+ jsonGenerator.writeString(handleFunction.desensitize(this.jsonDesensitizeAnnotation, str));
}
}
diff --git a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializerModifier.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializerModifier.java
index d7fe919f1..75d262ee8 100644
--- a/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializerModifier.java
+++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializerModifier.java
@@ -48,7 +48,7 @@ public List changeProperties(SerializationConfig config, Bea
Annotation annotation = getDesensitizeAnnotation(beanProperty);
if (annotation != null && beanProperty.getType().isTypeOrSubTypeOf(String.class)) {
- beanProperty.assignSerializer(new JsonDesensitizeSerializer(annotation, desensitizeStrategy));
+ beanProperty.assignSerializer(new JsonDesensitizeSerializer(annotation, this.desensitizeStrategy));
}
}
return beanProperties;
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkBalancedSender.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkBalancedSender.java
index ce5d12a5f..ac712fd87 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkBalancedSender.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkBalancedSender.java
@@ -33,19 +33,19 @@ public class DingTalkBalancedSender {
public DingTalkBalancedSender add(DingTalkSender... senders) {
for (DingTalkSender sender : senders) {
- queue.add(sender);
+ this.queue.add(sender);
}
return this;
}
public DingTalkBalancedSender addAll(Collection collection) {
- queue.addAll(collection);
+ this.queue.addAll(collection);
return this;
}
@SneakyThrows
protected DingTalkSender sender() {
- return queue.poll();
+ return this.queue.poll();
}
public void send(DingTalkMessage message) {
@@ -54,7 +54,7 @@ public void send(DingTalkMessage message) {
sender.sendMessage(message);
}
finally {
- queue.add(sender);
+ this.queue.add(sender);
}
}
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkResponse.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkResponse.java
index 113ac789d..d7c4ba183 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkResponse.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkResponse.java
@@ -73,7 +73,7 @@ public static DingTalkResponse of(String res) {
@Override
public String toString() {
- return response;
+ return this.response;
}
}
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkSender.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkSender.java
index e09483a7a..960fae708 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkSender.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkSender.java
@@ -82,7 +82,7 @@ public DingTalkSender(String url) {
*
*/
public DingTalkResponse sendMessage(DingTalkMessage message) {
- if (!StringUtils.hasText(secret)) {
+ if (!StringUtils.hasText(this.secret)) {
return sendNormalMessage(message);
}
else {
@@ -118,17 +118,17 @@ public DingTalkSender setSecret(String secret) {
*/
@SneakyThrows({ UnsupportedEncodingException.class, NoSuchAlgorithmException.class, InvalidKeyException.class })
public String secret(long timestamp) {
- SecretKeySpec key = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
+ SecretKeySpec key = new SecretKeySpec(this.secret.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
Mac mac = Mac.getInstance("HmacSHA256");
mac.init(key);
- byte[] secretBytes = (timestamp + "\n" + secret).getBytes(StandardCharsets.UTF_8);
+ byte[] secretBytes = (timestamp + "\n" + this.secret).getBytes(StandardCharsets.UTF_8);
byte[] bytes = mac.doFinal(secretBytes);
String base64 = java.util.Base64.getEncoder().encodeToString(bytes);
String sign = URLEncoder.encode(base64, "UTF-8");
- return String.format("%s×tamp=%s&sign=%s", url, timestamp, sign);
+ return String.format("%s×tamp=%s&sign=%s", this.url, timestamp, sign);
}
/**
@@ -146,7 +146,7 @@ public DingTalkResponse request(DingTalkMessage dingTalkMessage, boolean isSecre
Request request = new Request.Builder().url(requestUrl).post(requestBody).build();
- Call call = client.newCall(request);
+ Call call = this.client.newCall(request);
try (Response response = call.execute()) {
ResponseBody responseBody = response.body();
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/AbstractDingTalkMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/AbstractDingTalkMessage.java
index ac9bee85e..a5aac6b7d 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/AbstractDingTalkMessage.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/AbstractDingTalkMessage.java
@@ -40,7 +40,7 @@ public abstract class AbstractDingTalkMessage implements DingTalkMessage {
private boolean atAll = false;
public AbstractDingTalkMessage atAll() {
- atAll = true;
+ this.atAll = true;
return this;
}
@@ -48,7 +48,7 @@ public AbstractDingTalkMessage atAll() {
* 添加 at 对象的手机号
*/
public AbstractDingTalkMessage addPhone(String phone) {
- atPhones.add(phone);
+ this.atPhones.add(phone);
return this;
}
@@ -68,7 +68,7 @@ public AbstractDingTalkMessage addPhone(String phone) {
@Override
public String generate() {
DingTalkParams params = put(new DingTalkParams().setType(getType().getVal())
- .setAt(new DingTalkParams.At().setAtAll(atAll).setAtMobiles(atPhones)));
+ .setAt(new DingTalkParams.At().setAtAll(this.atAll).setAtMobiles(this.atPhones)));
return params.toString();
}
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkActionCardMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkActionCardMessage.java
index b0b8480a3..b00caadab 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkActionCardMessage.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkActionCardMessage.java
@@ -69,7 +69,7 @@ public class DingTalkActionCardMessage extends AbstractDingTalkMessage {
* 添加按钮
*/
public DingTalkActionCardMessage addButton(String title, String url) {
- buttons.add(new Button(title, url));
+ this.buttons.add(new Button(title, url));
return this;
}
@@ -80,16 +80,16 @@ public MessageTypeEnum getType() {
@Override
public DingTalkParams put(DingTalkParams params) {
- DingTalkParams.ActionCard card = new DingTalkParams.ActionCard().setTitle(title)
- .setText(text.build())
- .setBtnOrientation(orientation.getVal());
+ DingTalkParams.ActionCard card = new DingTalkParams.ActionCard().setTitle(this.title)
+ .setText(this.text.build())
+ .setBtnOrientation(this.orientation.getVal());
// 当 单按钮的 文本和链接都不为空时
- if (buttons.isEmpty()) {
- card.setSingleTitle(singleTitle).setSingleUrl(singleUrl);
+ if (this.buttons.isEmpty()) {
+ card.setSingleTitle(this.singleTitle).setSingleUrl(this.singleUrl);
}
else {
- card.setButtons(buttons);
+ card.setButtons(this.buttons);
}
return params.setActionCard(card);
}
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkLinkMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkLinkMessage.java
index 8dbcc5c7d..ded203913 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkLinkMessage.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkLinkMessage.java
@@ -57,8 +57,10 @@ public MessageTypeEnum getType() {
@Override
public DingTalkParams put(DingTalkParams params) {
- return params.setLink(
- new DingTalkParams.Link().setText(text).setTitle(title).setPicUrl(picUrl).setMessageUrl(messageUrl));
+ return params.setLink(new DingTalkParams.Link().setText(this.text)
+ .setTitle(this.title)
+ .setPicUrl(this.picUrl)
+ .setMessageUrl(this.messageUrl));
}
}
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMarkDownMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMarkDownMessage.java
index f710d2094..f39f08c37 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMarkDownMessage.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMarkDownMessage.java
@@ -48,7 +48,7 @@ public MessageTypeEnum getType() {
@Override
public DingTalkParams put(DingTalkParams params) {
- return params.setMarkdown(new DingTalkParams.Markdown().setTitle(title).setText(text.build()));
+ return params.setMarkdown(new DingTalkParams.Markdown().setTitle(this.title).setText(this.text.build()));
}
}
diff --git a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkTextMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkTextMessage.java
index 7c8585c68..58641f42a 100644
--- a/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkTextMessage.java
+++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkTextMessage.java
@@ -42,7 +42,7 @@ public MessageTypeEnum getType() {
@Override
public DingTalkParams put(DingTalkParams params) {
- return params.setText(new DingTalkParams.Text().setContent(content));
+ return params.setText(new DingTalkParams.Text().setContent(this.content));
}
}
diff --git a/dingtalk/ballcat-dingtalk/src/test/java/org/ballcat/dingtalk/DingTalkTest.java b/dingtalk/ballcat-dingtalk/src/test/java/org/ballcat/dingtalk/DingTalkTest.java
index 342b903d8..60339c3de 100644
--- a/dingtalk/ballcat-dingtalk/src/test/java/org/ballcat/dingtalk/DingTalkTest.java
+++ b/dingtalk/ballcat-dingtalk/src/test/java/org/ballcat/dingtalk/DingTalkTest.java
@@ -40,16 +40,16 @@ class DingTalkTest {
@BeforeEach
void before() {
- sender = new DingTalkSender(webhook).setSecret(secret);
+ this.sender = new DingTalkSender(this.webhook).setSecret(this.secret);
}
@Test
void send() {
- assertTrue(StringUtils.hasText(sender.getUrl()));
- assertTrue(StringUtils.hasText(sender.getSecret()));
+ assertTrue(StringUtils.hasText(this.sender.getUrl()));
+ assertTrue(StringUtils.hasText(this.sender.getSecret()));
DingTalkTextMessage message = new DingTalkTextMessage();
message.setContent("测试机器人消息通知");
- DingTalkResponse response = sender.sendMessage(message);
+ DingTalkResponse response = this.sender.sendMessage(message);
assertTrue(response.isSuccess());
}
diff --git a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkAutoConfiguration.java b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkAutoConfiguration.java
index c14bfc47f..a51521f1e 100644
--- a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkAutoConfiguration.java
+++ b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkAutoConfiguration.java
@@ -40,7 +40,7 @@ public class DingTalkAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public DingTalkSender dingTalkSender() {
- return new DingTalkSender(dingTalkProperties.getUrl()).setSecret(dingTalkProperties.getSecret());
+ return new DingTalkSender(this.dingTalkProperties.getUrl()).setSecret(this.dingTalkProperties.getSecret());
}
}
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ExcelHandlerConfiguration.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ExcelHandlerConfiguration.java
index 2a15638f0..52dcc02b4 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ExcelHandlerConfiguration.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ExcelHandlerConfiguration.java
@@ -63,7 +63,7 @@ public WriterBuilderEnhancer writerBuilderEnhancer() {
@Bean
@ConditionalOnMissingBean
public SingleSheetWriteHandler singleSheetWriteHandler() {
- return new SingleSheetWriteHandler(configProperties, converterProvider, writerBuilderEnhancer());
+ return new SingleSheetWriteHandler(this.configProperties, this.converterProvider, writerBuilderEnhancer());
}
/**
@@ -72,7 +72,7 @@ public SingleSheetWriteHandler singleSheetWriteHandler() {
@Bean
@ConditionalOnMissingBean
public ManySheetWriteHandler manySheetWriteHandler() {
- return new ManySheetWriteHandler(configProperties, converterProvider, writerBuilderEnhancer());
+ return new ManySheetWriteHandler(this.configProperties, this.converterProvider, writerBuilderEnhancer());
}
/**
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ResponseExcelAutoConfiguration.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ResponseExcelAutoConfiguration.java
index 84b607b5b..620d033e0 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ResponseExcelAutoConfiguration.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ResponseExcelAutoConfiguration.java
@@ -89,14 +89,14 @@ public EmptyHeadGenerator emptyHeadGenerator() {
*/
@PostConstruct
public void setReturnValueHandlers() {
- List returnValueHandlers = requestMappingHandlerAdapter
+ List returnValueHandlers = this.requestMappingHandlerAdapter
.getReturnValueHandlers();
List newHandlers = new ArrayList<>();
- newHandlers.add(responseExcelReturnValueHandler);
+ newHandlers.add(this.responseExcelReturnValueHandler);
assert returnValueHandlers != null;
newHandlers.addAll(returnValueHandlers);
- requestMappingHandlerAdapter.setReturnValueHandlers(newHandlers);
+ this.requestMappingHandlerAdapter.setReturnValueHandlers(newHandlers);
}
/**
@@ -104,11 +104,12 @@ public void setReturnValueHandlers() {
*/
@PostConstruct
public void setRequestExcelArgumentResolver() {
- List argumentResolvers = requestMappingHandlerAdapter.getArgumentResolvers();
+ List argumentResolvers = this.requestMappingHandlerAdapter
+ .getArgumentResolvers();
List resolverList = new ArrayList<>();
resolverList.add(new RequestExcelArgumentResolver());
resolverList.addAll(argumentResolvers);
- requestMappingHandlerAdapter.setArgumentResolvers(resolverList);
+ this.requestMappingHandlerAdapter.setArgumentResolvers(resolverList);
}
}
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/DynamicNameAspect.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/DynamicNameAspect.java
index acb28bde8..d6b2bccd1 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/DynamicNameAspect.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/DynamicNameAspect.java
@@ -51,7 +51,7 @@ public void before(JoinPoint point, ResponseExcel excel) {
name = LocalDateTime.now().toString();
}
else {
- name = processor.doDetermineName(point.getArgs(), ms.getMethod(), excel.name());
+ name = this.processor.doDetermineName(point.getArgs(), ms.getMethod(), excel.name());
}
RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/RequestExcelArgumentResolver.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/RequestExcelArgumentResolver.java
index 88ccad9ca..daa609641 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/RequestExcelArgumentResolver.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/RequestExcelArgumentResolver.java
@@ -142,7 +142,7 @@ public String resolverSheetName(HttpServletRequest request, Method method, Strin
evaluationContext.setVariable(name, request.getParameter(name));
}
}
- Expression expression = expressionParser.parseExpression(sheetName);
+ Expression expression = this.expressionParser.parseExpression(sheetName);
String value = expression.getValue(evaluationContext, String.class);
return value == null || value.isEmpty() ? null : value;
}
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/ResponseExcelReturnValueHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/ResponseExcelReturnValueHandler.java
index f15901624..d2fdbf272 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/ResponseExcelReturnValueHandler.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/ResponseExcelReturnValueHandler.java
@@ -68,7 +68,7 @@ public void handleReturnValue(Object o, MethodParameter parameter, ModelAndViewC
Assert.state(responseExcel != null, "No @ResponseExcel");
mavContainer.setRequestHandled(true);
- sheetWriteHandlerList.stream()
+ this.sheetWriteHandlerList.stream()
.filter(handler -> handler.support(o))
.findFirst()
.ifPresent(handler -> handler.export(o, response, responseExcel));
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/SheetBuildProperties.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/SheetBuildProperties.java
index 08c584182..b7661aaf3 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/SheetBuildProperties.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/SheetBuildProperties.java
@@ -63,7 +63,7 @@ public SheetBuildProperties(Sheet sheetAnnotation) {
public SheetBuildProperties(int index) {
this.sheetNo = index;
- this.sheetName = "sheet" + (sheetNo + 1);
+ this.sheetName = "sheet" + (this.sheetNo + 1);
}
}
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/AbstractSheetWriteHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/AbstractSheetWriteHandler.java
index 90d6ddf11..bd6ddeca5 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/AbstractSheetWriteHandler.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/AbstractSheetWriteHandler.java
@@ -148,8 +148,8 @@ public ExcelWriter getExcelWriter(HttpServletResponse response, ResponseExcel re
}
// 开启国际化头信息处理
- if (responseExcel.i18nHeader() && i18nHeaderCellWriteHandler != null) {
- writerBuilder.registerWriteHandler(i18nHeaderCellWriteHandler);
+ if (responseExcel.i18nHeader() && this.i18nHeaderCellWriteHandler != null) {
+ writerBuilder.registerWriteHandler(this.i18nHeaderCellWriteHandler);
}
// 自定义注入的转换器
@@ -159,7 +159,7 @@ public ExcelWriter getExcelWriter(HttpServletResponse response, ResponseExcel re
writerBuilder.registerConverter(BeanUtils.instantiateClass(clazz));
}
- String templatePath = configProperties.getTemplatePath();
+ String templatePath = this.configProperties.getTemplatePath();
if (StringUtils.hasText(responseExcel.template())) {
ClassPathResource classPathResource = new ClassPathResource(
templatePath + File.separator + responseExcel.template());
@@ -167,7 +167,8 @@ public ExcelWriter getExcelWriter(HttpServletResponse response, ResponseExcel re
writerBuilder.withTemplate(inputStream);
}
- writerBuilder = excelWriterBuilderEnhance.enhanceExcel(writerBuilder, response, responseExcel, templatePath);
+ writerBuilder = this.excelWriterBuilderEnhance.enhanceExcel(writerBuilder, response, responseExcel,
+ templatePath);
return writerBuilder.build();
}
@@ -177,7 +178,7 @@ public ExcelWriter getExcelWriter(HttpServletResponse response, ResponseExcel re
* @param builder ExcelWriterBuilder
*/
public void registerCustomConverter(ExcelWriterBuilder builder) {
- converterProvider.ifAvailable(converters -> converters.forEach(builder::registerConverter));
+ this.converterProvider.ifAvailable(converters -> converters.forEach(builder::registerConverter));
}
/**
@@ -240,8 +241,8 @@ else if (dataClass != null) {
}
// sheetBuilder 增强
- writerSheetBuilder = excelWriterBuilderEnhance.enhanceSheet(writerSheetBuilder, sheetNo, sheetName, dataClass,
- template, headGenerateClass);
+ writerSheetBuilder = this.excelWriterBuilderEnhance.enhanceSheet(writerSheetBuilder, sheetNo, sheetName,
+ dataClass, template, headGenerateClass);
return writerSheetBuilder.build();
}
diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/DefaultAnalysisEventListener.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/DefaultAnalysisEventListener.java
index 1c83abec5..ca2dc8962 100644
--- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/DefaultAnalysisEventListener.java
+++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/DefaultAnalysisEventListener.java
@@ -52,10 +52,10 @@ public void invoke(Object o, AnalysisContext analysisContext) {
Set messageSet = violations.stream()
.map(ConstraintViolation::getMessage)
.collect(Collectors.toSet());
- errorMessageList.add(new ErrorMessage(lineNum, messageSet));
+ this.errorMessageList.add(new ErrorMessage(lineNum, messageSet));
}
else {
- list.add(o);
+ this.list.add(o);
}
}
@@ -66,12 +66,12 @@ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
@Override
public List