Merge pull request #5 from Talexs/develop

Develop

Author: TalexDreamSoul

src/main/java/com/talexframe/frame/core/modules/plugins/adapt/config/json/JSONConfigAdapter.java

@@ -97,6 +97,8 @@ protected boolean injectWithInstance(PluginScanner scanner, WebPlugin webPlugin,
             for( Field field : clz.getDeclaredFields() ) {
 
                 TVConfig fieldAnno = field.getAnnotation(TVConfig.class);
+                if( fieldAnno == null ) continue;
+
                 String name = StrUtil.isBlankIfStr(fieldAnno.name()) ? field.getName() : fieldAnno.name();
 
                 field.setAccessible(true);
@@ -121,7 +123,8 @@ protected boolean injectWithInstance(PluginScanner scanner, WebPlugin webPlugin,
 
         }
 
-        map.put( clz, instance );
+        if( classAnno == null || !classAnno.disable() )
+            map.put( clz, instance );
 
         return true;
     }
@@ -170,6 +173,9 @@ public boolean logoutInstance(PluginScanner scanner, WebPlugin webPlugin, Class<
                 for( Field field : clazz.getDeclaredFields() ) {
 
                     TVConfig fieldAnno = field.getAnnotation(TVConfig.class);
+                    if( fieldAnno == null ) continue;
+                    if( fieldAnno.disable() ) continue;
+
                     String name = StrUtil.isBlankIfStr(fieldAnno.name()) ? field.getName() : fieldAnno.name();
 
                     Object value = field.get( config );

src/main/java/com/talexframe/frame/core/modules/plugins/adapt/config/yaml/YamlConfigAdapter.java

@@ -103,6 +103,8 @@ protected boolean injectWithInstance(PluginScanner scanner, WebPlugin webPlugin,
             for( Field field : clz.getDeclaredFields() ) {
 
                 TVConfig fieldAnno = field.getAnnotation(TVConfig.class);
+                if( fieldAnno == null ) continue;
+
                 String name = StrUtil.isBlankIfStr(fieldAnno.name()) ? field.getName() : fieldAnno.name();
 
                 field.setAccessible(true);
@@ -133,7 +135,8 @@ protected boolean injectWithInstance(PluginScanner scanner, WebPlugin webPlugin,
 
         }
 
-        map.put( clz, instance );
+        if( classAnno == null || !classAnno.disable() )
+            map.put( clz, instance );
 
         return true;
     }
@@ -182,6 +185,10 @@ public boolean logoutInstance(PluginScanner scanner, WebPlugin webPlugin, Class<
                 for( Field field : clazz.getDeclaredFields() ) {
 
                     TVConfig fieldAnno = field.getAnnotation(TVConfig.class);
+
+                    if( fieldAnno == null ) continue;
+                    if( fieldAnno.disable() ) continue;
+
                     String name = StrUtil.isBlankIfStr(fieldAnno.name()) ? field.getName() : fieldAnno.name();
 
                     Object value = field.get( config );

src/main/java/com/talexframe/frame/core/pojo/annotations/TVConfig.java

@@ -27,4 +27,11 @@
      */
     boolean ignore() default false;
 
+    /**
+     * 禁止保存
+     * 是否禁止保存(部分)字段
+     *
+     */
+    boolean disable() default false;
+
 }

src/main/java/org/bukkit/configuration/MemoryConfiguration.java

@@ -1,6 +1,6 @@
 package org.bukkit.configuration;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/org/bukkit/configuration/file/FileConfiguration.java

@@ -2,7 +2,7 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.MemoryConfiguration;

src/main/java/org/bukkit/configuration/file/YamlConfiguration.java

@@ -1,6 +1,6 @@
 package org.bukkit.configuration.file;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;

src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java

@@ -1,6 +1,6 @@
 package org.bukkit.configuration.file;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java

@@ -1,6 +1,6 @@
 package org.bukkit.configuration.serialization;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.configuration.Configuration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;