ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2024-10-30 09:12:53 +08:00
parent 30b70c7791
commit e8b161613d
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServiceWrapper.java
View File

@ -19,7 +19,7 @@ package org.dromara.hutool.core.io.watch;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.PathUtil;
import org.dromara.hutool.core.lang.wrapper.Wrapper;
import org.dromara.hutool.core.lang.wrapper.SimpleWrapper;
import java.io.IOException;
import java.io.Serializable;
@ -38,7 +38,7 @@ import java.util.function.Predicate;
* @author looly
* @since 6.0.0
*/
public class WatchServiceWrapper implements WatchService, Wrapper<WatchService>, Serializable {
public class WatchServiceWrapper extends SimpleWrapper<WatchService> implements WatchService, Serializable {
private static final long serialVersionUID = 1L;
/**
@ -51,10 +51,6 @@ public class WatchServiceWrapper implements WatchService, Wrapper<WatchService>,
return new WatchServiceWrapper(events);
}
/**
* 监听服务
*/
private final WatchService watchService;
/**
* 监听事件列表，如新建、修改、删除等
*/
@ -75,20 +71,10 @@ public class WatchServiceWrapper implements WatchService, Wrapper<WatchService>,
*/
public WatchServiceWrapper(final WatchEvent.Kind<?>... events) {
//初始化监听
try {
watchService = FileSystems.getDefault().newWatchService();
} catch (final IOException e) {
throw new WatchException(e);
}
super(newWatchService());
this.events = events;
}
@Override
public WatchService getRaw() {
return this.watchService;
}
/**
* 是否已关闭
*
@ -102,23 +88,23 @@ public class WatchServiceWrapper implements WatchService, Wrapper<WatchService>,
public void close() {
if (!this.isClosed) {
this.isClosed = true;
IoUtil.closeQuietly(this.watchService);
IoUtil.closeQuietly(this.raw);
}
}
@Override
public WatchKey poll() {
return this.watchService.poll();
return this.raw.poll();
}
@Override
public WatchKey poll(final long timeout, final TimeUnit unit) throws InterruptedException {
return this.watchService.poll(timeout, unit);
return this.raw.poll(timeout, unit);
}
@Override
public WatchKey take() throws InterruptedException {
return this.watchService.take();
return this.raw.take();
}
/**
@ -176,9 +162,9 @@ public class WatchServiceWrapper implements WatchService, Wrapper<WatchService>,
WatchKey watchKey = null;
try {
if (ArrayUtil.isEmpty(this.modifiers)) {
watchKey = watchable.register(this.watchService, kinds);
watchKey = watchable.register(this.raw, kinds);
} else {
watchKey = watchable.register(this.watchService, kinds, this.modifiers);
watchKey = watchable.register(this.raw, kinds, this.modifiers);
}
} catch (final IOException e) {
if (!(e instanceof AccessDeniedException)) {
@ -266,7 +252,7 @@ public class WatchServiceWrapper implements WatchService, Wrapper<WatchService>,
public void watch(final BiConsumer<WatchEvent<?>, WatchKey> action, final Predicate<WatchEvent<?>> watchFilter) {
final WatchKey wk;
try {
wk = watchService.take();
wk = raw.take();
} catch (final InterruptedException | ClosedWatchServiceException e) {
// 用户中断
close();
@ -283,4 +269,17 @@ public class WatchServiceWrapper implements WatchService, Wrapper<WatchService>,
wk.reset();
}
/**
* 创建一个新的{@link WatchService}实例，用于监听指定目录
*
* @return {@link WatchService}
*/
private static WatchService newWatchService() {
try {
return FileSystems.getDefault().newWatchService();
} catch (final IOException e) {
throw new WatchException(e);
}
}
}