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

JSON config changes

Browse Source
This commit is contained in:
Auxilor
2021-07-27 18:36:51 +01:00
parent dd3beaa548
commit b6086bc4bd
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
eco-api/src/main/java/com/willfp/eco/core/config/interfaces/JSONConfig.java
View File

@@ -29,6 +29,27 @@ public interface JSONConfig extends Config {
@Nullable
List<JSONConfig> getSubsectionsOrNull(@NotNull String path);
/**
* Get subsection from config.
*
* @param path The key to check.
* @return The subsection. Throws NPE if not found.
*/
@Override
@NotNull
JSONConfig getSubsection(@NotNull String path);
/**
* Get subsection from config.
*
* @param path The key to check.
* @return The subsection, or null if not found.
*/
@Override
@Nullable
JSONConfig getSubsectionOrNull(@NotNull String path);
@Override
JSONConfig clone();
}

10
eco-api/src/main/java/com/willfp/eco/core/config/json/wrapper/JSONConfigWrapper.java
View File

@@ -31,6 +31,16 @@ public abstract class JSONConfigWrapper extends ConfigWrapper<JSONConfig> implem
return this.getHandle().getSubsectionsOrNull(path);
}
@Override
public @NotNull JSONConfig getSubsection(@NotNull final String path) {
return this.getHandle().getSubsection(path);
}
@Override
public @Nullable JSONConfig getSubsectionOrNull(@NotNull final String path) {
return this.getHandle().getSubsectionOrNull(path);
}
@Override
public JSONConfig clone() {
return this.getHandle().clone();

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

@@ -2,7 +2,6 @@ package com.willfp.eco.internal.config.json;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.interfaces.JSONConfig;
import com.willfp.eco.util.StringUtils;
import lombok.Getter;
@@ -150,15 +149,15 @@ public class EcoJSONConfigWrapper implements JSONConfig {
@Override
@NotNull
public Config getSubsection(@NotNull final String path) {
Config subsection = getSubsectionOrNull(path);
public JSONConfig getSubsection(@NotNull final String path) {
JSONConfig subsection = getSubsectionOrNull(path);
Validate.notNull(subsection);
return subsection;
}
@Override
@Nullable
public Config getSubsectionOrNull(@NotNull final String path) {
public JSONConfig getSubsectionOrNull(@NotNull final String path) {
if (values.containsKey(path)) {
Map<String, Object> subsection = (Map<String, Object>) values.get(path);
return new EcoJSONConfigSection(subsection);
@@ -171,8 +170,7 @@ public class EcoJSONConfigWrapper implements JSONConfig {
@NotNull
public List<JSONConfig> getSubsections(@NotNull final String path) {
List<JSONConfig> subsections = getSubsectionsOrNull(path);
Validate.notNull(subsections);
return subsections;
return subsections == null ? new ArrayList<>() : subsections;
}
@Override