From 3ecaf4db67adfd24ee42810f9f2948f76568d2d8 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Thu, 3 Sep 2020 18:04:17 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E8=B0=83=E6=95=B4CollectionCacheSto?=
 =?UTF-8?q?re=E6=B3=9B=E5=9E=8B=E5=A3=B0=E6=98=8E=E4=BB=A5=E6=9B=B4?=
 =?UTF-8?q?=E5=A5=BD=E7=9A=84=E5=BC=80=E5=8F=91=E5=AF=B9=E5=BA=94=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Change] CollectionCacheStore 增加 "C (Collection)" 泛型标记, 使下级接口能具体声明其 Collection 的具体类型;
[Change] ListCacheStore, SetCacheStore 适配更改;
---
 .../main/java/net/lamgc/cgj/bot/cache/CollectionCacheStore.java | 2 +-
 .../src/main/java/net/lamgc/cgj/bot/cache/ListCacheStore.java   | 2 +-
 .../src/main/java/net/lamgc/cgj/bot/cache/SetCacheStore.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/CollectionCacheStore.java b/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/CollectionCacheStore.java
index 338d85a..ec7baf0 100644
--- a/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/CollectionCacheStore.java
+++ b/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/CollectionCacheStore.java
@@ -24,7 +24,7 @@ import java.util.Collection;
  * @param <E> 元素类型.
  * @author LamGC
  */
-public interface CollectionCacheStore<E> extends CacheStore<Collection<E>> {
+public interface CollectionCacheStore<E, C extends Collection<E>> extends CacheStore<C> {
 
     /**
      * 为缓存项添加一个元素.
diff --git a/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/ListCacheStore.java b/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/ListCacheStore.java
index cae4923..8fa6642 100644
--- a/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/ListCacheStore.java
+++ b/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/ListCacheStore.java
@@ -25,7 +25,7 @@ import java.util.List;
  * @param <E> 值类型.
  * @author LamGC
  */
-public interface ListCacheStore<E> extends CollectionCacheStore<E> {
+public interface ListCacheStore<E> extends CollectionCacheStore<E, List<E>> {
 
     /**
      * 获取缓存项中的指定元素.
diff --git a/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/SetCacheStore.java b/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/SetCacheStore.java
index 0299125..6231a2a 100644
--- a/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/SetCacheStore.java
+++ b/ContentGrabbingJi-CacheStore-api/src/main/java/net/lamgc/cgj/bot/cache/SetCacheStore.java
@@ -24,7 +24,7 @@ import java.util.Set;
  * @param <E> 值类型.
  * @author LamGC
  */
-public interface SetCacheStore<E> extends CollectionCacheStore<E> {
+public interface SetCacheStore<E> extends CollectionCacheStore<E, Set<E>> {