From d003601c34afc53dfbf2f22351623a5654898b54 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Mon, 27 Jul 2020 18:01:41 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E4=B8=AD?=
 =?UTF-8?q?Attribute=E7=9A=84Enum=E5=AD=98=E6=94=BE=E4=BD=8D=E7=BD=AE;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Change] PixivSearchLinkBuilder 调整SuppressWarnings注解;
[Deprecated] PixivSearchLinkBuilder.SearchArea.jsonKey 将属性标记deprecated;
[Add] PixivSearchAttribute 增加搜索结果属性枚举类, 用于代替`PixivSearchLinkBuilder.SearchArea.jsonKey`;
---
 .../lamgc/cgj/pixiv/PixivSearchAttribute.java  | 18 ++++++++++++++++++
 .../cgj/pixiv/PixivSearchLinkBuilder.java      |  9 +++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/net/lamgc/cgj/pixiv/PixivSearchAttribute.java

diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivSearchAttribute.java b/src/main/java/net/lamgc/cgj/pixiv/PixivSearchAttribute.java
new file mode 100644
index 0000000..85aba20
--- /dev/null
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivSearchAttribute.java
@@ -0,0 +1,18 @@
+package net.lamgc.cgj.pixiv;
+
+public enum PixivSearchAttribute {
+
+    ARTWORKS("illustManga"),
+    TOP("illustManga", "novel"),
+    ILLUSTRATIONS("illust"),
+    MANGA("manga"),
+    NOVELS("novel")
+    ;
+
+    public final String[] attributeNames;
+
+    PixivSearchAttribute(String... attributeNames) {
+        this.attributeNames = attributeNames;
+    }
+
+}
diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilder.java b/src/main/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilder.java
index f2924cf..1a37852 100644
--- a/src/main/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilder.java
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivSearchLinkBuilder.java
@@ -15,7 +15,7 @@ import java.util.Objects;
  * @author LamGC
  * @see PixivURL#PIXIV_SEARCH_CONTENT_URL
  */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "UnusedReturnValue"})
 public class PixivSearchLinkBuilder {
 
     private final String content;
@@ -296,13 +296,18 @@ public class PixivSearchLinkBuilder {
          */
         NOVELS("novel");
 
+        /**
+         * 可用的Json属性名
+         * @deprecated 该属性信息以移至 {@link PixivSearchAttribute}
+         * @see PixivSearchAttribute
+         */
+        @Deprecated
         public final String jsonKey;
 
         SearchArea(String jsonKey) {
             this.jsonKey = jsonKey;
         }
 
-
     }
 
     /**