MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Move and rename key escaping methods while I'm here

Browse Source
This commit is contained in:
Mark Vainomaa
2018-10-28 18:18:44 +02:00
parent 0c86f02c49
commit e0330e9f27
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proxy/src/main/java/com/velocitypowered/proxy/config/AnnotatedConfig.java
View File

@@ -125,7 +125,7 @@ public abstract class AnnotatedConfig {
// Get a key name for config. Use field name if @ConfigKey annotation is not present.
ConfigKey key = field.getAnnotation(ConfigKey.class);
final String name = safeKey(key == null ? field.getName() : key.value());
final String name = escapeKeyIfNeeded(key == null ? field.getName() : key.value());
Object value = field.get(dumpable);
@@ -142,7 +142,7 @@ public abstract class AnnotatedConfig {
Map<String, ?> map = (Map<String, ?>) value;
for (Entry<String, ?> entry : map.entrySet()) {
lines.add(
safeKey(entry.getKey()) + " = " + serialize(entry.getValue())); // Save map data
escapeKeyIfNeeded(entry.getKey()) + " = " + serialize(entry.getValue())); // Save map data
}
lines.add(""); // Add empty line
continue;
@@ -203,7 +203,7 @@ public abstract class AnnotatedConfig {
return value != null ? value.toString() : "null";
}
private static String safeKey(String key) {
protected static String escapeKeyIfNeeded(String key) {
if (key.contains(".") && !(key.indexOf('"') == 0 && key.lastIndexOf('"') == (key.length()
- 1))) {
return '"' + key + '"';
@@ -211,6 +211,14 @@ public abstract class AnnotatedConfig {
return key;
}
protected static String unesacpeKeyIfNeeded(String key) {
int lastIndex;
if (key.indexOf('"') == 0 && (lastIndex = key.lastIndexOf('"')) == (key.length() - 1)) {
return key.substring(1, lastIndex);
}
return key;
}
/**
* Writes list of strings to file.
*

12
proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
View File

@@ -487,9 +487,9 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
for (Map.Entry<String, Object> entry : toml.entrySet()) {
if (entry.getValue() instanceof String) {
forcedHosts
.put(stripQuotes(entry.getKey()), ImmutableList.of((String) entry.getValue()));
.put(unesacpeKeyIfNeeded(entry.getKey()), ImmutableList.of((String) entry.getValue()));
} else if (entry.getValue() instanceof List) {
forcedHosts.put(stripQuotes(entry.getKey()),
forcedHosts.put(unesacpeKeyIfNeeded(entry.getKey()),
ImmutableList.copyOf((List<String>) entry.getValue()));
} else {
throw new IllegalStateException(
@@ -512,14 +512,6 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
this.forcedHosts = forcedHosts;
}
private static String stripQuotes(String key) {
int lastIndex;
if (key.indexOf('"') == 0 && (lastIndex = key.lastIndexOf('"')) == (key.length() - 1)) {
return key.substring(1, lastIndex);
}
return key;
}
@Override
public String toString() {
return "ForcedHosts{"