Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Refactoring

Browse Source
This commit is contained in:
Auxilor
2021-07-13 19:30:25 +02:00
committed by Auxilor
parent 78093531f7
commit ddeaa5c79c
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/EcoConfigFactory.java
View File

@@ -4,8 +4,8 @@ import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.config.Config;
import com.willfp.eco.core.config.JSONConfig;
import com.willfp.eco.core.config.wrapper.ConfigFactory;
import com.willfp.eco.internal.config.json.JsonConfigSection;
import com.willfp.eco.internal.config.json.LoadableJsonConfig;
import com.willfp.eco.internal.config.json.JSONConfigSection;
import com.willfp.eco.internal.config.json.LoadableJSONConfig;
import com.willfp.eco.internal.config.yaml.LoadableYamlConfig;
import com.willfp.eco.internal.config.yaml.UpdatableYamlConfig;
import com.willfp.eco.internal.config.yaml.YamlConfigSection;
@@ -37,7 +37,7 @@ public class EcoConfigFactory implements ConfigFactory {
@NotNull final EcoPlugin plugin,
@NotNull final String subDirectoryPath,
@NotNull final Class<?> source) {
return new LoadableJsonConfig(
return new LoadableJSONConfig(
configName,
plugin,
subDirectoryPath,
@@ -65,6 +65,6 @@ public class EcoConfigFactory implements ConfigFactory {
@Override
public JSONConfig createJSONConfig(@NotNull final Map<String, Object> values) {
return new JsonConfigSection(values);
return new JSONConfigSection(values);
}
}

4
eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JsonConfigSection.java → eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JSONConfigSection.java
View File

@@ -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<String, Object> values) {
public JSONConfigSection(@NotNull final Map<String, Object> values) {
this.init(values);
}
}

18
eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JsonConfigWrapper.java → eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/JSONConfigWrapper.java
View File

@@ -20,7 +20,7 @@ import java.util.Objects;
import java.util.Set;
@SuppressWarnings({"unchecked", "unused"})
public class JsonConfigWrapper implements JSONConfig, Cloneable {
public class JSONConfigWrapper implements JSONConfig, Cloneable {
/**
* The linked {@link ConfigurationSection} where values are physically stored.
*/
@@ -42,7 +42,7 @@ public class JsonConfigWrapper implements JSONConfig, Cloneable {
/**
* Abstract config.
*/
public JsonConfigWrapper() {
public JSONConfigWrapper() {
}
@@ -88,7 +88,7 @@ public class JsonConfigWrapper implements JSONConfig, Cloneable {
}
if (values.get(closestPath) instanceof Map && !path.equals(closestPath)) {
JsonConfigSection section = new JsonConfigSection((Map<String, Object>) values.get(closestPath));
JSONConfigSection section = new JSONConfigSection((Map<String, Object>) values.get(closestPath));
return section.getOfKnownType(path.substring(closestPath.length() + 1), clazz, false);
} else {
if (values.containsKey(closestPath)) {
@@ -115,7 +115,7 @@ public class JsonConfigWrapper implements JSONConfig, Cloneable {
list.add(root + key);
if (values.get(key) instanceof Map) {
JsonConfigSection section = new JsonConfigSection((Map<String, Object>) values.get(key));
JSONConfigSection section = new JSONConfigSection((Map<String, Object>) values.get(key));
list.addAll(section.getDeepKeys(list, root + key + "."));
}
}
@@ -147,14 +147,14 @@ public class JsonConfigWrapper implements JSONConfig, Cloneable {
}
if (values.get(closestPath) instanceof Map && !path.equals(closestPath)) {
JsonConfigSection section = new JsonConfigSection((Map<String, Object>) values.get(closestPath));
JSONConfigSection section = new JSONConfigSection((Map<String, Object>) 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 class JsonConfigWrapper implements JSONConfig, Cloneable {
public Config getSubsectionOrNull(@NotNull final String path) {
if (values.containsKey(path)) {
Map<String, Object> subsection = (Map<String, Object>) values.get(path);
return new JsonConfigSection(subsection);
return new JSONConfigSection(subsection);
} else {
return null;
}
@@ -200,7 +200,7 @@ public class JsonConfigWrapper implements JSONConfig, Cloneable {
List<JSONConfig> configs = new ArrayList<>();
for (Map<String, Object> map : maps) {
configs.add(new JsonConfigSection(map));
configs.add(new JSONConfigSection(map));
}
return configs;
@@ -349,6 +349,6 @@ public class JsonConfigWrapper implements JSONConfig, Cloneable {
@Override
public JSONConfig clone() {
return new JsonConfigSection(new HashMap<>(this.getValues()));
return new JSONConfigSection(new HashMap<>(this.getValues()));
}
}

10
eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/LoadableJsonConfig.java → eco-core/core-backend/src/main/java/com/willfp/eco/internal/config/json/LoadableJSONConfig.java
View File

@@ -18,7 +18,7 @@ import java.nio.file.StandardOpenOption;
import java.util.HashMap;
@SuppressWarnings({"unchecked", "unused"})
public class LoadableJsonConfig extends JsonConfigWrapper implements LoadableConfig {
public class LoadableJSONConfig extends JSONConfigWrapper implements LoadableConfig {
/**
* The physical config file, as stored on disk.
*/
@@ -57,10 +57,10 @@ public class LoadableJsonConfig extends JsonConfigWrapper implements LoadableCon
* @param subDirectoryPath The subdirectory path.
* @param source The class that owns the resource.
*/
public LoadableJsonConfig(@NotNull final String configName,
@NotNull final EcoPlugin plugin,
@NotNull final String subDirectoryPath,
@NotNull final Class<?> source) {
public LoadableJSONConfig(@NotNull final String configName,
@NotNull final EcoPlugin plugin,
@NotNull final String subDirectoryPath,
@NotNull final Class<?> source) {
this.plugin = plugin;
this.name = configName + ".json";
this.source = source;