Merge branch 'dev' of https://github.com/noear/solon into dev

opensolon · Jul 28, 2023 · b0637c1 · b0637c1
2 parents 559f678 + f3a4c17
commit b0637c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...lon.cache.caffeine/src/main/java/org/noear/solon/cache/caffeine/CaffeineCacheService.java b/...lon.cache.caffeine/src/main/java/org/noear/solon/cache/caffeine/CaffeineCacheService.java
@@ -87,7 +87,7 @@ public Object get(String key) {
     }
 
     @Override
-    public <T> T getOrStore(String key, int seconds, Supplier supplier) {
+    public <T> T getOrStore(String key, int seconds, Supplier<T> supplier) {
         return (T) client.get(key, (k) -> supplier.get());
     }
 }
diff --git a/...projects/solon-base/solon.data/src/main/java/org/noear/solon/data/cache/CacheService.java b/...projects/solon-base/solon.data/src/main/java/org/noear/solon/data/cache/CacheService.java
@@ -40,7 +40,7 @@ public interface CacheService {
      *
      * @since 1.7
      */
-    default <T> T getOrStore(String key, int seconds, Supplier supplier) {
+    default <T> T getOrStore(String key, int seconds, Supplier<T> supplier) {
         Object obj = get(key);
         if (obj == null) {
             obj = supplier.get();