From 5e9a408704da4daa0512e71733d63b971db6d2ad Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 22 Jun 2021 15:24:32 +0100 Subject: [PATCH] Refactored configs --- .../java/com/willfp/eco/core/data/Data.java | 4 ++-- ...figSection.java => JsonConfigSection.java} | 4 ++-- ...figWrapper.java => JsonConfigWrapper.java} | 20 +++++++++---------- .../config/json/LoadableJsonConfig.java | 2 +- ...figSection.java => YamlConfigSection.java} | 4 ++-- .../config/yaml/YamlConfigWrapper.java | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) rename eco-api/src/main/java/com/willfp/eco/internal/config/json/{JSONConfigSection.java => JsonConfigSection.java} (65%) rename eco-api/src/main/java/com/willfp/eco/internal/config/json/{JSONConfigWrapper.java => JsonConfigWrapper.java} (94%) rename eco-api/src/main/java/com/willfp/eco/internal/config/yaml/{ConfigSection.java => YamlConfigSection.java} (62%) diff --git a/eco-api/src/main/java/com/willfp/eco/core/data/Data.java b/eco-api/src/main/java/com/willfp/eco/core/data/Data.java index 0dbb94fd..bfd3cd4a 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/data/Data.java +++ b/eco-api/src/main/java/com/willfp/eco/core/data/Data.java @@ -5,7 +5,7 @@ import com.willfp.eco.core.config.Config; import com.willfp.eco.core.config.JSONConfig; import com.willfp.eco.core.config.JsonStaticBaseConfig; import com.willfp.eco.internal.config.LoadableConfig; -import com.willfp.eco.internal.config.json.JSONConfigSection; +import com.willfp.eco.internal.config.json.JsonConfigSection; import lombok.experimental.UtilityClass; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.ApiStatus; @@ -74,7 +74,7 @@ public class Data { if (config == null) { config = (JSONConfig) datafile.getSubsectionOrNull("player-data." + plugin.getName().toLowerCase() + "." + player.getUniqueId()); if (config == null) { - config = new JSONConfigSection(new HashMap<>()); + config = new JsonConfigSection(new HashMap<>()); } PLAYER_DATA.get(player.getUniqueId()).put(plugin, config); return getData(player, plugin); diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/json/JSONConfigSection.java b/eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigSection.java similarity index 65% rename from eco-api/src/main/java/com/willfp/eco/internal/config/json/JSONConfigSection.java rename to eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigSection.java index df72eb65..912b8fbc 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/json/JSONConfigSection.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigSection.java @@ -4,13 +4,13 @@ import org.jetbrains.annotations.NotNull; import java.util.Map; -public class JSONConfigSection extends JSONConfigWrapper { +public class JsonConfigSection extends JsonConfigWrapper { /** * Config section. * * @param values The values. */ - public JSONConfigSection(@NotNull final Map values) { + public JsonConfigSection(@NotNull final Map values) { this.init(values); } } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigWrapper.java similarity index 94% rename from eco-api/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java rename to eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigWrapper.java index c7e5c580..0d81cdea 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/json/JsonConfigWrapper.java @@ -20,7 +20,7 @@ import java.util.Objects; import java.util.Set; @SuppressWarnings({"unchecked", "unused"}) -public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { +public abstract class JsonConfigWrapper implements JSONConfig, Cloneable { /** * The linked {@link ConfigurationSection} where values are physically stored. */ @@ -42,7 +42,7 @@ public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { /** * Abstract config. */ - protected JSONConfigWrapper() { + protected JsonConfigWrapper() { } @@ -88,7 +88,7 @@ public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { } if (values.get(closestPath) instanceof Map && !path.equals(closestPath)) { - JSONConfigSection section = new JSONConfigSection((Map) values.get(closestPath)); + JsonConfigSection section = new JsonConfigSection((Map) values.get(closestPath)); return section.getOfKnownType(path.substring(closestPath.length() + 1), clazz, false); } else { if (values.containsKey(closestPath)) { @@ -115,7 +115,7 @@ public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { list.add(root + key); if (values.get(key) instanceof Map) { - JSONConfigSection section = new JSONConfigSection((Map) values.get(key)); + JsonConfigSection section = new JsonConfigSection((Map) values.get(key)); list.addAll(section.getDeepKeys(list, root + key + ".")); } } @@ -147,14 +147,14 @@ public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { } if (values.get(closestPath) instanceof Map && !path.equals(closestPath)) { - JSONConfigSection section = new JSONConfigSection((Map) values.get(closestPath)); + JsonConfigSection section = new JsonConfigSection((Map) values.get(closestPath)); section.setRecursively(path.substring(closestPath.length() + 1), object, false); values.put(closestPath, section.getValues()); } else { Object obj = object; if (object instanceof JSONConfig) { - obj = ((JSONConfigWrapper) object).getValues(); + obj = ((JsonConfigWrapper) object).getValues(); } values.put(path, obj); @@ -174,7 +174,7 @@ public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { public Config getSubsectionOrNull(@NotNull final String path) { if (values.containsKey(path)) { Map subsection = (Map) values.get(path); - return new JSONConfigSection(subsection); + return new JsonConfigSection(subsection); } else { return null; } @@ -200,7 +200,7 @@ public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { List configs = new ArrayList<>(); for (Map map : maps) { - configs.add(new JSONConfigSection(map)); + configs.add(new JsonConfigSection(map)); } return configs; @@ -339,7 +339,7 @@ public abstract class JSONConfigWrapper implements JSONConfig, Cloneable { } @Override - public JSONConfigWrapper clone() { - return new JSONConfigSection(new HashMap<>(this.getValues())); + public JsonConfigWrapper clone() { + return new JsonConfigSection(new HashMap<>(this.getValues())); } } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/json/LoadableJsonConfig.java b/eco-api/src/main/java/com/willfp/eco/internal/config/json/LoadableJsonConfig.java index 947dc67a..bb2c3096 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/json/LoadableJsonConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/json/LoadableJsonConfig.java @@ -18,7 +18,7 @@ import java.nio.file.StandardOpenOption; import java.util.HashMap; @SuppressWarnings({"unchecked", "unused"}) -public abstract class LoadableJsonConfig extends JSONConfigWrapper implements LoadableConfig { +public abstract class LoadableJsonConfig extends JsonConfigWrapper implements LoadableConfig { /** * The physical config file, as stored on disk. */ diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/ConfigSection.java b/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigSection.java similarity index 62% rename from eco-api/src/main/java/com/willfp/eco/internal/config/yaml/ConfigSection.java rename to eco-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigSection.java index a1a324c5..b4f19f67 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/ConfigSection.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigSection.java @@ -3,13 +3,13 @@ package com.willfp.eco.internal.config.yaml; import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.NotNull; -public class ConfigSection extends YamlConfigWrapper { +public class YamlConfigSection extends YamlConfigWrapper { /** * Config section. * * @param section The section. */ - public ConfigSection(@NotNull final ConfigurationSection section) { + public YamlConfigSection(@NotNull final ConfigurationSection section) { this.init(section); } } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java index 0c67cdbe..b36102b7 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/yaml/YamlConfigWrapper.java @@ -96,7 +96,7 @@ public abstract class YamlConfigWrapper implemen if (raw == null) { cache.put(path, null); } else { - cache.put(path, new ConfigSection(raw)); + cache.put(path, new YamlConfigSection(raw)); } return getSubsectionOrNull(path); }