Преглед на файлове

Move Ignore annotation to ConfigEntryContainer

Lortseam преди 4 години
родител
ревизия
2a3fa06e4d

+ 0 - 10
src/main/java/me/lortseam/completeconfig/api/ConfigEntry.java

@@ -211,14 +211,4 @@ public @interface ConfigEntry {
 
     }
 
-    /**
-     * Can be applied to a field inside a POJO {@link ConfigEntryContainer} class to declare that that field should not
-     * be considered to be a config entry.
-     */
-    @Target(ElementType.FIELD)
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface Ignore {
-
-    }
-
 }

+ 10 - 0
src/main/java/me/lortseam/completeconfig/api/ConfigEntryContainer.java

@@ -61,5 +61,15 @@ public interface ConfigEntryContainer {
     @interface Transitive {
 
     }
+
+    /**
+     * Can be applied to a field inside a POJO {@link ConfigEntryContainer} class to declare that that field should not
+     * be considered to be a config entry.
+     */
+    @Target(ElementType.FIELD)
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface Ignore {
+
+    }
     
 }

+ 1 - 1
src/main/java/me/lortseam/completeconfig/data/EntryMap.java

@@ -31,7 +31,7 @@ public class EntryMap extends ConfigMap<Entry> {
                     return false;
                 }
                 if (container.isConfigPOJO()) {
-                    return !ConfigEntryContainer.class.isAssignableFrom(field.getType()) && !field.isAnnotationPresent(ConfigEntry.Ignore.class);
+                    return !ConfigEntryContainer.class.isAssignableFrom(field.getType()) && !field.isAnnotationPresent(ConfigEntryContainer.Ignore.class);
                 }
                 return field.isAnnotationPresent(ConfigEntry.class);
             }).forEach(field -> {

+ 1 - 2
src/test/java/me/lortseam/completeconfig/containers/POJOContainerWithIgnoredField.java

@@ -1,11 +1,10 @@
 package me.lortseam.completeconfig.containers;
 
-import me.lortseam.completeconfig.api.ConfigEntry;
 import me.lortseam.completeconfig.api.ConfigEntryContainer;
 
 public class POJOContainerWithIgnoredField implements ConfigEntryContainer {
 
-    @ConfigEntry.Ignore
+    @Ignore
     private boolean noEntry;
 
     @Override