Add Override annotations where appropriate

By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2019-04-28 11:37:52 +10:00
parent d66310a2f1
commit 82854b7bd7
176 changed files with 503 additions and 0 deletions

View File

@@ -22,6 +22,7 @@ public interface Configuration extends ConfigurationSection {
* @param value Value to set the default to.
* @throws IllegalArgumentException Thrown if path is null.
*/
@Override
public void addDefault(@NotNull String path, @Nullable Object value);
/**

View File

@@ -41,6 +41,7 @@ public class MemoryConfiguration extends MemorySection implements Configuration
defaults.set(path, value);
}
@Override
public void addDefaults(@NotNull Map<String, Object> defaults) {
Validate.notNull(defaults, "Defaults may not be null");
@@ -49,18 +50,21 @@ public class MemoryConfiguration extends MemorySection implements Configuration
}
}
@Override
public void addDefaults(@NotNull Configuration defaults) {
Validate.notNull(defaults, "Defaults may not be null");
addDefaults(defaults.getValues(true));
}
@Override
public void setDefaults(@NotNull Configuration defaults) {
Validate.notNull(defaults, "Defaults may not be null");
this.defaults = defaults;
}
@Override
@Nullable
public Configuration getDefaults() {
return defaults;
@@ -72,6 +76,7 @@ public class MemoryConfiguration extends MemorySection implements Configuration
return null;
}
@Override
@NotNull
public MemoryConfigurationOptions options() {
if (options == null) {

View File

@@ -69,6 +69,7 @@ public class MemorySection implements ConfigurationSection {
this.fullPath = createPath(parent, path);
}
@Override
@NotNull
public Set<String> getKeys(boolean deep) {
Set<String> result = new LinkedHashSet<String>();
@@ -87,6 +88,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public Map<String, Object> getValues(boolean deep) {
Map<String, Object> result = new LinkedHashMap<String, Object>();
@@ -105,14 +107,17 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
public boolean contains(@NotNull String path) {
return contains(path, false);
}
@Override
public boolean contains(@NotNull String path, boolean ignoreDefault) {
return ((ignoreDefault) ? get(path, null) : get(path)) != null;
}
@Override
public boolean isSet(@NotNull String path) {
Configuration root = getRoot();
if (root == null) {
@@ -124,26 +129,31 @@ public class MemorySection implements ConfigurationSection {
return get(path, null) != null;
}
@Override
@NotNull
public String getCurrentPath() {
return fullPath;
}
@Override
@NotNull
public String getName() {
return path;
}
@Override
@Nullable
public Configuration getRoot() {
return root;
}
@Override
@Nullable
public ConfigurationSection getParent() {
return parent;
}
@Override
public void addDefault(@NotNull String path, @Nullable Object value) {
Validate.notNull(path, "Path cannot be null");
@@ -157,6 +167,7 @@ public class MemorySection implements ConfigurationSection {
root.addDefault(createPath(this, path), value);
}
@Override
@Nullable
public ConfigurationSection getDefaultSection() {
Configuration root = getRoot();
@@ -171,6 +182,7 @@ public class MemorySection implements ConfigurationSection {
return null;
}
@Override
public void set(@NotNull String path, @Nullable Object value) {
Validate.notEmpty(path, "Cannot set to an empty path");
@@ -210,11 +222,13 @@ public class MemorySection implements ConfigurationSection {
}
}
@Override
@Nullable
public Object get(@NotNull String path) {
return get(path, getDefault(path));
}
@Override
@Nullable
public Object get(@NotNull String path, @Nullable Object def) {
Validate.notNull(path, "Path cannot be null");
@@ -248,6 +262,7 @@ public class MemorySection implements ConfigurationSection {
return section.get(key, def);
}
@Override
@NotNull
public ConfigurationSection createSection(@NotNull String path) {
Validate.notEmpty(path, "Cannot create section at empty path");
@@ -280,6 +295,7 @@ public class MemorySection implements ConfigurationSection {
return section.createSection(key);
}
@Override
@NotNull
public ConfigurationSection createSection(@NotNull String path, @NotNull Map<?, ?> map) {
ConfigurationSection section = createSection(path);
@@ -296,101 +312,120 @@ public class MemorySection implements ConfigurationSection {
}
// Primitives
@Override
@Nullable
public String getString(@NotNull String path) {
Object def = getDefault(path);
return getString(path, def != null ? def.toString() : null);
}
@Override
@Nullable
public String getString(@NotNull String path, @Nullable String def) {
Object val = get(path, def);
return (val != null) ? val.toString() : def;
}
@Override
public boolean isString(@NotNull String path) {
Object val = get(path);
return val instanceof String;
}
@Override
public int getInt(@NotNull String path) {
Object def = getDefault(path);
return getInt(path, (def instanceof Number) ? toInt(def) : 0);
}
@Override
public int getInt(@NotNull String path, int def) {
Object val = get(path, def);
return (val instanceof Number) ? toInt(val) : def;
}
@Override
public boolean isInt(@NotNull String path) {
Object val = get(path);
return val instanceof Integer;
}
@Override
public boolean getBoolean(@NotNull String path) {
Object def = getDefault(path);
return getBoolean(path, (def instanceof Boolean) ? (Boolean) def : false);
}
@Override
public boolean getBoolean(@NotNull String path, boolean def) {
Object val = get(path, def);
return (val instanceof Boolean) ? (Boolean) val : def;
}
@Override
public boolean isBoolean(@NotNull String path) {
Object val = get(path);
return val instanceof Boolean;
}
@Override
public double getDouble(@NotNull String path) {
Object def = getDefault(path);
return getDouble(path, (def instanceof Number) ? toDouble(def) : 0);
}
@Override
public double getDouble(@NotNull String path, double def) {
Object val = get(path, def);
return (val instanceof Number) ? toDouble(val) : def;
}
@Override
public boolean isDouble(@NotNull String path) {
Object val = get(path);
return val instanceof Double;
}
@Override
public long getLong(@NotNull String path) {
Object def = getDefault(path);
return getLong(path, (def instanceof Number) ? toLong(def) : 0);
}
@Override
public long getLong(@NotNull String path, long def) {
Object val = get(path, def);
return (val instanceof Number) ? toLong(val) : def;
}
@Override
public boolean isLong(@NotNull String path) {
Object val = get(path);
return val instanceof Long;
}
// Java
@Override
@Nullable
public List<?> getList(@NotNull String path) {
Object def = getDefault(path);
return getList(path, (def instanceof List) ? (List<?>) def : null);
}
@Override
@Nullable
public List<?> getList(@NotNull String path, @Nullable List<?> def) {
Object val = get(path, def);
return (List<?>) ((val instanceof List) ? val : def);
}
@Override
public boolean isList(@NotNull String path) {
Object val = get(path);
return val instanceof List;
}
@Override
@NotNull
public List<String> getStringList(@NotNull String path) {
List<?> list = getList(path);
@@ -410,6 +445,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Integer> getIntegerList(@NotNull String path) {
List<?> list = getList(path);
@@ -438,6 +474,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Boolean> getBooleanList(@NotNull String path) {
List<?> list = getList(path);
@@ -463,6 +500,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Double> getDoubleList(@NotNull String path) {
List<?> list = getList(path);
@@ -491,6 +529,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Float> getFloatList(@NotNull String path) {
List<?> list = getList(path);
@@ -519,6 +558,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Long> getLongList(@NotNull String path) {
List<?> list = getList(path);
@@ -547,6 +587,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Byte> getByteList(@NotNull String path) {
List<?> list = getList(path);
@@ -575,6 +616,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Character> getCharacterList(@NotNull String path) {
List<?> list = getList(path);
@@ -602,6 +644,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Short> getShortList(@NotNull String path) {
List<?> list = getList(path);
@@ -630,6 +673,7 @@ public class MemorySection implements ConfigurationSection {
return result;
}
@Override
@NotNull
public List<Map<?, ?>> getMapList(@NotNull String path) {
List<?> list = getList(path);
@@ -677,62 +721,75 @@ public class MemorySection implements ConfigurationSection {
return getObject(path, clazz, def);
}
@Override
@Nullable
public Vector getVector(@NotNull String path) {
return getSerializable(path, Vector.class);
}
@Override
@Nullable
public Vector getVector(@NotNull String path, @Nullable Vector def) {
return getSerializable(path, Vector.class, def);
}
@Override
public boolean isVector(@NotNull String path) {
return getSerializable(path, Vector.class) != null;
}
@Override
@Nullable
public OfflinePlayer getOfflinePlayer(@NotNull String path) {
return getSerializable(path, OfflinePlayer.class);
}
@Override
@Nullable
public OfflinePlayer getOfflinePlayer(@NotNull String path, @Nullable OfflinePlayer def) {
return getSerializable(path, OfflinePlayer.class, def);
}
@Override
public boolean isOfflinePlayer(@NotNull String path) {
return getSerializable(path, OfflinePlayer.class) != null;
}
@Override
@Nullable
public ItemStack getItemStack(@NotNull String path) {
return getSerializable(path, ItemStack.class);
}
@Override
@Nullable
public ItemStack getItemStack(@NotNull String path, @Nullable ItemStack def) {
return getSerializable(path, ItemStack.class, def);
}
@Override
public boolean isItemStack(@NotNull String path) {
return getSerializable(path, ItemStack.class) != null;
}
@Override
@Nullable
public Color getColor(@NotNull String path) {
return getSerializable(path, Color.class);
}
@Override
@Nullable
public Color getColor(@NotNull String path, @Nullable Color def) {
return getSerializable(path, Color.class, def);
}
@Override
public boolean isColor(@NotNull String path) {
return getSerializable(path, Color.class) != null;
}
@Override
@Nullable
public ConfigurationSection getConfigurationSection(@NotNull String path) {
Object val = get(path, null);
@@ -744,6 +801,7 @@ public class MemorySection implements ConfigurationSection {
return (val instanceof ConfigurationSection) ? createSection(path) : null;
}
@Override
public boolean isConfigurationSection(@NotNull String path) {
Object val = get(path);
return val instanceof ConfigurationSection;