From b8bacbcb2cdf6445db77a8eeda8676341acb801a Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 24 Mar 2020 17:18:38 +0800 Subject: [PATCH] fix code --- .../src/main/java/cn/hutool/cache/CacheUtil.java | 1 - .../main/java/cn/hutool/cache/impl/AbstractCache.java | 9 +++++---- .../src/main/java/cn/hutool/cache/impl/LFUCache.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java b/hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java index cddc81e62..190cc007f 100644 --- a/hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java +++ b/hutool-cache/src/main/java/cn/hutool/cache/CacheUtil.java @@ -125,5 +125,4 @@ public class CacheUtil { public static NoCache newNoCache(){ return new NoCache<>(); } - } diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java index 799483594..bb67d4e91 100644 --- a/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java +++ b/hutool-cache/src/main/java/cn/hutool/cache/impl/AbstractCache.java @@ -1,15 +1,15 @@ package cn.hutool.cache.impl; +import cn.hutool.cache.Cache; +import cn.hutool.core.collection.CopiedIter; +import cn.hutool.core.lang.func.Func0; + import java.util.Iterator; import java.util.Map; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; -import cn.hutool.cache.Cache; -import cn.hutool.core.collection.CopiedIter; -import cn.hutool.core.lang.func.Func0; - /** * 超时和限制大小的缓存的默认实现
* 继承此抽象缓存需要:
@@ -189,6 +189,7 @@ public abstract class AbstractCache implements Cache { // ---------------------------------------------------------------- get end + @SuppressWarnings("NullableProblems") @Override public Iterator iterator() { CacheObjIterator copiedIterator = (CacheObjIterator) this.cacheObjIterator(); diff --git a/hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java b/hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java index 862c9d8a7..3b04b8f33 100644 --- a/hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java +++ b/hutool-cache/src/main/java/cn/hutool/cache/impl/LFUCache.java @@ -40,7 +40,7 @@ public class LFUCache extends AbstractCache { this.capacity = capacity; this.timeout = timeout; - cacheMap = new HashMap>(capacity + 1, 1.0f); + cacheMap = new HashMap<>(capacity + 1, 1.0f); } // ---------------------------------------------------------------- prune