From 70eb424cd587b963718eff6cdb1683e34c580c3e Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 7 Jun 2021 01:59:07 +0800 Subject: [PATCH] fix code --- .../main/java/cn/hutool/core/date/DateUtil.java | 2 -- .../java/cn/hutool/core/img/gif/GifDecoder.java | 3 --- .../main/java/cn/hutool/core/img/gif/NeuQuant.java | 5 +---- .../main/java/cn/hutool/core/util/IdcardUtil.java | 1 - .../cn/hutool/core/util/PrimitiveArrayUtil.java | 8 -------- .../main/java/cn/hutool/core/util/RadixUtil.java | 5 ++--- .../src/main/java/cn/hutool/core/util/ZipUtil.java | 1 - .../java/cn/hutool/core/bean/BeanUtilTest.java | 3 +-- .../hutool/cron/listener/TaskListenerManager.java | 12 +++++------- .../src/main/java/cn/hutool/json/JSONUtil.java | 9 --------- pom.xml | 14 ++++++++++++++ 11 files changed, 23 insertions(+), 40 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java index 3b00caf5e..59f942430 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; /** * 时间工具类 @@ -931,7 +930,6 @@ public class DateUtil extends CalendarUtil { //标准日期格式（包括单个数字的日期时间） dateStr = normalize(dateStr); - final Matcher matcher = DatePattern.REGEX_NORM.matcher(dateStr); if (ReUtil.isMatch(DatePattern.REGEX_NORM, dateStr)) { final int colonCount = StrUtil.count(dateStr, CharUtil.COLON); switch (colonCount) { diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java b/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java index 685a8e7d5..038d2db2f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java +++ b/hutool-core/src/main/java/cn/hutool/core/img/gif/GifDecoder.java @@ -778,9 +778,6 @@ public class GifDecoder { lastRect = new Rectangle(ix, iy, iw, ih); lastImage = image; lastBgColor = bgColor; - int dispose = 0; - boolean transparency = false; - int delay = 0; lct = null; } diff --git a/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java b/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java index e7b5f9b6d..09faae944 100644 --- a/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java +++ b/hutool-core/src/main/java/cn/hutool/core/img/gif/NeuQuant.java @@ -350,10 +350,7 @@ public class NeuQuant { /* Unbias network to give byte values 0..255 and record position i to prepare for sort ----------------------------------------------------------------------------------- */ public void unbiasnet() { - - int i, j; - - for (i = 0; i < NETSIZE; i++) { + for (int i = 0; i < NETSIZE; i++) { network[i][0] >>= NETBIASSHIFT; network[i][1] >>= NETBIASSHIFT; network[i][2] >>= NETBIASSHIFT; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java index f5499f46f..d81712988 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java @@ -387,7 +387,6 @@ public class IdcardUtil { // 首字母A-Z，A表示1，以此类推 char start = idcard.charAt(0); - int iStart = start - 'A' + 1; String mid = card.substring(1, 7); String end = card.substring(7, 8); char[] chars = mid.toCharArray(); diff --git a/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java index f554679ac..b018bb3a6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/PrimitiveArrayUtil.java @@ -2038,7 +2038,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - long tmp; while (j > i) { swap(array, i, j); j--; @@ -2073,7 +2072,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - int tmp; while (j > i) { swap(array, i, j); j--; @@ -2108,7 +2106,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - short tmp; while (j > i) { swap(array, i, j); j--; @@ -2143,7 +2140,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - char tmp; while (j > i) { swap(array, i, j); j--; @@ -2178,7 +2174,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - byte tmp; while (j > i) { swap(array, i, j); j--; @@ -2213,7 +2208,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - double tmp; while (j > i) { swap(array, i, j); j--; @@ -2248,7 +2242,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - float tmp; while (j > i) { swap(array, i, j); j--; @@ -2283,7 +2276,6 @@ public class PrimitiveArrayUtil { } int i = Math.max(startIndexInclusive, 0); int j = Math.min(array.length, endIndexExclusive) - 1; - boolean tmp; while (j > i) { swap(array, i, j); j--; diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RadixUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RadixUtil.java index 2d5278f41..ddf01bacb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/RadixUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/RadixUtil.java @@ -54,8 +54,7 @@ public class RadixUtil { public static String encode(final String radixs, final int num) { //考虑到负数问题 long tmpNum = (num >= 0 ? num : (0x100000000L - (~num + 1))); - - return encode(radixs, num, 32); + return encode(radixs, tmpNum, 32); } /** @@ -73,7 +72,7 @@ public class RadixUtil { return encode(radixs, num, 64); } - private static String encode(final String radixs, final long num, int maxLength) { + private static String encode(final String radixs, long num, int maxLength) { if (radixs.length() < 2) { throw new RuntimeException("自定义进制最少两个字符哦！"); } diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java index 1e7537065..d9851403f 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java @@ -660,7 +660,6 @@ public class ZipUtil { public static void read(ZipInputStream zipStream, Consumer consumer) { try { ZipEntry zipEntry; - File outItemFile; while (null != (zipEntry = zipStream.getNextEntry())) { consumer.accept(zipEntry); } diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java index 3e39d6c8c..eaaa9259a 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java @@ -164,7 +164,7 @@ public class BeanUtilTest { public void mapToBeanWinErrorTest() { Map map = new HashMap<>(); map.put("age", "哈哈"); - Person user = BeanUtil.toBean(map, Person.class); + BeanUtil.toBean(map, Person.class); } @Test @@ -559,7 +559,6 @@ public class BeanUtilTest { @Test public void toMapTest() { // 测试转map的时候返回key - String name = null; PrivilegeIClassification a = new PrivilegeIClassification(); a.setId("1"); a.setName("2"); diff --git a/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListenerManager.java b/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListenerManager.java index f0882d98a..10c609fa8 100644 --- a/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListenerManager.java +++ b/hutool-cron/src/main/java/cn/hutool/cron/listener/TaskListenerManager.java @@ -16,7 +16,7 @@ public class TaskListenerManager implements Serializable { private static final long serialVersionUID = 1L; private final List listeners = new ArrayList<>(); - + /** * 增加监听器 * @param listener {@link TaskListener} @@ -28,7 +28,7 @@ public class TaskListenerManager implements Serializable { } return this; } - + /** * 移除监听器 * @param listener {@link TaskListener} @@ -40,14 +40,13 @@ public class TaskListenerManager implements Serializable { } return this; } - + /** * 通知所有监听任务启动器启动 * @param executor {@link TaskExecutor} */ public void notifyTaskStart(TaskExecutor executor) { synchronized (listeners) { - int size = listeners.size(); TaskListener listener; for (TaskListener taskListener : listeners) { listener = taskListener; @@ -57,20 +56,19 @@ public class TaskListenerManager implements Serializable { } } } - + /** * 通知所有监听任务启动器成功结束 * @param executor {@link TaskExecutor} */ public void notifyTaskSucceeded(TaskExecutor executor) { synchronized (listeners) { - int size = listeners.size(); for (TaskListener listener : listeners) { listener.onSucceeded(executor); } } } - + /** * 通知所有监听任务启动器结束并失败
* 无监听将打印堆栈到命令行 diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java index db1954d9b..971f7f49f 100644 --- a/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONUtil.java @@ -675,14 +675,12 @@ public class JSONUtil { return writer; } - char b; // 前一个字符 char c; // 当前字符 int len = str.length(); if (isWrap) { writer.write('"'); } for (int i = 0; i < len; i++) { -// b = c; c = str.charAt(i); switch (c) { case '\\': @@ -690,13 +688,6 @@ public class JSONUtil { writer.write("\\"); writer.write(c); break; - //此处转义导致输出不和预期一致 -// case '/': -// if (b == '<') { -// writer.write('\\'); -// } -// writer.write(c); -// break; default: writer.write(escape(c)); } diff --git a/pom.xml b/pom.xml index 0b20a4af6..60ee2c7ef 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ 8 4.13.2 1.18.20 + 1.32 @@ -60,6 +61,19 @@ ${lombok.version} test + + + org.openjdk.jmh + jmh-core + ${jmh.version} + test + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + test +