eventSet = new ConcurrentHashSet<>();
- /** 实际处理 */
+ /**
+ * 实际处理
+ */
private final Watcher watcher;
- /** 延迟，单位毫秒 */
+ /**
+ * 延迟，单位毫秒
+ */
private final long delay;
//---------------------------------------------------------------------------------------------------------- Constructor start
+
/**
* 构造
+ *
* @param watcher 实际处理触发事件的监视器{@link Watcher}，不可以是{@code DelayWatcher}
- * @param delay 延迟时间，单位毫秒
+ * @param delay 延迟时间，单位毫秒
*/
public DelayWatcher(final Watcher watcher, final long delay) {
Assert.notNull(watcher);
- if(watcher instanceof DelayWatcher) {
+ if (watcher instanceof DelayWatcher) {
throw new IllegalArgumentException("Watcher must not be a DelayWatcher");
}
this.watcher = watcher;
@@ -57,9 +65,9 @@ public class DelayWatcher implements Watcher {
@Override
public void onModify(final WatchEvent event, final WatchKey key) {
- if(this.delay < 1) {
+ if (this.delay < 1) {
this.watcher.onModify(event, key);
- }else {
+ } else {
onDelayModify(event, key);
}
}
@@ -80,14 +88,16 @@ public class DelayWatcher implements Watcher {
}
//---------------------------------------------------------------------------------------------------------- Private method start
+
/**
* 触发延迟修改
+ *
* @param event 事件
- * @param key {@link WatchKey}
+ * @param key {@link WatchKey}
*/
private void onDelayModify(final WatchEvent event, final WatchKey key) {
final Path eventPath = Paths.get(key.watchable().toString(), event.context().toString());
- if(eventSet.contains(eventPath)) {
+ if (eventSet.contains(eventPath)) {
//此事件已经被触发过，后续事件忽略，等待统一处理。
return;
}
@@ -101,7 +111,7 @@ public class DelayWatcher implements Watcher {
* 开启处理线程
*
* @param event 事件
- * @param currentPath 事件发生的当前Path路径
+ * @param key 事件发生的当前WatchKey
*/
private void startHandleModifyThread(final WatchEvent event, final WatchKey key) {
ThreadUtil.execute(() -> {
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/IgnoreWatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/IgnoreWatcher.java
deleted file mode 100644
index cc890a1bc..000000000
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/IgnoreWatcher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2023 looly(loolly@aliyun.com)
- * Hutool is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- * https://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- */
-
-package org.dromara.hutool.core.io.watch.watchers;
-
-import org.dromara.hutool.core.io.watch.Watcher;
-
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-
-/**
- * 跳过所有事件处理Watcher
- * 用户继承此类后实现需要监听的方法
- *
- * @author Looly
- * @since 3.1.0
- */
-public class IgnoreWatcher implements Watcher {
-
- @Override
- public void onCreate(final WatchEvent event, final WatchKey key) {
- }
-
- @Override
- public void onModify(final WatchEvent event, final WatchKey key) {
- }
-
- @Override
- public void onDelete(final WatchEvent event, final WatchKey key) {
- }
-
- @Override
- public void onOverflow(final WatchEvent event, final WatchKey key) {
- }
-}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/SimpleWatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/SimpleWatcher.java
index 6607e09d2..1d8d49d56 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/SimpleWatcher.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/watchers/SimpleWatcher.java
@@ -12,11 +12,34 @@
package org.dromara.hutool.core.io.watch.watchers;
+import org.dromara.hutool.core.io.watch.Watcher;
+
+import java.io.Serializable;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+
/**
* 空白WatchListener
* 用户继承此类后实现需要监听的方法
- * @author Looly
*
+ * @author Looly
*/
-public class SimpleWatcher extends IgnoreWatcher {
+public class SimpleWatcher implements Watcher, Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onCreate(final WatchEvent event, final WatchKey key) {
+ }
+
+ @Override
+ public void onModify(final WatchEvent event, final WatchKey key) {
+ }
+
+ @Override
+ public void onDelete(final WatchEvent event, final WatchKey key) {
+ }
+
+ @Override
+ public void onOverflow(final WatchEvent event, final WatchKey key) {
+ }
}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java
index 917d7f546..f0ad97858 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/RegexPool.java
@@ -171,7 +171,7 @@ public interface RegexPool {
* 车架号（车辆识别代号由世界制造厂识别代号(WMI、车辆说明部分(VDS)车辆指示部分(VIS)三部分组成，共 17 位字码。）
* 别名：车辆识别代号、车辆识别码、车架号、十七位码
* 标准号：GB 16735-2019
- * 标准官方地址：https://openstd.samr.gov.cn/bzgk/gb/newGbInfo?hcno=E2EBF667F8C032B1EDFD6DF9C1114E02
+ * 标准官方地址：https://openstd.samr.gov.cn/bzgk/gb/newGbInfo?hcno=E2EBF667F8C032B1EDFD6DF9C1114E02
* 对年产量大于或等于1 000 辆的完整车辆和/或非完整车辆制造厂：
*
* 第一部分为世界制造厂识别代号(WMI)，3位
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharArray.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharArray.java
new file mode 100644
index 000000000..6b26aef04
--- /dev/null
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharArray.java
@@ -0,0 +1,105 @@
+package org.dromara.hutool.core.text;
+
+import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.collection.iter.ArrayIter;
+
+import java.util.Arrays;
+import java.util.Iterator;
+
+/**
+ * char[]包装，提供zero-copy的数组操作
+ *
+ * @author Looly
+ */
+public class CharArray implements CharSequence, Iterable {
+
+ private final char[] value;
+
+ /**
+ * 构造
+ *
+ * @param value String值
+ */
+ public CharArray(final String value) {
+ this(value.toCharArray(), false);
+ }
+
+ /**
+ * 构造，注意此方法共享数组
+ *
+ * @param value char数组
+ * @param copy 可选是否拷贝数组，如果为{@code false}则复用数组
+ */
+ public CharArray(final char[] value, final boolean copy) {
+ this.value = copy ? value.clone() : value;
+ }
+
+ @Override
+ public int length() {
+ return value.length;
+ }
+
+ @Override
+ public char charAt(int index) {
+ if (index < 0) {
+ index += value.length;
+ }
+ return value[index];
+ }
+
+ /**
+ * 设置字符
+ *
+ * @param index 位置，支持复数，-1表示最后一个位置
+ * @param c 字符
+ * @return this
+ */
+ public CharArray set(int index, final char c) {
+ if (index < 0) {
+ index += value.length;
+ }
+ value[index] = c;
+ return this;
+ }
+
+ /**
+ * 获取原始数组，不做拷贝
+ *
+ * @return array
+ */
+ public char[] array() {
+ return this.value;
+ }
+
+ @Override
+ public CharSequence subSequence(final int start, final int end) {
+ return new CharArray(ArrayUtil.sub(value, start, end), false);
+ }
+
+ @Override
+ public boolean equals(final Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ final CharArray charArray = (CharArray) o;
+ return Arrays.equals(value, charArray.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return Arrays.hashCode(value);
+ }
+
+ @Override
+ public Iterator iterator() {
+ return new ArrayIter<>(this.value);
+ }
+
+ @Override
+ public String toString() {
+ return String.valueOf(this.value);
+ }
+}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/WatchMonitorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/WatchMonitorTest.java
deleted file mode 100644
index 8956c6260..000000000
--- a/hutool-core/src/test/java/org/dromara/hutool/core/io/WatchMonitorTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2023 looly(loolly@aliyun.com)
- * Hutool is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- * https://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- */
-
-package org.dromara.hutool.core.io;
-
-import org.dromara.hutool.core.io.watch.WatchMonitor;
-import org.dromara.hutool.core.io.watch.WatchUtil;
-import org.dromara.hutool.core.io.watch.Watcher;
-import org.dromara.hutool.core.io.watch.watchers.DelayWatcher;
-import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
-import org.dromara.hutool.core.lang.Console;
-
-import java.nio.file.Path;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-
-/**
- * 文件监听单元测试
- *
- * @author Looly
- *
- */
-public class WatchMonitorTest {
-
- public static void main(final String[] args) {
- final Watcher watcher = new SimpleWatcher(){
- @Override
- public void onCreate(final WatchEvent event, final WatchKey key) {
- final Object obj = event.context();
- Console.log(((Path)obj).toAbsolutePath());
- Console.log("创建：{}-> {}", key.watchable(), obj);
- }
-
- @Override
- public void onModify(final WatchEvent event, final WatchKey key) {
- final Object obj = event.context();
- Console.log("修改：{}-> {}", key.watchable(), obj);
- }
-
- @Override
- public void onDelete(final WatchEvent event, final WatchKey key) {
- final Object obj = event.context();
- Console.log("删除：{}-> {}", key.watchable(), obj);
- }
-
- @Override
- public void onOverflow(final WatchEvent event, final WatchKey key) {
- final Object obj = event.context();
- Console.log("Overflow：{}-> {}", key.watchable(), obj);
- }
- };
-
- //noinspection resource
- final WatchMonitor monitor = WatchUtil.ofAll("d:/test/aaa.txt", new DelayWatcher(watcher, 500));
-
- monitor.setMaxDepth(0);
- monitor.start();
- }
-
-
-}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java
index 92fd68891..2e53316dc 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/file/PathUtilTest.java
@@ -13,15 +13,35 @@
package org.dromara.hutool.core.io.file;
import org.dromara.hutool.core.array.ArrayUtil;
+import org.dromara.hutool.core.lang.Console;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
public class PathUtilTest {
+ @SuppressWarnings("DuplicateExpressions")
+ @Test
+ void ofTest() {
+ // 绝对路径测试
+ Path path = PathUtil.of(Paths.get("d:/test/hutool"), Paths.get("data1"), Paths.get("data2"));
+ Assertions.assertEquals("d:/test/hutool/data1/data2", path.toString().replace('\\', '/'));
+
+ // 相对路径测试
+ path = PathUtil.of(Paths.get("hutool"), Paths.get("data1"), Paths.get("data2"));
+ Assertions.assertEquals("hutool/data1/data2", path.toString().replace('\\', '/'));
+
+ path = PathUtil.of(Paths.get("hutool"));
+ Assertions.assertEquals("hutool", path.toString().replace('\\', '/'));
+
+ path = PathUtil.of((Path) null);
+ Assertions.assertNull(path);
+ }
+
@Test
@Disabled
public void copyFileTest(){
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/TestConsoleWatcher.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/TestConsoleWatcher.java
new file mode 100644
index 000000000..25be40ff7
--- /dev/null
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/TestConsoleWatcher.java
@@ -0,0 +1,35 @@
+package org.dromara.hutool.core.io.watch;
+
+import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
+import org.dromara.hutool.core.lang.Console;
+
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+
+public class TestConsoleWatcher extends SimpleWatcher {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onCreate(final WatchEvent event, final WatchKey key) {
+ Console.log("创建：{}-> {}", key.watchable(), event.context());
+ Console.log("Resolved Path：{}", WatchUtil.resolvePath(event, key));
+ }
+
+ @Override
+ public void onModify(final WatchEvent event, final WatchKey key) {
+ Console.log("修改：{}-> {}", key.watchable(), event.context());
+ Console.log("Resolved Path：{}", WatchUtil.resolvePath(event, key));
+ }
+
+ @Override
+ public void onDelete(final WatchEvent event, final WatchKey key) {
+ Console.log("删除：{}-> {}", key.watchable(), event.context());
+ Console.log("Resolved Path：{}", WatchUtil.resolvePath(event, key));
+ }
+
+ @Override
+ public void onOverflow(final WatchEvent event, final WatchKey key) {
+ Console.log("Overflow：{}-> {}", key.watchable(), event.context());
+ Console.log("Resolved Path：{}", WatchUtil.resolvePath(event, key));
+ }
+}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchMonitorTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchMonitorTest.java
new file mode 100644
index 000000000..e7add53d5
--- /dev/null
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchMonitorTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2023 looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * https://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+package org.dromara.hutool.core.io.watch;
+
+import org.dromara.hutool.core.io.file.PathUtil;
+import org.dromara.hutool.core.io.watch.watchers.DelayWatcher;
+import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
+import org.dromara.hutool.core.lang.Console;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+
+/**
+ * 文件监听单元测试
+ *
+ * @author Looly
+ */
+public class WatchMonitorTest {
+
+ @Test
+ @Disabled
+ void watchTest() {
+ final Path path = PathUtil.of("d:/test/");
+ Console.log("监听：{}", path);
+
+ //noinspection resource
+ final WatchMonitor monitor = WatchUtil.ofAll(path, new DelayWatcher(new TestConsoleWatcher(), 500));
+ monitor.setMaxDepth(0);
+ monitor.start();
+ }
+}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchServiceWrapperTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchServiceWrapperTest.java
new file mode 100644
index 000000000..337ac13d0
--- /dev/null
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/io/watch/WatchServiceWrapperTest.java
@@ -0,0 +1,22 @@
+package org.dromara.hutool.core.io.watch;
+
+import org.dromara.hutool.core.io.file.PathUtil;
+import org.dromara.hutool.core.io.watch.watchers.SimpleWatcher;
+import org.dromara.hutool.core.lang.Console;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
+
+public class WatchServiceWrapperTest {
+
+ @SuppressWarnings("resource")
+ @Test
+ @Disabled
+ void watchTest() {
+ WatchServiceWrapper.of(WatchKind.ALL)
+ .registerPath(PathUtil.of("d:/test"), 0)
+ .watch(new TestConsoleWatcher(), null);
+ }
+}