Opti Reflection: Remake reflect part & util.

base/common/src/main/java/band/kessoku/lib/base/reflect/ModifiersUtil.java

@@ -0,0 +1,86 @@
+package band.kessoku.lib.base.reflect;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+public final class ModifiersUtil {
+
+    /* === Common === */
+
+    public static boolean isPublic(Field field) {
+        return Modifier.isPublic(field.getModifiers());
+    }
+
+    public static boolean isPublic(Method method) {
+        return Modifier.isPublic(method.getModifiers());
+    }
+
+    public static boolean isStatic(Field field) {
+        return Modifier.isStatic(field.getModifiers());
+    }
+
+    public static boolean isStatic(Method method) {
+        return Modifier.isStatic(method.getModifiers());
+    }
+
+    /* === Common Combo === */
+
+    public static boolean isPublicAndStatic(Field field) {
+        return isPublic(field) && isStatic(field);
+    }
+
+    public static boolean isPublicAndStatic(Method method) {
+        return isPublic(method) && isStatic(method);
+    }
+
+    public static boolean isPublicOrStatic(Field field, boolean shouldPublic, boolean shouldStatic) {
+        return shouldPublic == isPublic(field) && shouldStatic == isStatic(field);
+    }
+
+    public static boolean isPublicOrStatic(Method method, boolean shouldPublic, boolean shouldStatic) {
+        return shouldPublic == isPublic(method) && shouldStatic == isStatic(method);
+    }
+
+    /* === Common End === */
+
+    /* === Data Object === */
+
+    public static boolean isVolatile(Field field) {
+        return Modifier.isVolatile(field.getModifiers());
+    }
+
+    public static boolean isVolatile(Method method) {
+        return Modifier.isVolatile(method.getModifiers());
+    }
+
+    public static boolean isTransient(Field field) {
+        return Modifier.isTransient(field.getModifiers());
+    }
+
+    public static boolean isTransient(Method method) {
+        return Modifier.isTransient(method.getModifiers());
+    }
+
+    /* === Data Object End === */
+
+    /* === Low Usage Tools === */
+
+    public static boolean isFinal(Field field) {
+        return Modifier.isFinal(field.getModifiers());
+    }
+
+    public static boolean isFinal(Method method) {
+        return Modifier.isFinal(method.getModifiers());
+    }
+
+    public static boolean isProtected(Field field) {
+        return Modifier.isProtected(field.getModifiers());
+    }
+
+    public static boolean isProtected(Method method) {
+        return Modifier.isProtected(method.getModifiers());
+    }
+
+    /* === Low Usage Tools End === */
+}

base/common/src/main/java/band/kessoku/lib/base/reflect/ReflectUtil.java

@@ -0,0 +1,22 @@
+package band.kessoku.lib.base.reflect;
+
+import org.apache.logging.log4j.core.util.ReflectionUtil;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public final class ReflectUtil {
+    public static void makeAccessible(Field field) {
+        ReflectionUtil.makeAccessible(field);
+    }
+
+    public static void makeAccessible(Method method) {
+        ReflectionUtil.makeAccessible(method);
+    }
+
+    public static boolean isAssignableFrom(Field field, Class<?> ... clazzs) {
+        var flag = Arrays.stream(clazzs).anyMatch(clazz -> !field.getType().isAssignableFrom(clazz));
+        return !flag;
+    }
+}

config/common/src/main/java/band/kessoku/lib/config/api/AbstractConfig.java

@@ -16,6 +16,8 @@
 package band.kessoku.lib.config.api;
 
 import band.kessoku.lib.base.ModUtils;
+import band.kessoku.lib.base.reflect.ModifiersUtil;
+import band.kessoku.lib.base.reflect.ReflectUtil;
 import band.kessoku.lib.config.KessokuConfig;
 import band.kessoku.lib.config.api.annotations.Comment;
 import band.kessoku.lib.config.api.annotations.Comments;
@@ -84,7 +86,9 @@ public boolean load() {
                 // Check the value is public and not static
                 try {
                     Field field = this.getClass().getField(key);
-                    if (!Modifier.isPublic(field.getModifiers()) || Modifier.isStatic(field.getModifiers())) continue;
+                    if (!ModifiersUtil.isPublicOrStatic(field, true, false)) {
+                        continue;
+                    }
                     value = (ConfigValue) ReflectionUtil.getFieldValue(field, this);
                 } catch (NoSuchFieldException e) {
                     continue;
@@ -143,12 +147,9 @@ public void reset() {
 
         List<Field> fields = new ArrayList<>();
         for (Field declaredField : this.getClass().getDeclaredFields()) {
-            declaredField.setAccessible(true);
-
-            final boolean flag0 = declaredField.getDeclaringClass().isAssignableFrom(ConfigValue.class);
-            final boolean flag1 = Modifier.isPublic(declaredField.getModifiers());
-            final boolean flag2 = !Modifier.isStatic(declaredField.getModifiers());
-            if (flag0 && flag1 && flag2) {
+            final boolean flag0 = ReflectUtil.isAssignableFrom(declaredField, ConfigValue.class);
+            final boolean flag1 = ModifiersUtil.isPublicOrStatic(declaredField, true, false);
+            if (flag0 && flag1) {
                 fields.add(declaredField);
             }
         }
@@ -167,8 +168,8 @@ public ImmutableList<AbstractConfig> getValidCategories() {
         for (Field declaredField : this.getClass().getDeclaredFields()) {
             declaredField.setAccessible(true);
 
-            final boolean flag0 = declaredField.getDeclaringClass().isAssignableFrom(AbstractConfig.class);
-            final boolean flag1 = Modifier.isPublic(declaredField.getModifiers());
+            final boolean flag0 = ReflectUtil.isAssignableFrom(declaredField, AbstractConfig.class);
+            final boolean flag1 = ModifiersUtil.isPublic(declaredField);
             if (flag0 && flag1){
                 fields.add(declaredField);
             }
@@ -181,15 +182,10 @@ public ImmutableList<AbstractConfig> getValidCategories() {
     private ImmutableList<Field> getValidFields() {
         ImmutableList.Builder<Field> builder = ImmutableList.builder();
         for (Field declaredField : this.getClass().getDeclaredFields()) {
-            declaredField.setAccessible(true);
-
-            final boolean flag0 = declaredField.getDeclaringClass().isAssignableFrom(AbstractConfig.class);
-            final boolean flag1 = declaredField.getDeclaringClass().isAssignableFrom(ConfigValue.class);
-            final boolean flag2 = Modifier.isPublic(declaredField.getModifiers());
-
-            final var flag = flag0 || flag1;
+            final boolean flag0 = ReflectUtil.isAssignableFrom(declaredField, AbstractConfig.class, ConfigValue.class);
+            final boolean flag1 = Modifier.isPublic(declaredField.getModifiers());
 
-            if (flag && flag2){
+            if (flag0 && flag1){
                 builder.add(declaredField);
             }
         }
@@ -199,7 +195,7 @@ private ImmutableList<Field> getValidFields() {
     private Map<String, ValueWithComment> serialize() {
         ImmutableMap.Builder<String, ValueWithComment> builder = ImmutableMap.builder();
         for (Field field : this.getValidFields()) {
-            field.setAccessible(true);
+            ReflectUtil.makeAccessible(field);
 
             final String name = field.isAnnotationPresent(Name.class) ? field.getAnnotation(Name.class).value() : field.getName();
             final String[] comments = field.isAnnotationPresent(Comments.class) ? (String[]) Arrays.stream(field.getAnnotation(Comments.class).value()).map(Comment::value).toArray() : new String[0];

config/common/src/main/java/band/kessoku/lib/config/api/serializers/Json5Serializer.java → config/common/src/main/java/band/kessoku/lib/config/serializers/Json5Serializer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.serializers;
+package band.kessoku.lib.config.serializers;
 
 import band.kessoku.lib.config.api.AbstractConfig;
 import band.kessoku.lib.config.api.ConfigSerializer;
@@ -45,9 +45,13 @@ private Json5Builder.ObjectBean toBean(Map<String, AbstractConfig.ValueWithComme
         Json5Builder builder = new Json5Builder();
         Json5Builder.ObjectBean objectBean = builder.getObjectBean();
         value.forEach((s, valueWithComment) -> {
-            for (String comment : valueWithComment.comments()) objectBean.addNote(comment);
-            if (valueWithComment.object() instanceof Map<?, ?>)
+            for (String comment : valueWithComment.comments()) {
+                objectBean.addNote(comment);
+            }
+
+            if (valueWithComment.object() instanceof Map<?, ?>) {
                 objectBean.addBean(s, this.toBean((Map<String, AbstractConfig.ValueWithComment>) valueWithComment.object()));
+            }
         });
         return objectBean;
     }

config/common/src/main/java/band/kessoku/lib/config/api/serializers/JsonSerializer.java → config/common/src/main/java/band/kessoku/lib/config/serializers/JsonSerializer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.serializers;
+package band.kessoku.lib.config.serializers;
 
 import band.kessoku.lib.config.api.AbstractConfig;
 import band.kessoku.lib.config.api.ConfigSerializer;

config/common/src/main/java/band/kessoku/lib/config/api/serializers/TomlSerializer.java → config/common/src/main/java/band/kessoku/lib/config/serializers/TomlSerializer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.serializers;
+package band.kessoku.lib.config.serializers;
 
 import band.kessoku.lib.config.api.AbstractConfig;
 import band.kessoku.lib.config.api.ConfigSerializer;

config/common/src/main/java/band/kessoku/lib/config/api/values/BooleanValue.java → config/common/src/main/java/band/kessoku/lib/config/values/BooleanValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;

config/common/src/main/java/band/kessoku/lib/config/api/values/DefaultConfigValue.java → config/common/src/main/java/band/kessoku/lib/config/values/DefaultConfigValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import band.kessoku.lib.config.api.ConfigValue;
 

config/common/src/main/java/band/kessoku/lib/config/api/values/DoubleValue.java → config/common/src/main/java/band/kessoku/lib/config/values/DoubleValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;

config/common/src/main/java/band/kessoku/lib/config/api/values/FloatValue.java → config/common/src/main/java/band/kessoku/lib/config/values/FloatValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;

config/common/src/main/java/band/kessoku/lib/config/api/values/IntegerValue.java → config/common/src/main/java/band/kessoku/lib/config/values/IntegerValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;

config/common/src/main/java/band/kessoku/lib/config/api/values/ListValue.java → config/common/src/main/java/band/kessoku/lib/config/values/ListValue.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Sets;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
@@ -113,7 +114,11 @@ public boolean remove(Object o) {
 
     @Override
     public boolean containsAll(@NotNull Collection<?> c) {
-        return this.value.containsAll(c);
+        /* Amarok Note:
+        *   ArrayList 的数据存储量不可知的情况下，悲观假设有大量数据，那么 ArrayList#containsAll 的效率会低的令人发指...
+        *   虽说如果数据量少的话套一层 Set 也是无端浪费性能... 但我依然建议悲观演算。
+        * */
+        return Sets.newHashSet(this.value).containsAll(c);
     }
 
     @Override

config/common/src/main/java/band/kessoku/lib/config/api/values/LongValue.java → config/common/src/main/java/band/kessoku/lib/config/values/LongValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;

config/common/src/main/java/band/kessoku/lib/config/api/values/MapValue.java → config/common/src/main/java/band/kessoku/lib/config/values/MapValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import com.google.common.collect.ImmutableMap;
 import org.jetbrains.annotations.Contract;

config/common/src/main/java/band/kessoku/lib/config/api/values/StringValue.java → config/common/src/main/java/band/kessoku/lib/config/values/StringValue.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package band.kessoku.lib.config.api.values;
+package band.kessoku.lib.config.values;
 
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;