This commit is contained in:
Telesphoreo 2022-05-10 00:08:45 -05:00
parent 770fe65f98
commit bb8c34e0cd
No known key found for this signature in database
GPG Key ID: 5ACFFC4682CF849B
74 changed files with 2025 additions and 1556 deletions

View File

@ -9,13 +9,12 @@ import dev.plex.Plex;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import java.util.Arrays;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
public abstract class PlexCommand implements SimpleCommand public abstract class PlexCommand implements SimpleCommand
{ {
/** /**

View File

@ -3,13 +3,12 @@ package dev.plex.config;
import dev.plex.Plex; import dev.plex.Plex;
import dev.plex.toml.Toml; import dev.plex.toml.Toml;
import dev.plex.toml.TomlWriter; import dev.plex.toml.TomlWriter;
import lombok.Getter;
import lombok.Setter;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.function.Consumer; import java.util.function.Consumer;
import lombok.Getter;
import lombok.Setter;
@Getter @Getter
public class TomlConfig public class TomlConfig
@ -43,7 +42,8 @@ public class TomlConfig
{ {
this.onCreate.accept(this.toml); this.onCreate.accept(this.toml);
} }
} catch (IOException e) }
catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -57,7 +57,8 @@ public class TomlConfig
{ {
this.onCreate.accept(this.toml); this.onCreate.accept(this.toml);
} }
} catch (IOException e) }
catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -89,7 +90,8 @@ public class TomlConfig
{ {
writer.write(object, this.file); writer.write(object, this.file);
this.load(); this.load();
} catch (IOException e) }
catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }

View File

@ -4,7 +4,6 @@ import com.google.common.collect.Lists;
import dev.plex.listener.PlexListener; import dev.plex.listener.PlexListener;
import dev.plex.util.PlexLog; import dev.plex.util.PlexLog;
import dev.plex.util.ReflectionsUtil; import dev.plex.util.ReflectionsUtil;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

View File

@ -5,6 +5,7 @@ import dev.plex.Plex;
public class PlexListener public class PlexListener
{ {
protected final Plex plugin = Plex.get(); protected final Plex plugin = Plex.get();
public PlexListener() public PlexListener()
{ {
Plex.get().getServer().getEventManager().register(Plex.get(), this); Plex.get().getServer().getEventManager().register(Plex.get(), this);

View File

@ -2,18 +2,18 @@ package dev.plex.settings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.util.List;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import java.util.List;
@Getter @Getter
public class ServerSettings public class ServerSettings
{ {
private final Server server = new Server(); private final Server server = new Server();
@Data @Data
public static class Server { public static class Server
{
private String name = "Server"; private String name = "Server";
private List<String> motd = Lists.newArrayList("%randomgradient%%servername% - %mcversion%", "Another motd"); private List<String> motd = Lists.newArrayList("%randomgradient%%servername% - %mcversion%", "Another motd");
private boolean colorizeMotd = false; private boolean colorizeMotd = false;

View File

@ -4,16 +4,20 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
public class ArrayValueReader implements ValueReader { public class ArrayValueReader implements ValueReader
{
public static final ArrayValueReader ARRAY_VALUE_READER = new ArrayValueReader(); public static final ArrayValueReader ARRAY_VALUE_READER = new ArrayValueReader();
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
{
return s.startsWith("["); return s.startsWith("[");
} }
@Override @Override
public Object read(String s, AtomicInteger index, dev.plex.toml.Context context) { public Object read(String s, AtomicInteger index, dev.plex.toml.Context context)
{
AtomicInteger line = context.line; AtomicInteger line = context.line;
int startLine = line.get(); int startLine = line.get();
int startIndex = index.get(); int startIndex = index.get();
@ -22,56 +26,83 @@ public class ArrayValueReader implements ValueReader {
boolean inComment = false; boolean inComment = false;
dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors(); dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors();
for (int i = index.incrementAndGet(); i < s.length(); i = index.incrementAndGet()) { for (int i = index.incrementAndGet(); i < s.length(); i = index.incrementAndGet())
{
char c = s.charAt(i); char c = s.charAt(i);
if (c == '#' && !inComment) { if (c == '#' && !inComment)
{
inComment = true; inComment = true;
} else if (c == '\n') { }
else if (c == '\n')
{
inComment = false; inComment = false;
line.incrementAndGet(); line.incrementAndGet();
} else if (inComment || Character.isWhitespace(c) || c == ',') { }
else if (inComment || Character.isWhitespace(c) || c == ',')
{
continue; continue;
} else if (c == '[') { }
else if (c == '[')
{
Object converted = read(s, index, context); Object converted = read(s, index, context);
if (converted instanceof dev.plex.toml.Results.Errors) { if (converted instanceof dev.plex.toml.Results.Errors)
{
errors.add((dev.plex.toml.Results.Errors)converted); errors.add((dev.plex.toml.Results.Errors)converted);
} else if (!isHomogenousArray(converted, arrayItems)) { }
else if (!isHomogenousArray(converted, arrayItems))
{
errors.heterogenous(context.identifier.getName(), line.get()); errors.heterogenous(context.identifier.getName(), line.get());
} else { }
else
{
arrayItems.add(converted); arrayItems.add(converted);
} }
continue; continue;
} else if (c == ']') { }
else if (c == ']')
{
terminated = true; terminated = true;
break; break;
} else { }
else
{
Object converted = ValueReaders.VALUE_READERS.convert(s, index, context); Object converted = ValueReaders.VALUE_READERS.convert(s, index, context);
if (converted instanceof dev.plex.toml.Results.Errors) { if (converted instanceof dev.plex.toml.Results.Errors)
{
errors.add((dev.plex.toml.Results.Errors)converted); errors.add((dev.plex.toml.Results.Errors)converted);
} else if (!isHomogenousArray(converted, arrayItems)) { }
else if (!isHomogenousArray(converted, arrayItems))
{
errors.heterogenous(context.identifier.getName(), line.get()); errors.heterogenous(context.identifier.getName(), line.get());
} else { }
else
{
arrayItems.add(converted); arrayItems.add(converted);
} }
} }
} }
if (!terminated) { if (!terminated)
errors.unterminated(context.identifier.getName(), s.substring(startIndex, s.length()), startLine); {
errors.unterminated(context.identifier.getName(), s.substring(startIndex), startLine);
} }
if (errors.hasErrors()) { if (errors.hasErrors())
{
return errors; return errors;
} }
return arrayItems; return arrayItems;
} }
private boolean isHomogenousArray(Object o, List<?> values) { private boolean isHomogenousArray(Object o, List<?> values)
{
return values.isEmpty() || values.get(0).getClass().isAssignableFrom(o.getClass()) || o.getClass().isAssignableFrom(values.get(0).getClass()); return values.isEmpty() || values.get(0).getClass().isAssignableFrom(o.getClass()) || o.getClass().isAssignableFrom(values.get(0).getClass());
} }
private ArrayValueReader() {} private ArrayValueReader()
{
}
} }

View File

@ -4,23 +4,26 @@ package dev.plex.toml;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import static dev.plex.toml.ValueWriters.WRITERS; import static dev.plex.toml.ValueWriters.WRITERS;
public abstract class ArrayValueWriter implements dev.plex.toml.ValueWriter public abstract class ArrayValueWriter implements dev.plex.toml.ValueWriter
{ {
static protected boolean isArrayish(Object value) { static protected boolean isArrayish(Object value)
{
return value instanceof Collection || value.getClass().isArray(); return value instanceof Collection || value.getClass().isArray();
} }
@Override @Override
public boolean isPrimitiveType() { public boolean isPrimitiveType()
{
return false; return false;
} }
static boolean isArrayOfPrimitive(Object array) { static boolean isArrayOfPrimitive(Object array)
{
Object first = peek(array); Object first = peek(array);
if (first != null) { if (first != null)
{
dev.plex.toml.ValueWriter valueWriter = WRITERS.findWriterFor(first); dev.plex.toml.ValueWriter valueWriter = WRITERS.findWriterFor(first);
return valueWriter.isPrimitiveType() || isArrayish(first); return valueWriter.isPrimitiveType() || isArrayish(first);
} }
@ -29,34 +32,47 @@ public abstract class ArrayValueWriter implements dev.plex.toml.ValueWriter
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected Collection<?> normalize(Object value) { protected Collection<?> normalize(Object value)
{
Collection<Object> collection; Collection<Object> collection;
if (value.getClass().isArray()) { if (value.getClass().isArray())
{
// Arrays.asList() interprets an array as a single element, // Arrays.asList() interprets an array as a single element,
// so convert it to a list by hand // so convert it to a list by hand
collection = new ArrayList<Object>(Array.getLength(value)); collection = new ArrayList<Object>(Array.getLength(value));
for (int i = 0; i < Array.getLength(value); i++) { for (int i = 0; i < Array.getLength(value); i++)
{
Object elem = Array.get(value, i); Object elem = Array.get(value, i);
collection.add(elem); collection.add(elem);
} }
} else { }
else
{
collection = (Collection<Object>)value; collection = (Collection<Object>)value;
} }
return collection; return collection;
} }
private static Object peek(Object value) { private static Object peek(Object value)
if (value.getClass().isArray()) { {
if (Array.getLength(value) > 0) { if (value.getClass().isArray())
{
if (Array.getLength(value) > 0)
{
return Array.get(value, 0); return Array.get(value, 0);
} else { }
else
{
return null; return null;
} }
} else { }
else
{
Collection<?> collection = (Collection<?>)value; Collection<?> collection = (Collection<?>)value;
if (collection.size() > 0) { if (collection.size() > 0)
{
return collection.iterator().next(); return collection.iterator().next();
} }
} }

View File

@ -3,17 +3,20 @@ package dev.plex.toml;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
class BooleanValueReaderWriter implements ValueReader, ValueWriter { class BooleanValueReaderWriter implements ValueReader, ValueWriter
{
static final BooleanValueReaderWriter BOOLEAN_VALUE_READER_WRITER = new BooleanValueReaderWriter(); static final BooleanValueReaderWriter BOOLEAN_VALUE_READER_WRITER = new BooleanValueReaderWriter();
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
{
return s.startsWith("true") || s.startsWith("false"); return s.startsWith("true") || s.startsWith("false");
} }
@Override @Override
public Object read(String s, AtomicInteger index, Context context) { public Object read(String s, AtomicInteger index, Context context)
{
s = s.substring(index.get()); s = s.substring(index.get());
Boolean b = s.startsWith("true") ? Boolean.TRUE : Boolean.FALSE; Boolean b = s.startsWith("true") ? Boolean.TRUE : Boolean.FALSE;
@ -25,24 +28,30 @@ class BooleanValueReaderWriter implements ValueReader, ValueWriter {
} }
@Override @Override
public boolean canWrite(Object value) { public boolean canWrite(Object value)
return Boolean.class.isInstance(value); {
return value instanceof Boolean;
} }
@Override @Override
public void write(Object value, WriterContext context) { public void write(Object value, WriterContext context)
{
context.write(value.toString()); context.write(value.toString());
} }
@Override @Override
public boolean isPrimitiveType() { public boolean isPrimitiveType()
{
return true; return true;
} }
private BooleanValueReaderWriter() {} private BooleanValueReaderWriter()
{
}
@Override @Override
public String toString() { public String toString()
{
return "boolean"; return "boolean";
} }
} }

View File

@ -5,62 +5,79 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public abstract class Container { public abstract class Container
{
abstract boolean accepts(String key); abstract boolean accepts(String key);
abstract void put(String key, Object value); abstract void put(String key, Object value);
abstract Object get(String key); abstract Object get(String key);
abstract boolean isImplicit(); abstract boolean isImplicit();
static class Table extends Container { static class Table extends Container
{
private final Map<String, Object> values = new HashMap<String, Object>(); private final Map<String, Object> values = new HashMap<String, Object>();
final String name; final String name;
final boolean implicit; final boolean implicit;
Table() { Table()
{
this(null, false); this(null, false);
} }
public Table(String name) { public Table(String name)
{
this(name, false); this(name, false);
} }
public Table(String tableName, boolean implicit) { public Table(String tableName, boolean implicit)
{
this.name = tableName; this.name = tableName;
this.implicit = implicit; this.implicit = implicit;
} }
@Override @Override
boolean accepts(String key) { boolean accepts(String key)
{
return !values.containsKey(key) || values.get(key) instanceof TableArray; return !values.containsKey(key) || values.get(key) instanceof TableArray;
} }
@Override @Override
void put(String key, Object value) { void put(String key, Object value)
{
values.put(key, value); values.put(key, value);
} }
@Override @Override
Object get(String key) { Object get(String key)
{
return values.get(key); return values.get(key);
} }
boolean isImplicit() { boolean isImplicit()
{
return implicit; return implicit;
} }
/** /**
* This modifies the Table's internal data structure, such that it is no longer usable. * This modifies the Table's internal data structure, such that it is no longer usable.
* * <p>
* Therefore, this method must only be called when all data has been gathered. * Therefore, this method must only be called when all data has been gathered.
*
* @return A Map-and-List-based of the TOML data * @return A Map-and-List-based of the TOML data
*/ */
Map<String, Object> consume() { Map<String, Object> consume()
for (Map.Entry<String, Object> entry : values.entrySet()) { {
if (entry.getValue() instanceof Table) { for (Map.Entry<String, Object> entry : values.entrySet())
{
if (entry.getValue() instanceof Table)
{
entry.setValue(((Table)entry.getValue()).consume()); entry.setValue(((Table)entry.getValue()).consume());
} else if (entry.getValue() instanceof TableArray) { }
else if (entry.getValue() instanceof TableArray)
{
entry.setValue(((TableArray)entry.getValue()).getValues()); entry.setValue(((TableArray)entry.getValue()).getValues());
} }
} }
@ -69,54 +86,67 @@ public abstract class Container {
} }
@Override @Override
public String toString() { public String toString()
{
return values.toString(); return values.toString();
} }
} }
static class TableArray extends Container { static class TableArray extends Container
{
private final List<Table> values = new ArrayList<Table>(); private final List<Table> values = new ArrayList<Table>();
TableArray() { TableArray()
{
values.add(new Table()); values.add(new Table());
} }
@Override @Override
boolean accepts(String key) { boolean accepts(String key)
{
return getCurrent().accepts(key); return getCurrent().accepts(key);
} }
@Override @Override
void put(String key, Object value) { void put(String key, Object value)
{
values.add((Table)value); values.add((Table)value);
} }
@Override @Override
Object get(String key) { Object get(String key)
{
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
boolean isImplicit() { boolean isImplicit()
{
return false; return false;
} }
List<Map<String, Object>> getValues() { List<Map<String, Object>> getValues()
{
ArrayList<Map<String, Object>> unwrappedValues = new ArrayList<Map<String, Object>>(); ArrayList<Map<String, Object>> unwrappedValues = new ArrayList<Map<String, Object>>();
for (Table table : values) { for (Table table : values)
{
unwrappedValues.add(table.consume()); unwrappedValues.add(table.consume());
} }
return unwrappedValues; return unwrappedValues;
} }
Table getCurrent() { Table getCurrent()
{
return values.get(values.size() - 1); return values.get(values.size() - 1);
} }
@Override @Override
public String toString() { public String toString()
{
return values.toString(); return values.toString();
} }
} }
private Container() {} private Container()
{
}
} }

View File

@ -2,18 +2,21 @@ package dev.plex.toml;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
public class Context { public class Context
{
final dev.plex.toml.Identifier identifier; final dev.plex.toml.Identifier identifier;
final AtomicInteger line; final AtomicInteger line;
final Results.Errors errors; final Results.Errors errors;
public Context(dev.plex.toml.Identifier identifier, AtomicInteger line, Results.Errors errors) { public Context(dev.plex.toml.Identifier identifier, AtomicInteger line, Results.Errors errors)
{
this.identifier = identifier; this.identifier = identifier;
this.line = line; this.line = line;
this.errors = errors; this.errors = errors;
} }
public Context with(dev.plex.toml.Identifier identifier) { public Context with(dev.plex.toml.Identifier identifier)
{
return new Context(identifier, line, errors); return new Context(identifier, line, errors);
} }
} }

View File

@ -2,21 +2,25 @@ package dev.plex.toml;
import java.util.TimeZone; import java.util.TimeZone;
public class DatePolicy { public class DatePolicy
{
private final TimeZone timeZone; private final TimeZone timeZone;
private final boolean showFractionalSeconds; private final boolean showFractionalSeconds;
DatePolicy(TimeZone timeZone, boolean showFractionalSeconds) { DatePolicy(TimeZone timeZone, boolean showFractionalSeconds)
{
this.timeZone = timeZone; this.timeZone = timeZone;
this.showFractionalSeconds = showFractionalSeconds; this.showFractionalSeconds = showFractionalSeconds;
} }
TimeZone getTimeZone() { TimeZone getTimeZone()
{
return timeZone; return timeZone;
} }
boolean isShowFractionalSeconds() { boolean isShowFractionalSeconds()
{
return showFractionalSeconds; return showFractionalSeconds;
} }
} }

View File

@ -7,26 +7,34 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
public class DateValueReaderWriter implements ValueReader, ValueWriter { public class DateValueReaderWriter implements ValueReader, ValueWriter
{
static final DateValueReaderWriter DATE_VALUE_READER_WRITER = new DateValueReaderWriter(); static final DateValueReaderWriter DATE_VALUE_READER_WRITER = new DateValueReaderWriter();
static final DateValueReaderWriter DATE_PARSER_JDK_6 = new DateConverterJdk6(); static final DateValueReaderWriter DATE_PARSER_JDK_6 = new DateConverterJdk6();
private static final Pattern DATE_REGEX = Pattern.compile("(\\d{4}-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]:[0-5][0-9]:[0-5][0-9])(\\.\\d*)?(Z|(?:[+\\-]\\d{2}:\\d{2}))(.*)"); private static final Pattern DATE_REGEX = Pattern.compile("(\\d{4}-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]:[0-5][0-9]:[0-5][0-9])(\\.\\d*)?(Z|(?:[+\\-]\\d{2}:\\d{2}))(.*)");
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
if (s.length() < 5) { {
if (s.length() < 5)
{
return false; return false;
} }
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++)
{
char c = s.charAt(i); char c = s.charAt(i);
if (i < 4) { if (i < 4)
if (!Character.isDigit(c)) { {
if (!Character.isDigit(c))
{
return false; return false;
} }
} else if (c != '-') { }
else if (c != '-')
{
return false; return false;
} }
} }
@ -35,14 +43,19 @@ public class DateValueReaderWriter implements ValueReader, ValueWriter {
} }
@Override @Override
public Object read(String original, AtomicInteger index, Context context) { public Object read(String original, AtomicInteger index, Context context)
{
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int i = index.get(); i < original.length(); i = index.incrementAndGet()) { for (int i = index.get(); i < original.length(); i = index.incrementAndGet())
{
char c = original.charAt(i); char c = original.charAt(i);
if (Character.isDigit(c) || c == '-' || c == '+' || c == ':' || c == '.' || c == 'T' || c == 'Z') { if (Character.isDigit(c) || c == '-' || c == '+' || c == ':' || c == '.' || c == 'T' || c == 'Z')
{
sb.append(c); sb.append(c);
} else { }
else
{
index.decrementAndGet(); index.decrementAndGet();
break; break;
} }
@ -51,7 +64,8 @@ public class DateValueReaderWriter implements ValueReader, ValueWriter {
String s = sb.toString(); String s = sb.toString();
Matcher matcher = DATE_REGEX.matcher(s); Matcher matcher = DATE_REGEX.matcher(s);
if (!matcher.matches()) { if (!matcher.matches())
{
Results.Errors errors = new Results.Errors(); Results.Errors errors = new Results.Errors();
errors.invalidValue(context.identifier.getName(), s, context.line.get()); errors.invalidValue(context.identifier.getName(), s, context.line.get());
return errors; return errors;
@ -61,22 +75,29 @@ public class DateValueReaderWriter implements ValueReader, ValueWriter {
String zone = matcher.group(3); String zone = matcher.group(3);
String fractionalSeconds = matcher.group(2); String fractionalSeconds = matcher.group(2);
String format = "yyyy-MM-dd'T'HH:mm:ss"; String format = "yyyy-MM-dd'T'HH:mm:ss";
if (fractionalSeconds != null && !fractionalSeconds.isEmpty()) { if (fractionalSeconds != null && !fractionalSeconds.isEmpty())
{
format += ".SSS"; format += ".SSS";
dateString += fractionalSeconds; dateString += fractionalSeconds;
} }
format += "Z"; format += "Z";
if ("Z".equals(zone)) { if ("Z".equals(zone))
{
dateString += "+0000"; dateString += "+0000";
} else if (zone.contains(":")) { }
else if (zone.contains(":"))
{
dateString += zone.replace(":", ""); dateString += zone.replace(":", "");
} }
try { try
{
SimpleDateFormat dateFormat = new SimpleDateFormat(format); SimpleDateFormat dateFormat = new SimpleDateFormat(format);
dateFormat.setLenient(false); dateFormat.setLenient(false);
return dateFormat.parse(dateString); return dateFormat.parse(dateString);
} catch (Exception e) { }
catch (Exception e)
{
Results.Errors errors = new Results.Errors(); Results.Errors errors = new Results.Errors();
errors.invalidValue(context.identifier.getName(), s, context.line.get()); errors.invalidValue(context.identifier.getName(), s, context.line.get());
return errors; return errors;
@ -84,32 +105,43 @@ public class DateValueReaderWriter implements ValueReader, ValueWriter {
} }
@Override @Override
public boolean canWrite(Object value) { public boolean canWrite(Object value)
{
return value instanceof Date; return value instanceof Date;
} }
@Override @Override
public void write(Object value, WriterContext context) { public void write(Object value, WriterContext context)
{
DateFormat formatter = getFormatter(context.getDatePolicy()); DateFormat formatter = getFormatter(context.getDatePolicy());
context.write(formatter.format(value)); context.write(formatter.format(value));
} }
@Override @Override
public boolean isPrimitiveType() { public boolean isPrimitiveType()
{
return true; return true;
} }
private DateFormat getFormatter(DatePolicy datePolicy) { private DateFormat getFormatter(DatePolicy datePolicy)
{
boolean utc = "UTC".equals(datePolicy.getTimeZone().getID()); boolean utc = "UTC".equals(datePolicy.getTimeZone().getID());
String format; String format;
if (utc && datePolicy.isShowFractionalSeconds()) { if (utc && datePolicy.isShowFractionalSeconds())
{
format = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; format = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
} else if (utc) { }
else if (utc)
{
format = "yyyy-MM-dd'T'HH:mm:ss'Z'"; format = "yyyy-MM-dd'T'HH:mm:ss'Z'";
} else if (datePolicy.isShowFractionalSeconds()) { }
else if (datePolicy.isShowFractionalSeconds())
{
format = getTimeZoneAndFractionalSecondsFormat(); format = getTimeZoneAndFractionalSecondsFormat();
} else { }
else
{
format = getTimeZoneFormat(); format = getTimeZoneFormat();
} }
SimpleDateFormat formatter = new SimpleDateFormat(format); SimpleDateFormat formatter = new SimpleDateFormat(format);
@ -118,43 +150,55 @@ public class DateValueReaderWriter implements ValueReader, ValueWriter {
return formatter; return formatter;
} }
String getTimeZoneFormat() { String getTimeZoneFormat()
{
return "yyyy-MM-dd'T'HH:mm:ssXXX"; return "yyyy-MM-dd'T'HH:mm:ssXXX";
} }
String getTimeZoneAndFractionalSecondsFormat() { String getTimeZoneAndFractionalSecondsFormat()
{
return "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"; return "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
} }
private DateValueReaderWriter() {} private DateValueReaderWriter()
{
}
private static class DateConverterJdk6 extends DateValueReaderWriter { private static class DateConverterJdk6 extends DateValueReaderWriter
{
@Override @Override
public void write(Object value, WriterContext context) { public void write(Object value, WriterContext context)
{
DateFormat formatter = super.getFormatter(context.getDatePolicy()); DateFormat formatter = super.getFormatter(context.getDatePolicy());
String date = formatter.format(value); String date = formatter.format(value);
if ("UTC".equals(context.getDatePolicy().getTimeZone().getID())) { if ("UTC".equals(context.getDatePolicy().getTimeZone().getID()))
{
context.write(date); context.write(date);
} else { }
else
{
int insertionIndex = date.length() - 2; int insertionIndex = date.length() - 2;
context.write(date.substring(0, insertionIndex)).write(':').write(date.substring(insertionIndex)); context.write(date.substring(0, insertionIndex)).write(':').write(date.substring(insertionIndex));
} }
} }
@Override @Override
String getTimeZoneAndFractionalSecondsFormat() { String getTimeZoneAndFractionalSecondsFormat()
{
return "yyyy-MM-dd'T'HH:mm:ss.SSSZ"; return "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
} }
@Override @Override
String getTimeZoneFormat() { String getTimeZoneFormat()
{
return "yyyy-MM-dd'T'HH:mm:ssZ"; return "yyyy-MM-dd'T'HH:mm:ssZ";
} }
} }
@Override @Override
public String toString() { public String toString()
{
return "datetime"; return "datetime";
} }
} }

View File

@ -19,11 +19,13 @@ public class Identifier
{ {
type = Type.TABLE_ARRAY; type = Type.TABLE_ARRAY;
valid = isValidTableArray(name, context); valid = isValidTableArray(name, context);
} else if (name.startsWith("[")) }
else if (name.startsWith("["))
{ {
type = Type.TABLE; type = Type.TABLE;
valid = isValidTable(name, context); valid = isValidTable(name, context);
} else }
else
{ {
type = Type.KEY; type = Type.KEY;
valid = isValidKey(name, context); valid = isValidKey(name, context);
@ -78,9 +80,9 @@ public class Identifier
return type == Type.TABLE_ARRAY; return type == Type.TABLE_ARRAY;
} }
private static enum Type private enum Type
{ {
KEY, TABLE, TABLE_ARRAY; KEY, TABLE, TABLE_ARRAY
} }
private static String extractName(String raw) private static String extractName(String raw)
@ -95,7 +97,8 @@ public class Identifier
{ {
quoted = !quoted; quoted = !quoted;
sb.append('"'); sb.append('"');
} else if (quoted || !Character.isWhitespace(c)) }
else if (quoted || !Character.isWhitespace(c))
{ {
sb.append(c); sb.append(c);
} }
@ -125,7 +128,8 @@ public class Identifier
return false; return false;
} }
quoted = !quoted; quoted = !quoted;
} else if (!quoted && (ALLOWED_CHARS.indexOf(c) == -1)) }
else if (!quoted && (ALLOWED_CHARS.indexOf(c) == -1))
{ {
context.errors.invalidKey(name, context.line.get()); context.errors.invalidKey(name, context.line.get());
return false; return false;
@ -137,12 +141,7 @@ public class Identifier
private static boolean isValidTable(String name, Context context) private static boolean isValidTable(String name, Context context)
{ {
boolean valid = true; boolean valid = name.endsWith("]");
if (!name.endsWith("]"))
{
valid = false;
}
String trimmed = name.substring(1, name.length() - 1).trim(); String trimmed = name.substring(1, name.length() - 1).trim();
if (trimmed.isEmpty() || trimmed.charAt(0) == '.' || trimmed.endsWith(".")) if (trimmed.isEmpty() || trimmed.charAt(0) == '.' || trimmed.endsWith("."))
@ -175,32 +174,38 @@ public class Identifier
if (!quoteAllowed) if (!quoteAllowed)
{ {
valid = false; valid = false;
} else if (quoted && trimmed.charAt(i - 1) != '\\') }
else if (quoted && trimmed.charAt(i - 1) != '\\')
{ {
charAllowed = false; charAllowed = false;
dotAllowed = true; dotAllowed = true;
quoteAllowed = false; quoteAllowed = false;
} else if (!quoted) }
else if (!quoted)
{ {
quoted = true; quoted = true;
quoteAllowed = true; quoteAllowed = true;
} }
} else if (quoted) }
else if (quoted)
{ {
continue; continue;
} else if (c == '.') }
else if (c == '.')
{ {
if (dotAllowed) if (dotAllowed)
{ {
charAllowed = true; charAllowed = true;
dotAllowed = false; dotAllowed = false;
quoteAllowed = true; quoteAllowed = true;
} else }
else
{ {
context.errors.emptyImplicitTable(name, context.line.get()); context.errors.emptyImplicitTable(name, context.line.get());
return false; return false;
} }
} else if (Character.isWhitespace(c)) }
else if (Character.isWhitespace(c))
{ {
char prev = trimmed.charAt(i - 1); char prev = trimmed.charAt(i - 1);
if (!Character.isWhitespace(prev) && prev != '.') if (!Character.isWhitespace(prev) && prev != '.')
@ -209,14 +214,16 @@ public class Identifier
dotAllowed = true; dotAllowed = true;
quoteAllowed = true; quoteAllowed = true;
} }
} else }
else
{ {
if (charAllowed && ALLOWED_CHARS.indexOf(c) > -1) if (charAllowed && ALLOWED_CHARS.indexOf(c) > -1)
{ {
charAllowed = true; charAllowed = true;
dotAllowed = true; dotAllowed = true;
quoteAllowed = false; quoteAllowed = false;
} else }
else
{ {
valid = false; valid = false;
} }
@ -234,12 +241,7 @@ public class Identifier
private static boolean isValidTableArray(String line, Context context) private static boolean isValidTableArray(String line, Context context)
{ {
boolean valid = true; boolean valid = line.endsWith("]]");
if (!line.endsWith("]]"))
{
valid = false;
}
String trimmed = line.substring(2, line.length() - 2).trim(); String trimmed = line.substring(2, line.length() - 2).trim();
if (trimmed.isEmpty() || trimmed.charAt(0) == '.' || trimmed.endsWith(".")) if (trimmed.isEmpty() || trimmed.charAt(0) == '.' || trimmed.endsWith("."))
@ -272,32 +274,38 @@ public class Identifier
if (!quoteAllowed) if (!quoteAllowed)
{ {
valid = false; valid = false;
} else if (quoted && trimmed.charAt(i - 1) != '\\') }
else if (quoted && trimmed.charAt(i - 1) != '\\')
{ {
charAllowed = false; charAllowed = false;
dotAllowed = true; dotAllowed = true;
quoteAllowed = false; quoteAllowed = false;
} else if (!quoted) }
else if (!quoted)
{ {
quoted = true; quoted = true;
quoteAllowed = true; quoteAllowed = true;
} }
} else if (quoted) }
else if (quoted)
{ {
continue; continue;
} else if (c == '.') }
else if (c == '.')
{ {
if (dotAllowed) if (dotAllowed)
{ {
charAllowed = true; charAllowed = true;
dotAllowed = false; dotAllowed = false;
quoteAllowed = true; quoteAllowed = true;
} else }
else
{ {
context.errors.emptyImplicitTable(line, context.line.get()); context.errors.emptyImplicitTable(line, context.line.get());
return false; return false;
} }
} else if (Character.isWhitespace(c)) }
else if (Character.isWhitespace(c))
{ {
char prev = trimmed.charAt(i - 1); char prev = trimmed.charAt(i - 1);
if (!Character.isWhitespace(prev) && prev != '.' && prev != '"') if (!Character.isWhitespace(prev) && prev != '.' && prev != '"')
@ -306,14 +314,16 @@ public class Identifier
dotAllowed = true; dotAllowed = true;
quoteAllowed = true; quoteAllowed = true;
} }
} else }
else
{ {
if (charAllowed && ALLOWED_CHARS.indexOf(c) > -1) if (charAllowed && ALLOWED_CHARS.indexOf(c) > -1)
{ {
charAllowed = true; charAllowed = true;
dotAllowed = true; dotAllowed = true;
quoteAllowed = false; quoteAllowed = false;
} else }
else
{ {
valid = false; valid = false;
} }

View File

@ -2,11 +2,13 @@ package dev.plex.toml;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
public class IdentifierConverter { public class IdentifierConverter
{
static final IdentifierConverter IDENTIFIER_CONVERTER = new IdentifierConverter(); static final IdentifierConverter IDENTIFIER_CONVERTER = new IdentifierConverter();
Identifier convert(String s, AtomicInteger index, Context context) { Identifier convert(String s, AtomicInteger index, Context context)
{
boolean quoted = false; boolean quoted = false;
StringBuilder name = new StringBuilder(); StringBuilder name = new StringBuilder();
boolean terminated = false; boolean terminated = false;
@ -14,41 +16,63 @@ public class IdentifierConverter {
boolean isTableArray = !isKey && s.length() > index.get() + 1 && s.charAt(index.get() + 1) == '['; boolean isTableArray = !isKey && s.length() > index.get() + 1 && s.charAt(index.get() + 1) == '[';
boolean inComment = false; boolean inComment = false;
for (int i = index.get(); i < s.length(); i = index.incrementAndGet()) { for (int i = index.get(); i < s.length(); i = index.incrementAndGet())
{
char c = s.charAt(i); char c = s.charAt(i);
if (Keys.isQuote(c) && (i == 0 || s.charAt(i - 1) != '\\')) { if (Keys.isQuote(c) && (i == 0 || s.charAt(i - 1) != '\\'))
{
quoted = !quoted; quoted = !quoted;
name.append(c); name.append(c);
} else if (c == '\n') { }
else if (c == '\n')
{
index.decrementAndGet(); index.decrementAndGet();
break; break;
} else if (quoted) { }
else if (quoted)
{
name.append(c); name.append(c);
} else if (c == '=' && isKey) { }
else if (c == '=' && isKey)
{
terminated = true; terminated = true;
break; break;
} else if (c == ']' && !isKey) { }
if (!isTableArray || s.length() > index.get() + 1 && s.charAt(index.get() + 1) == ']') { else if (c == ']' && !isKey)
{
if (!isTableArray || s.length() > index.get() + 1 && s.charAt(index.get() + 1) == ']')
{
terminated = true; terminated = true;
name.append(']'); name.append(']');
if (isTableArray) { if (isTableArray)
{
name.append(']'); name.append(']');
} }
} }
} else if (terminated && c == '#') { }
else if (terminated && c == '#')
{
inComment = true; inComment = true;
} else if (terminated && !Character.isWhitespace(c) && !inComment) { }
else if (terminated && !Character.isWhitespace(c) && !inComment)
{
terminated = false; terminated = false;
break; break;
} else if (!terminated) { }
else if (!terminated)
{
name.append(c); name.append(c);
} }
} }
if (!terminated) { if (!terminated)
if (isKey) { {
if (isKey)
{
context.errors.unterminatedKey(name.toString(), context.line.get()); context.errors.unterminatedKey(name.toString(), context.line.get());
} else { }
else
{
context.errors.invalidKey(name.toString(), context.line.get()); context.errors.invalidKey(name.toString(), context.line.get());
} }
@ -58,5 +82,7 @@ public class IdentifierConverter {
return Identifier.from(name.toString(), context); return Identifier.from(name.toString(), context);
} }
private IdentifierConverter() {} private IdentifierConverter()
{
}
} }

View File

@ -2,29 +2,34 @@ package dev.plex.toml;
/** /**
* Controls how a {@link TomlWriter} indents tables and key/value pairs. * Controls how a {@link TomlWriter} indents tables and key/value pairs.
* * <p>
* The default policy is to not indent. * The default policy is to not indent.
*/ */
public class IndentationPolicy { public class IndentationPolicy
{
private final int tableIndent; private final int tableIndent;
private final int keyValueIndent; private final int keyValueIndent;
private final int arrayDelimiterPadding; private final int arrayDelimiterPadding;
IndentationPolicy(int keyIndentation, int tableIndentation, int arrayDelimiterPadding) { IndentationPolicy(int keyIndentation, int tableIndentation, int arrayDelimiterPadding)
{
this.keyValueIndent = keyIndentation; this.keyValueIndent = keyIndentation;
this.tableIndent = tableIndentation; this.tableIndent = tableIndentation;
this.arrayDelimiterPadding = arrayDelimiterPadding; this.arrayDelimiterPadding = arrayDelimiterPadding;
} }
int getTableIndent() { int getTableIndent()
{
return tableIndent; return tableIndent;
} }
int getKeyValueIndent() { int getKeyValueIndent()
{
return keyValueIndent; return keyValueIndent;
} }
int getArrayDelimiterPadding() { int getArrayDelimiterPadding()
{
return arrayDelimiterPadding; return arrayDelimiterPadding;
} }
} }

View File

@ -9,12 +9,14 @@ class InlineTableValueReader implements dev.plex.toml.ValueReader
static final InlineTableValueReader INLINE_TABLE_VALUE_READER = new InlineTableValueReader(); static final InlineTableValueReader INLINE_TABLE_VALUE_READER = new InlineTableValueReader();
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
{
return s.startsWith("{"); return s.startsWith("{");
} }
@Override @Override
public Object read(String s, AtomicInteger sharedIndex, dev.plex.toml.Context context) { public Object read(String s, AtomicInteger sharedIndex, dev.plex.toml.Context context)
{
AtomicInteger line = context.line; AtomicInteger line = context.line;
int startLine = line.get(); int startLine = line.get();
int startIndex = sharedIndex.get(); int startIndex = sharedIndex.get();
@ -25,13 +27,16 @@ class InlineTableValueReader implements dev.plex.toml.ValueReader
HashMap<String, Object> results = new HashMap<String, Object>(); HashMap<String, Object> results = new HashMap<String, Object>();
dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors(); dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors();
for (int i = sharedIndex.incrementAndGet(); sharedIndex.get() < s.length(); i = sharedIndex.incrementAndGet()) { for (int i = sharedIndex.incrementAndGet(); sharedIndex.get() < s.length(); i = sharedIndex.incrementAndGet())
{
char c = s.charAt(i); char c = s.charAt(i);
if (inValue && !Character.isWhitespace(c)) { if (inValue && !Character.isWhitespace(c))
{
Object converted = dev.plex.toml.ValueReaders.VALUE_READERS.convert(s, sharedIndex, context.with(dev.plex.toml.Identifier.from(currentKey.toString(), context))); Object converted = dev.plex.toml.ValueReaders.VALUE_READERS.convert(s, sharedIndex, context.with(dev.plex.toml.Identifier.from(currentKey.toString(), context)));
if (converted instanceof dev.plex.toml.Results.Errors) { if (converted instanceof dev.plex.toml.Results.Errors)
{
errors.add((dev.plex.toml.Results.Errors)converted); errors.add((dev.plex.toml.Results.Errors)converted);
return errors; return errors;
} }
@ -39,38 +44,51 @@ class InlineTableValueReader implements dev.plex.toml.ValueReader
String currentKeyTrimmed = currentKey.toString().trim(); String currentKeyTrimmed = currentKey.toString().trim();
Object previous = results.put(currentKeyTrimmed, converted); Object previous = results.put(currentKeyTrimmed, converted);
if (previous != null) { if (previous != null)
{
errors.duplicateKey(currentKeyTrimmed, context.line.get()); errors.duplicateKey(currentKeyTrimmed, context.line.get());
return errors; return errors;
} }
currentKey = new StringBuilder(); currentKey = new StringBuilder();
inValue = false; inValue = false;
} else if (c == ',') { }
else if (c == ',')
{
inKey = true; inKey = true;
inValue = false; inValue = false;
currentKey = new StringBuilder(); currentKey = new StringBuilder();
} else if (c == '=') { }
else if (c == '=')
{
inKey = false; inKey = false;
inValue = true; inValue = true;
} else if (c == '}') { }
else if (c == '}')
{
terminated = true; terminated = true;
break; break;
} else if (inKey) { }
else if (inKey)
{
currentKey.append(c); currentKey.append(c);
} }
} }
if (!terminated) { if (!terminated)
{
errors.unterminated(context.identifier.getName(), s.substring(startIndex), startLine); errors.unterminated(context.identifier.getName(), s.substring(startIndex), startLine);
} }
if (errors.hasErrors()) { if (errors.hasErrors())
{
return errors; return errors;
} }
return results; return results;
} }
private InlineTableValueReader() {} private InlineTableValueReader()
{
}
} }

View File

@ -3,25 +3,32 @@ package dev.plex.toml;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
class Keys { class Keys
{
static class Key { static class Key
{
final String name; final String name;
final int index; final int index;
final String path; final String path;
Key(String name, int index, Key next) { Key(String name, int index, Key next)
{
this.name = name; this.name = name;
this.index = index; this.index = index;
if (next != null) { if (next != null)
{
this.path = name + "." + next.path; this.path = name + "." + next.path;
} else { }
else
{
this.path = name; this.path = name;
} }
} }
} }
static Key[] split(String key) { static Key[] split(String key)
{
List<Key> splitKey = new ArrayList<Key>(); List<Key> splitKey = new ArrayList<Key>();
StringBuilder current = new StringBuilder(); StringBuilder current = new StringBuilder();
boolean quoted = false; boolean quoted = false;
@ -29,26 +36,33 @@ class Keys {
boolean inIndex = false; boolean inIndex = false;
int index = -1; int index = -1;
for (int i = key.length() - 1; i > -1; i--) { for (int i = key.length() - 1; i > -1; i--)
{
char c = key.charAt(i); char c = key.charAt(i);
if (c == ']' && indexable) { if (c == ']' && indexable)
{
inIndex = true; inIndex = true;
continue; continue;
} }
indexable = false; indexable = false;
if (c == '[' && inIndex) { if (c == '[' && inIndex)
{
inIndex = false; inIndex = false;
index = Integer.parseInt(current.toString()); index = Integer.parseInt(current.toString());
current = new StringBuilder(); current = new StringBuilder();
continue; continue;
} }
if (isQuote(c) && (i == 0 || key.charAt(i - 1) != '\\')) { if (isQuote(c) && (i == 0 || key.charAt(i - 1) != '\\'))
{
quoted = !quoted; quoted = !quoted;
indexable = false; indexable = false;
} }
if (c != '.' || quoted) { if (c != '.' || quoted)
{
current.insert(0, c); current.insert(0, c);
} else { }
else
{
splitKey.add(0, new Key(current.toString(), index, !splitKey.isEmpty() ? splitKey.get(0) : null)); splitKey.add(0, new Key(current.toString(), index, !splitKey.isEmpty() ? splitKey.get(0) : null));
indexable = true; indexable = true;
index = -1; index = -1;
@ -61,9 +75,12 @@ class Keys {
return splitKey.toArray(new Key[0]); return splitKey.toArray(new Key[0]);
} }
static boolean isQuote(char c) { static boolean isQuote(char c)
{
return c == '"' || c == '\''; return c == '"' || c == '\'';
} }
private Keys() {} private Keys()
{
}
} }

View File

@ -5,6 +5,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public class LiteralStringValueReader implements ValueReader public class LiteralStringValueReader implements ValueReader
{ {
public static final LiteralStringValueReader LITERAL_STRING_VALUE_READER = new LiteralStringValueReader(); public static final LiteralStringValueReader LITERAL_STRING_VALUE_READER = new LiteralStringValueReader();
@Override @Override
public boolean canRead(String s) public boolean canRead(String s)
{ {

View File

@ -46,7 +46,8 @@ class MapValueWriter implements dev.plex.toml.ValueWriter
{ {
context.writeKey(); context.writeKey();
} }
} else }
else
{ {
context.writeKey(); context.writeKey();
} }
@ -70,8 +71,14 @@ class MapValueWriter implements dev.plex.toml.ValueWriter
{ {
if (context.key != null) if (context.key != null)
{ {
if (key.toString().equalsIgnoreCase(context.key)) continue; if (key.toString().equalsIgnoreCase(context.key))
if (toml.contains(context.key + "." + key)) continue; {
continue;
}
if (toml.contains(context.key + "." + key))
{
continue;
}
} }
} }
@ -82,7 +89,8 @@ class MapValueWriter implements dev.plex.toml.ValueWriter
context.write(quoteKey(key)).write(" = "); context.write(quoteKey(key)).write(" = ");
valueWriter.write(fromValue, context); valueWriter.write(fromValue, context);
context.write('\n'); context.write('\n');
} else if (valueWriter == dev.plex.toml.PrimitiveArrayValueWriter.PRIMITIVE_ARRAY_VALUE_WRITER) }
else if (valueWriter == dev.plex.toml.PrimitiveArrayValueWriter.PRIMITIVE_ARRAY_VALUE_WRITER)
{ {
context.indent(); context.indent();
context.setArrayKey(key.toString()); context.setArrayKey(key.toString());
@ -105,8 +113,14 @@ class MapValueWriter implements dev.plex.toml.ValueWriter
{ {
if (context.key != null) if (context.key != null)
{ {
if (key.toString().equalsIgnoreCase(context.key)) continue; if (key.toString().equalsIgnoreCase(context.key))
if (toml.contains(context.key + "." + key)) continue; {
continue;
}
if (toml.contains(context.key + "." + key))
{
continue;
}
} }
} }

View File

@ -8,38 +8,45 @@ class MultilineLiteralStringValueReader implements ValueReader
static final MultilineLiteralStringValueReader MULTILINE_LITERAL_STRING_VALUE_READER = new MultilineLiteralStringValueReader(); static final MultilineLiteralStringValueReader MULTILINE_LITERAL_STRING_VALUE_READER = new MultilineLiteralStringValueReader();
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
{
return s.startsWith("'''"); return s.startsWith("'''");
} }
@Override @Override
public Object read(String s, AtomicInteger index, Context context) { public Object read(String s, AtomicInteger index, Context context)
{
AtomicInteger line = context.line; AtomicInteger line = context.line;
int startLine = line.get(); int startLine = line.get();
int originalStartIndex = index.get(); int originalStartIndex = index.get();
int startIndex = index.addAndGet(3); int startIndex = index.addAndGet(3);
int endIndex = -1; int endIndex = -1;
if (s.charAt(startIndex) == '\n') { if (s.charAt(startIndex) == '\n')
{
startIndex = index.incrementAndGet(); startIndex = index.incrementAndGet();
line.incrementAndGet(); line.incrementAndGet();
} }
for (int i = startIndex; i < s.length(); i = index.incrementAndGet()) { for (int i = startIndex; i < s.length(); i = index.incrementAndGet())
{
char c = s.charAt(i); char c = s.charAt(i);
if (c == '\n') { if (c == '\n')
{
line.incrementAndGet(); line.incrementAndGet();
} }
if (c == '\'' && s.length() > i + 2 && s.charAt(i + 1) == '\'' && s.charAt(i + 2) == '\'') { if (c == '\'' && s.length() > i + 2 && s.charAt(i + 1) == '\'' && s.charAt(i + 2) == '\'')
{
endIndex = i; endIndex = i;
index.addAndGet(2); index.addAndGet(2);
break; break;
} }
} }
if (endIndex == -1) { if (endIndex == -1)
{
Results.Errors errors = new Results.Errors(); Results.Errors errors = new Results.Errors();
errors.unterminated(context.identifier.getName(), s.substring(originalStartIndex), startLine); errors.unterminated(context.identifier.getName(), s.substring(originalStartIndex), startLine);
return errors; return errors;
@ -48,5 +55,7 @@ class MultilineLiteralStringValueReader implements ValueReader
return s.substring(startIndex, endIndex); return s.substring(startIndex, endIndex);
} }
private MultilineLiteralStringValueReader() {} private MultilineLiteralStringValueReader()
{
}
} }

View File

@ -8,36 +8,44 @@ class MultilineStringValueReader implements ValueReader
static final MultilineStringValueReader MULTILINE_STRING_VALUE_READER = new MultilineStringValueReader(); static final MultilineStringValueReader MULTILINE_STRING_VALUE_READER = new MultilineStringValueReader();
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
{
return s.startsWith("\"\"\""); return s.startsWith("\"\"\"");
} }
@Override @Override
public Object read(String s, AtomicInteger index, dev.plex.toml.Context context) { public Object read(String s, AtomicInteger index, dev.plex.toml.Context context)
{
AtomicInteger line = context.line; AtomicInteger line = context.line;
int startLine = line.get(); int startLine = line.get();
int originalStartIndex = index.get(); int originalStartIndex = index.get();
int startIndex = index.addAndGet(3); int startIndex = index.addAndGet(3);
int endIndex = -1; int endIndex = -1;
if (s.charAt(startIndex) == '\n') { if (s.charAt(startIndex) == '\n')
{
startIndex = index.incrementAndGet(); startIndex = index.incrementAndGet();
line.incrementAndGet(); line.incrementAndGet();
} }
for (int i = startIndex; i < s.length(); i = index.incrementAndGet()) { for (int i = startIndex; i < s.length(); i = index.incrementAndGet())
{
char c = s.charAt(i); char c = s.charAt(i);
if (c == '\n') { if (c == '\n')
{
line.incrementAndGet(); line.incrementAndGet();
} else if (c == '"' && s.length() > i + 2 && s.charAt(i + 1) == '"' && s.charAt(i + 2) == '"') { }
else if (c == '"' && s.length() > i + 2 && s.charAt(i + 1) == '"' && s.charAt(i + 2) == '"')
{
endIndex = i; endIndex = i;
index.addAndGet(2); index.addAndGet(2);
break; break;
} }
} }
if (endIndex == -1) { if (endIndex == -1)
{
dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors(); dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors();
errors.unterminated(context.identifier.getName(), s.substring(originalStartIndex), startLine); errors.unterminated(context.identifier.getName(), s.substring(originalStartIndex), startLine);
return errors; return errors;
@ -51,7 +59,8 @@ class MultilineStringValueReader implements ValueReader
return s; return s;
} }
private MultilineStringValueReader() { private MultilineStringValueReader()
{
} }
} }

View File

@ -7,14 +7,16 @@ class NumberValueReaderWriter implements dev.plex.toml.ValueReader, dev.plex.tom
static final NumberValueReaderWriter NUMBER_VALUE_READER_WRITER = new NumberValueReaderWriter(); static final NumberValueReaderWriter NUMBER_VALUE_READER_WRITER = new NumberValueReaderWriter();
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
{
char firstChar = s.charAt(0); char firstChar = s.charAt(0);
return firstChar == '+' || firstChar == '-' || Character.isDigit(firstChar); return firstChar == '+' || firstChar == '-' || Character.isDigit(firstChar);
} }
@Override @Override
public Object read(String s, AtomicInteger index, dev.plex.toml.Context context) { public Object read(String s, AtomicInteger index, dev.plex.toml.Context context)
{
boolean signable = true; boolean signable = true;
boolean dottable = false; boolean dottable = false;
boolean exponentable = false; boolean exponentable = false;
@ -23,34 +25,44 @@ class NumberValueReaderWriter implements dev.plex.toml.ValueReader, dev.plex.tom
String type = ""; String type = "";
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (int i = index.get(); i < s.length(); i = index.incrementAndGet()) { for (int i = index.get(); i < s.length(); i = index.incrementAndGet())
{
char c = s.charAt(i); char c = s.charAt(i);
boolean notLastChar = s.length() > i + 1; boolean notLastChar = s.length() > i + 1;
if (Character.isDigit(c)) { if (Character.isDigit(c))
{
sb.append(c); sb.append(c);
signable = false; signable = false;
terminatable = true; terminatable = true;
if (type.isEmpty()) { if (type.isEmpty())
{
type = "integer"; type = "integer";
dottable = true; dottable = true;
} }
underscorable = notLastChar; underscorable = notLastChar;
exponentable = !type.equals("exponent"); exponentable = !type.equals("exponent");
} else if ((c == '+' || c == '-') && signable && notLastChar) { }
else if ((c == '+' || c == '-') && signable && notLastChar)
{
signable = false; signable = false;
terminatable = false; terminatable = false;
if (c == '-') { if (c == '-')
{
sb.append('-'); sb.append('-');
} }
} else if (c == '.' && dottable && notLastChar) { }
else if (c == '.' && dottable && notLastChar)
{
sb.append('.'); sb.append('.');
type = "float"; type = "float";
terminatable = false; terminatable = false;
dottable = false; dottable = false;
exponentable = false; exponentable = false;
underscorable = false; underscorable = false;
} else if ((c == 'E' || c == 'e') && exponentable && notLastChar) { }
else if ((c == 'E' || c == 'e') && exponentable && notLastChar)
{
sb.append('E'); sb.append('E');
type = "exponent"; type = "exponent";
terminatable = false; terminatable = false;
@ -58,10 +70,15 @@ class NumberValueReaderWriter implements dev.plex.toml.ValueReader, dev.plex.tom
dottable = false; dottable = false;
exponentable = false; exponentable = false;
underscorable = false; underscorable = false;
} else if (c == '_' && underscorable && notLastChar && Character.isDigit(s.charAt(i + 1))) { }
else if (c == '_' && underscorable && notLastChar && Character.isDigit(s.charAt(i + 1)))
{
underscorable = false; underscorable = false;
} else { }
if (!terminatable) { else
{
if (!terminatable)
{
type = ""; type = "";
} }
index.decrementAndGet(); index.decrementAndGet();
@ -69,15 +86,22 @@ class NumberValueReaderWriter implements dev.plex.toml.ValueReader, dev.plex.tom
} }
} }
if (type.equals("integer")) { if (type.equals("integer"))
{
return Long.valueOf(sb.toString()); return Long.valueOf(sb.toString());
} else if (type.equals("float")) { }
else if (type.equals("float"))
{
return Double.valueOf(sb.toString()); return Double.valueOf(sb.toString());
} else if (type.equals("exponent")) { }
else if (type.equals("exponent"))
{
String[] exponentString = sb.toString().split("E"); String[] exponentString = sb.toString().split("E");
return Double.parseDouble(exponentString[0]) * Math.pow(10, Double.parseDouble(exponentString[1])); return Double.parseDouble(exponentString[0]) * Math.pow(10, Double.parseDouble(exponentString[1]));
} else { }
else
{
dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors(); dev.plex.toml.Results.Errors errors = new dev.plex.toml.Results.Errors();
errors.invalidValue(context.identifier.getName(), sb.toString(), context.line.get()); errors.invalidValue(context.identifier.getName(), sb.toString(), context.line.get());
return errors; return errors;
@ -85,22 +109,26 @@ class NumberValueReaderWriter implements dev.plex.toml.ValueReader, dev.plex.tom
} }
@Override @Override
public boolean canWrite(Object value) { public boolean canWrite(Object value)
return Number.class.isInstance(value); {
return value instanceof Number;
} }
@Override @Override
public void write(Object value, dev.plex.toml.WriterContext context) { public void write(Object value, dev.plex.toml.WriterContext context)
{
context.write(value.toString()); context.write(value.toString());
} }
@Override @Override
public boolean isPrimitiveType() { public boolean isPrimitiveType()
{
return true; return true;
} }
@Override @Override
public String toString() { public String toString()
{
return "number"; return "number";
} }
} }

View File

@ -1,10 +1,14 @@
package dev.plex.toml; package dev.plex.toml;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.*; import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
class ObjectValueWriter implements ValueWriter class ObjectValueWriter implements ValueWriter
{ {
@ -26,7 +30,9 @@ class ObjectValueWriter implements ValueWriter
if (field.isAnnotationPresent(SerializedName.class)) if (field.isAnnotationPresent(SerializedName.class))
{ {
to.put(field.getDeclaredAnnotation(SerializedName.class).value(), getFieldValue(field, value)); to.put(field.getDeclaredAnnotation(SerializedName.class).value(), getFieldValue(field, value));
} else { }
else
{
to.put(field.getName(), getFieldValue(field, value)); to.put(field.getName(), getFieldValue(field, value));
} }
} }
@ -74,7 +80,8 @@ class ObjectValueWriter implements ValueWriter
try try
{ {
value = field.get(o); value = field.get(o);
} catch (IllegalAccessException ignored) }
catch (IllegalAccessException ignored)
{ {
} }
field.setAccessible(isAccessible); field.setAccessible(isAccessible);

View File

@ -7,12 +7,14 @@ class PrimitiveArrayValueWriter extends ArrayValueWriter
static final ValueWriter PRIMITIVE_ARRAY_VALUE_WRITER = new PrimitiveArrayValueWriter(); static final ValueWriter PRIMITIVE_ARRAY_VALUE_WRITER = new PrimitiveArrayValueWriter();
@Override @Override
public boolean canWrite(Object value) { public boolean canWrite(Object value)
{
return isArrayish(value) && isArrayOfPrimitive(value); return isArrayish(value) && isArrayOfPrimitive(value);
} }
@Override @Override
public void write(Object o, WriterContext context) { public void write(Object o, WriterContext context)
{
Collection<?> values = normalize(o); Collection<?> values = normalize(o);
context.write('['); context.write('[');
@ -21,13 +23,18 @@ class PrimitiveArrayValueWriter extends ArrayValueWriter
boolean first = true; boolean first = true;
ValueWriter firstWriter = null; ValueWriter firstWriter = null;
for (Object value : values) { for (Object value : values)
if (first) { {
if (first)
{
firstWriter = ValueWriters.WRITERS.findWriterFor(value); firstWriter = ValueWriters.WRITERS.findWriterFor(value);
first = false; first = false;
} else { }
else
{
ValueWriter writer = ValueWriters.WRITERS.findWriterFor(value); ValueWriter writer = ValueWriters.WRITERS.findWriterFor(value);
if (writer != firstWriter) { if (writer != firstWriter)
{
throw new IllegalStateException( throw new IllegalStateException(
context.getContextPath() + context.getContextPath() +
": cannot write a heterogeneous array; first element was of type " + firstWriter + ": cannot write a heterogeneous array; first element was of type " + firstWriter +
@ -44,10 +51,13 @@ class PrimitiveArrayValueWriter extends ArrayValueWriter
context.write(']'); context.write(']');
} }
private PrimitiveArrayValueWriter() {} private PrimitiveArrayValueWriter()
{
}
@Override @Override
public String toString() { public String toString()
{
return "primitive-array"; return "primitive-array";
} }
} }

View File

@ -1,15 +1,23 @@
package dev.plex.toml; package dev.plex.toml;
import java.util.*; import java.util.ArrayDeque;
import java.util.Deque;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
class Results { class Results
{
static class Errors { static class Errors
{
private final StringBuilder sb = new StringBuilder(); private final StringBuilder sb = new StringBuilder();
void duplicateTable(String table, int line) { void duplicateTable(String table, int line)
{
sb.append("Duplicate table definition on line ") sb.append("Duplicate table definition on line ")
.append(line) .append(line)
.append(": [") .append(": [")
@ -17,7 +25,8 @@ class Results {
.append("]"); .append("]");
} }
public void tableDuplicatesKey(String table, AtomicInteger line) { public void tableDuplicatesKey(String table, AtomicInteger line)
{
sb.append("Key already exists for table defined on line ") sb.append("Key already exists for table defined on line ")
.append(line.get()) .append(line.get())
.append(": [") .append(": [")
@ -25,19 +34,22 @@ class Results {
.append("]"); .append("]");
} }
public void keyDuplicatesTable(String key, AtomicInteger line) { public void keyDuplicatesTable(String key, AtomicInteger line)
{
sb.append("Table already exists for key defined on line ") sb.append("Table already exists for key defined on line ")
.append(line.get()) .append(line.get())
.append(": ") .append(": ")
.append(key); .append(key);
} }
void emptyImplicitTable(String table, int line) { void emptyImplicitTable(String table, int line)
{
sb.append("Invalid table definition due to empty implicit table name: ") sb.append("Invalid table definition due to empty implicit table name: ")
.append(table); .append(table);
} }
void invalidTable(String table, int line) { void invalidTable(String table, int line)
{
sb.append("Invalid table definition on line ") sb.append("Invalid table definition on line ")
.append(line) .append(line)
.append(": ") .append(": ")
@ -45,9 +57,11 @@ class Results {
.append("]"); .append("]");
} }
void duplicateKey(String key, int line) { void duplicateKey(String key, int line)
{
sb.append("Duplicate key"); sb.append("Duplicate key");
if (line > -1) { if (line > -1)
{
sb.append(" on line ") sb.append(" on line ")
.append(line); .append(line);
} }
@ -55,7 +69,8 @@ class Results {
.append(key); .append(key);
} }
void invalidTextAfterIdentifier(dev.plex.toml.Identifier identifier, char text, int line) { void invalidTextAfterIdentifier(dev.plex.toml.Identifier identifier, char text, int line)
{
sb.append("Invalid text after key ") sb.append("Invalid text after key ")
.append(identifier.getName()) .append(identifier.getName())
.append(" on line ") .append(" on line ")
@ -63,21 +78,24 @@ class Results {
.append(". Make sure to terminate the value or add a comment (#)."); .append(". Make sure to terminate the value or add a comment (#).");
} }
void invalidKey(String key, int line) { void invalidKey(String key, int line)
{
sb.append("Invalid key on line ") sb.append("Invalid key on line ")
.append(line) .append(line)
.append(": ") .append(": ")
.append(key); .append(key);
} }
void invalidTableArray(String tableArray, int line) { void invalidTableArray(String tableArray, int line)
{
sb.append("Invalid table array definition on line ") sb.append("Invalid table array definition on line ")
.append(line) .append(line)
.append(": ") .append(": ")
.append(tableArray); .append(tableArray);
} }
void invalidValue(String key, String value, int line) { void invalidValue(String key, String value, int line)
{
sb.append("Invalid value on line ") sb.append("Invalid value on line ")
.append(line) .append(line)
.append(": ") .append(": ")
@ -86,14 +104,16 @@ class Results {
.append(value); .append(value);
} }
void unterminatedKey(String key, int line) { void unterminatedKey(String key, int line)
{
sb.append("Key is not followed by an equals sign on line ") sb.append("Key is not followed by an equals sign on line ")
.append(line) .append(line)
.append(": ") .append(": ")
.append(key); .append(key);
} }
void unterminated(String key, String value, int line) { void unterminated(String key, String value, int line)
{
sb.append("Unterminated value on line ") sb.append("Unterminated value on line ")
.append(line) .append(line)
.append(": ") .append(": ")
@ -102,22 +122,26 @@ class Results {
.append(value.trim()); .append(value.trim());
} }
public void heterogenous(String key, int line) { public void heterogenous(String key, int line)
{
sb.append(key) sb.append(key)
.append(" becomes a heterogeneous array on line ") .append(" becomes a heterogeneous array on line ")
.append(line); .append(line);
} }
boolean hasErrors() { boolean hasErrors()
{
return sb.length() > 0; return sb.length() > 0;
} }
@Override @Override
public String toString() { public String toString()
{
return sb.toString(); return sb.toString();
} }
public void add(Errors other) { public void add(Errors other)
{
sb.append(other.sb); sb.append(other.sb);
} }
} }
@ -126,102 +150,140 @@ class Results {
private final Set<String> tables = new HashSet<String>(); private final Set<String> tables = new HashSet<String>();
private final Deque<Container> stack = new ArrayDeque<Container>(); private final Deque<Container> stack = new ArrayDeque<Container>();
Results() { Results()
{
stack.push(new Container.Table("")); stack.push(new Container.Table(""));
} }
void addValue(String key, Object value, AtomicInteger line) { void addValue(String key, Object value, AtomicInteger line)
{
Container currentTable = stack.peek(); Container currentTable = stack.peek();
if (value instanceof Map) { if (value instanceof Map)
{
String path = getInlineTablePath(key); String path = getInlineTablePath(key);
if (path == null) { if (path == null)
{
startTable(key, line); startTable(key, line);
} else if (path.isEmpty()) { }
else if (path.isEmpty())
{
startTables(dev.plex.toml.Identifier.from(key, null), line); startTables(dev.plex.toml.Identifier.from(key, null), line);
} else { }
else
{
startTables(dev.plex.toml.Identifier.from(path, null), line); startTables(dev.plex.toml.Identifier.from(path, null), line);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> valueMap = (Map<String, Object>)value; Map<String, Object> valueMap = (Map<String, Object>)value;
for (Map.Entry<String, Object> entry : valueMap.entrySet()) { for (Map.Entry<String, Object> entry : valueMap.entrySet())
{
addValue(entry.getKey(), entry.getValue(), line); addValue(entry.getKey(), entry.getValue(), line);
} }
stack.pop(); stack.pop();
} else if (currentTable.accepts(key)) { }
else if (currentTable.accepts(key))
{
currentTable.put(key, value); currentTable.put(key, value);
} else { }
if (currentTable.get(key) instanceof Container) { else
{
if (currentTable.get(key) instanceof Container)
{
errors.keyDuplicatesTable(key, line); errors.keyDuplicatesTable(key, line);
} else { }
else
{
errors.duplicateKey(key, line != null ? line.get() : -1); errors.duplicateKey(key, line != null ? line.get() : -1);
} }
} }
} }
void startTableArray(dev.plex.toml.Identifier identifier, AtomicInteger line) { void startTableArray(dev.plex.toml.Identifier identifier, AtomicInteger line)
{
String tableName = identifier.getBareName(); String tableName = identifier.getBareName();
while (stack.size() > 1) { while (stack.size() > 1)
{
stack.pop(); stack.pop();
} }
dev.plex.toml.Keys.Key[] tableParts = dev.plex.toml.Keys.split(tableName); dev.plex.toml.Keys.Key[] tableParts = dev.plex.toml.Keys.split(tableName);
for (int i = 0; i < tableParts.length; i++) { for (int i = 0; i < tableParts.length; i++)
{
String tablePart = tableParts[i].name; String tablePart = tableParts[i].name;
Container currentContainer = stack.peek(); Container currentContainer = stack.peek();
if (currentContainer.get(tablePart) instanceof Container.TableArray) { if (currentContainer.get(tablePart) instanceof Container.TableArray)
{
Container.TableArray currentTableArray = (Container.TableArray)currentContainer.get(tablePart); Container.TableArray currentTableArray = (Container.TableArray)currentContainer.get(tablePart);
stack.push(currentTableArray); stack.push(currentTableArray);
if (i == tableParts.length - 1) { if (i == tableParts.length - 1)
{
currentTableArray.put(tablePart, new Container.Table()); currentTableArray.put(tablePart, new Container.Table());
} }
stack.push(currentTableArray.getCurrent()); stack.push(currentTableArray.getCurrent());
currentContainer = stack.peek(); currentContainer = stack.peek();
} else if (currentContainer.get(tablePart) instanceof Container.Table && i < tableParts.length - 1) { }
else if (currentContainer.get(tablePart) instanceof Container.Table && i < tableParts.length - 1)
{
Container nextTable = (Container)currentContainer.get(tablePart); Container nextTable = (Container)currentContainer.get(tablePart);
stack.push(nextTable); stack.push(nextTable);
} else if (currentContainer.accepts(tablePart)) { }
else if (currentContainer.accepts(tablePart))
{
Container newContainer = i == tableParts.length - 1 ? new Container.TableArray() : new Container.Table(); Container newContainer = i == tableParts.length - 1 ? new Container.TableArray() : new Container.Table();
addValue(tablePart, newContainer, line); addValue(tablePart, newContainer, line);
stack.push(newContainer); stack.push(newContainer);
if (newContainer instanceof Container.TableArray) { if (newContainer instanceof Container.TableArray)
{
stack.push(((Container.TableArray)newContainer).getCurrent()); stack.push(((Container.TableArray)newContainer).getCurrent());
} }
} else { }
else
{
errors.duplicateTable(tableName, line.get()); errors.duplicateTable(tableName, line.get());
break; break;
} }
} }
} }
void startTables(dev.plex.toml.Identifier id, AtomicInteger line) { void startTables(dev.plex.toml.Identifier id, AtomicInteger line)
{
String tableName = id.getBareName(); String tableName = id.getBareName();
while (stack.size() > 1) { while (stack.size() > 1)
{
stack.pop(); stack.pop();
} }
dev.plex.toml.Keys.Key[] tableParts = dev.plex.toml.Keys.split(tableName); dev.plex.toml.Keys.Key[] tableParts = dev.plex.toml.Keys.split(tableName);
for (int i = 0; i < tableParts.length; i++) { for (int i = 0; i < tableParts.length; i++)
{
String tablePart = tableParts[i].name; String tablePart = tableParts[i].name;
Container currentContainer = stack.peek(); Container currentContainer = stack.peek();
if (currentContainer.get(tablePart) instanceof Container) { if (currentContainer.get(tablePart) instanceof Container)
{
Container nextTable = (Container)currentContainer.get(tablePart); Container nextTable = (Container)currentContainer.get(tablePart);
if (i == tableParts.length - 1 && !nextTable.isImplicit()) { if (i == tableParts.length - 1 && !nextTable.isImplicit())
{
errors.duplicateTable(tableName, line.get()); errors.duplicateTable(tableName, line.get());
return; return;
} }
stack.push(nextTable); stack.push(nextTable);
if (stack.peek() instanceof Container.TableArray) { if (stack.peek() instanceof Container.TableArray)
{
stack.push(((Container.TableArray)stack.peek()).getCurrent()); stack.push(((Container.TableArray)stack.peek()).getCurrent());
} }
} else if (currentContainer.accepts(tablePart)) { }
else if (currentContainer.accepts(tablePart))
{
startTable(tablePart, i < tableParts.length - 1, line); startTable(tablePart, i < tableParts.length - 1, line);
} else { }
else
{
errors.tableDuplicatesKey(tablePart, line); errors.tableDuplicatesKey(tablePart, line);
break; break;
} }
@ -231,14 +293,16 @@ class Results {
/** /**
* Warning: After this method has been called, this instance is no longer usable. * Warning: After this method has been called, this instance is no longer usable.
*/ */
Map<String, Object> consume() { Map<String, Object> consume()
{
Container values = stack.getLast(); Container values = stack.getLast();
stack.clear(); stack.clear();
return ((Container.Table)values).consume(); return ((Container.Table)values).consume();
} }
private Container startTable(String tableName, AtomicInteger line) { private Container startTable(String tableName, AtomicInteger line)
{
Container newTable = new Container.Table(tableName); Container newTable = new Container.Table(tableName);
addValue(tableName, newTable, line); addValue(tableName, newTable, line);
stack.push(newTable); stack.push(newTable);
@ -246,7 +310,8 @@ class Results {
return newTable; return newTable;
} }
private Container startTable(String tableName, boolean implicit, AtomicInteger line) { private Container startTable(String tableName, boolean implicit, AtomicInteger line)
{
Container newTable = new Container.Table(tableName, implicit); Container newTable = new Container.Table(tableName, implicit);
addValue(tableName, newTable, line); addValue(tableName, newTable, line);
stack.push(newTable); stack.push(newTable);
@ -254,30 +319,36 @@ class Results {
return newTable; return newTable;
} }
private String getInlineTablePath(String key) { private String getInlineTablePath(String key)
{
Iterator<Container> descendingIterator = stack.descendingIterator(); Iterator<Container> descendingIterator = stack.descendingIterator();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
while (descendingIterator.hasNext()) { while (descendingIterator.hasNext())
{
Container next = descendingIterator.next(); Container next = descendingIterator.next();
if (next instanceof Container.TableArray) { if (next instanceof Container.TableArray)
{
return null; return null;
} }
Container.Table table = (Container.Table)next; Container.Table table = (Container.Table)next;
if (table.name == null) { if (table.name == null)
{
break; break;
} }
if (sb.length() > 0) { if (sb.length() > 0)
{
sb.append('.'); sb.append('.');
} }
sb.append(table.name); sb.append(table.name);
} }
if (sb.length() > 0) { if (sb.length() > 0)
{
sb.append('.'); sb.append('.');
} }

View File

@ -14,7 +14,8 @@ class StringValueReaderWriter implements ValueReader, ValueWriter
static private final String[] specialCharacterEscapes = new String[93]; static private final String[] specialCharacterEscapes = new String[93];
static { static
{
specialCharacterEscapes['\b'] = "\\b"; specialCharacterEscapes['\b'] = "\\b";
specialCharacterEscapes['\t'] = "\\t"; specialCharacterEscapes['\t'] = "\\t";
specialCharacterEscapes['\n'] = "\\n"; specialCharacterEscapes['\n'] = "\\n";
@ -25,24 +26,29 @@ class StringValueReaderWriter implements ValueReader, ValueWriter
} }
@Override @Override
public boolean canRead(String s) { public boolean canRead(String s)
{
return s.startsWith("\""); return s.startsWith("\"");
} }
@Override @Override
public Object read(String s, AtomicInteger index, Context context) { public Object read(String s, AtomicInteger index, Context context)
{
int startIndex = index.incrementAndGet(); int startIndex = index.incrementAndGet();
int endIndex = -1; int endIndex = -1;
for (int i = index.get(); i < s.length(); i = index.incrementAndGet()) { for (int i = index.get(); i < s.length(); i = index.incrementAndGet())
{
char ch = s.charAt(i); char ch = s.charAt(i);
if (ch == '"' && s.charAt(i - 1) != '\\') { if (ch == '"' && s.charAt(i - 1) != '\\')
{
endIndex = i; endIndex = i;
break; break;
} }
} }
if (endIndex == -1) { if (endIndex == -1)
{
Results.Errors errors = new Results.Errors(); Results.Errors errors = new Results.Errors();
errors.unterminated(context.identifier.getName(), s.substring(startIndex - 1), context.line.get()); errors.unterminated(context.identifier.getName(), s.substring(startIndex - 1), context.line.get());
return errors; return errors;
@ -52,7 +58,8 @@ class StringValueReaderWriter implements ValueReader, ValueWriter
s = replaceUnicodeCharacters(raw); s = replaceUnicodeCharacters(raw);
s = replaceSpecialCharacters(s); s = replaceSpecialCharacters(s);
if (s == null) { if (s == null)
{
Results.Errors errors = new Results.Errors(); Results.Errors errors = new Results.Errors();
errors.invalidValue(context.identifier.getName(), raw, context.line.get()); errors.invalidValue(context.identifier.getName(), raw, context.line.get());
return errors; return errors;
@ -61,23 +68,30 @@ class StringValueReaderWriter implements ValueReader, ValueWriter
return s; return s;
} }
String replaceUnicodeCharacters(String value) { String replaceUnicodeCharacters(String value)
{
Matcher unicodeMatcher = UNICODE_REGEX.matcher(value); Matcher unicodeMatcher = UNICODE_REGEX.matcher(value);
while (unicodeMatcher.find()) { while (unicodeMatcher.find())
{
value = value.replace(unicodeMatcher.group(), new String(Character.toChars(Integer.parseInt(unicodeMatcher.group(1), 16)))); value = value.replace(unicodeMatcher.group(), new String(Character.toChars(Integer.parseInt(unicodeMatcher.group(1), 16))));
} }
return value; return value;
} }
String replaceSpecialCharacters(String s) { String replaceSpecialCharacters(String s)
for (int i = 0; i < s.length() - 1; i++) { {
for (int i = 0; i < s.length() - 1; i++)
{
char ch = s.charAt(i); char ch = s.charAt(i);
char next = s.charAt(i + 1); char next = s.charAt(i + 1);
if (ch == '\\' && next == '\\') { if (ch == '\\' && next == '\\')
{
i++; i++;
} else if (ch == '\\' && !(next == 'b' || next == 'f' || next == 'n' || next == 't' || next == 'r' || next == '"' || next == '\\')) { }
else if (ch == '\\' && !(next == 'b' || next == 'f' || next == 'n' || next == 't' || next == 'r' || next == '"' || next == '\\'))
{
return null; return null;
} }
} }
@ -93,37 +107,48 @@ class StringValueReaderWriter implements ValueReader, ValueWriter
} }
@Override @Override
public boolean canWrite(Object value) { public boolean canWrite(Object value)
{
return value instanceof String || value instanceof Character || value instanceof URL || value instanceof URI || value instanceof Enum; return value instanceof String || value instanceof Character || value instanceof URL || value instanceof URI || value instanceof Enum;
} }
@Override @Override
public void write(Object value, WriterContext context) { public void write(Object value, WriterContext context)
{
context.write('"'); context.write('"');
escapeUnicode(value.toString(), context); escapeUnicode(value.toString(), context);
context.write('"'); context.write('"');
} }
@Override @Override
public boolean isPrimitiveType() { public boolean isPrimitiveType()
{
return true; return true;
} }
private void escapeUnicode(String in, WriterContext context) { private void escapeUnicode(String in, WriterContext context)
for (int i = 0; i < in.length(); i++) { {
for (int i = 0; i < in.length(); i++)
{
int codePoint = in.codePointAt(i); int codePoint = in.codePointAt(i);
if (codePoint < specialCharacterEscapes.length && specialCharacterEscapes[codePoint] != null) { if (codePoint < specialCharacterEscapes.length && specialCharacterEscapes[codePoint] != null)
{
context.write(specialCharacterEscapes[codePoint]); context.write(specialCharacterEscapes[codePoint]);
} else { }
else
{
context.write(in.charAt(i)); context.write(in.charAt(i));
} }
} }
} }
private StringValueReaderWriter() {} private StringValueReaderWriter()
{
}
@Override @Override
public String toString() { public String toString()
{
return "string"; return "string";
} }
} }

View File

@ -1,7 +1,6 @@
package dev.plex.toml; package dev.plex.toml;
import java.util.Collection; import java.util.Collection;
import static dev.plex.toml.ValueWriters.WRITERS; import static dev.plex.toml.ValueWriters.WRITERS;
class TableArrayValueWriter extends ArrayValueWriter class TableArrayValueWriter extends ArrayValueWriter
@ -9,25 +8,31 @@ class TableArrayValueWriter extends ArrayValueWriter
static final ValueWriter TABLE_ARRAY_VALUE_WRITER = new TableArrayValueWriter(); static final ValueWriter TABLE_ARRAY_VALUE_WRITER = new TableArrayValueWriter();
@Override @Override
public boolean canWrite(Object value) { public boolean canWrite(Object value)
{
return isArrayish(value) && !isArrayOfPrimitive(value); return isArrayish(value) && !isArrayOfPrimitive(value);
} }
@Override @Override
public void write(Object from, WriterContext context) { public void write(Object from, WriterContext context)
{
Collection<?> values = normalize(from); Collection<?> values = normalize(from);
WriterContext subContext = context.pushTableFromArray(); WriterContext subContext = context.pushTableFromArray();
for (Object value : values) { for (Object value : values)
{
WRITERS.findWriterFor(value).write(value, subContext); WRITERS.findWriterFor(value).write(value, subContext);
} }
} }
private TableArrayValueWriter() {} private TableArrayValueWriter()
{
}
@Override @Override
public String toString() { public String toString()
{
return "table-array"; return "table-array";
} }
} }

View File

@ -2,13 +2,22 @@ package dev.plex.toml;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import lombok.Getter; import lombok.Getter;
import org.json.JSONObject;
import java.io.*;
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
/** /**
* <p>Provides access to the keys and tables in a TOML data source.</p> * <p>Provides access to the keys and tables in a TOML data source.</p>
@ -64,8 +73,9 @@ public class Toml
{ {
try try
{ {
return read(new InputStreamReader(new FileInputStream(file), "UTF8")); return read(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
} catch (Exception e) }
catch (Exception e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -105,15 +115,18 @@ public class Toml
line = bufferedReader.readLine(); line = bufferedReader.readLine();
} }
read(w.toString()); read(w.toString());
} catch (IOException e) }
catch (IOException e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
} finally }
finally
{ {
try try
{ {
bufferedReader.close(); bufferedReader.close();
} catch (IOException e) }
catch (IOException e)
{ {
} }
} }
@ -386,17 +399,20 @@ public class Toml
if (Map.class.isAssignableFrom(entryClass)) if (Map.class.isAssignableFrom(entryClass))
{ {
entries.add(new Entry(entry.getKey(), getTable(entry.getKey()))); entries.add(new Entry(entry.getKey(), getTable(entry.getKey())));
} else if (List.class.isAssignableFrom(entryClass)) }
else if (List.class.isAssignableFrom(entryClass))
{ {
List<?> value = (List<?>)entry.getValue(); List<?> value = (List<?>)entry.getValue();
if (!value.isEmpty() && value.get(0) instanceof Map) if (!value.isEmpty() && value.get(0) instanceof Map)
{ {
entries.add(new Entry(entry.getKey(), getTables(entry.getKey()))); entries.add(new Entry(entry.getKey(), getTables(entry.getKey())));
} else }
else
{ {
entries.add(new Entry(entry.getKey(), value)); entries.add(new Entry(entry.getKey(), value));
} }
} else }
else
{ {
entries.add(new Entry(entry.getKey(), entry.getValue())); entries.add(new Entry(entry.getKey(), entry.getValue()));
} }

View File

@ -2,12 +2,15 @@ package dev.plex.toml;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
class TomlParser { class TomlParser
{
static dev.plex.toml.Results run(String tomlString) { static dev.plex.toml.Results run(String tomlString)
{
final dev.plex.toml.Results results = new dev.plex.toml.Results(); final dev.plex.toml.Results results = new dev.plex.toml.Results();
if (tomlString.isEmpty()) { if (tomlString.isEmpty())
{
return results; return results;
} }
@ -17,41 +20,61 @@ class TomlParser {
dev.plex.toml.Identifier identifier = null; dev.plex.toml.Identifier identifier = null;
Object value = null; Object value = null;
for (int i = index.get(); i < tomlString.length(); i = index.incrementAndGet()) { for (int i = index.get(); i < tomlString.length(); i = index.incrementAndGet())
{
char c = tomlString.charAt(i); char c = tomlString.charAt(i);
if (results.errors.hasErrors()) { if (results.errors.hasErrors())
{
break; break;
} }
if (c == '#' && !inComment) { if (c == '#' && !inComment)
{
inComment = true; inComment = true;
} else if (!Character.isWhitespace(c) && !inComment && identifier == null) { }
else if (!Character.isWhitespace(c) && !inComment && identifier == null)
{
dev.plex.toml.Identifier id = dev.plex.toml.IdentifierConverter.IDENTIFIER_CONVERTER.convert(tomlString, index, new dev.plex.toml.Context(null, line, results.errors)); dev.plex.toml.Identifier id = dev.plex.toml.IdentifierConverter.IDENTIFIER_CONVERTER.convert(tomlString, index, new dev.plex.toml.Context(null, line, results.errors));
if (id != dev.plex.toml.Identifier.INVALID) { if (id != dev.plex.toml.Identifier.INVALID)
if (id.isKey()) { {
if (id.isKey())
{
identifier = id; identifier = id;
} else if (id.isTable()) { }
else if (id.isTable())
{
results.startTables(id, line); results.startTables(id, line);
} else if (id.isTableArray()) { }
else if (id.isTableArray())
{
results.startTableArray(id, line); results.startTableArray(id, line);
} }
} }
} else if (c == '\n') { }
else if (c == '\n')
{
inComment = false; inComment = false;
identifier = null; identifier = null;
value = null; value = null;
line.incrementAndGet(); line.incrementAndGet();
} else if (!inComment && identifier != null && identifier.isKey() && value == null && !Character.isWhitespace(c)) { }
else if (!inComment && identifier != null && identifier.isKey() && value == null && !Character.isWhitespace(c))
{
value = ValueReaders.VALUE_READERS.convert(tomlString, index, new dev.plex.toml.Context(identifier, line, results.errors)); value = ValueReaders.VALUE_READERS.convert(tomlString, index, new dev.plex.toml.Context(identifier, line, results.errors));
if (value instanceof dev.plex.toml.Results.Errors) { if (value instanceof dev.plex.toml.Results.Errors)
{
results.errors.add((dev.plex.toml.Results.Errors)value); results.errors.add((dev.plex.toml.Results.Errors)value);
} else { }
else
{
results.addValue(identifier.getName(), value, line); results.addValue(identifier.getName(), value, line);
} }
} else if (value != null && !inComment && !Character.isWhitespace(c)) { }
else if (value != null && !inComment && !Character.isWhitespace(c))
{
results.errors.invalidTextAfterIdentifier(identifier, c, line.get()); results.errors.invalidTextAfterIdentifier(identifier, c, line.get());
} }
} }
@ -59,5 +82,7 @@ class TomlParser {
return results; return results;
} }
private TomlParser() {} private TomlParser()
{
}
} }

View File

@ -1,12 +1,17 @@
package dev.plex.toml; package dev.plex.toml;
import org.jetbrains.annotations.Nullable; import java.io.File;
import java.io.FileOutputStream;
import java.io.*; import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TimeZone; import java.util.TimeZone;
import org.jetbrains.annotations.Nullable;
import static dev.plex.toml.ValueWriters.WRITERS; import static dev.plex.toml.ValueWriters.WRITERS;
/** /**
@ -112,7 +117,8 @@ public class TomlWriter
write(from, output, null); write(from, output, null);
return output.toString(); return output.toString();
} catch (IOException e) }
catch (IOException e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -131,7 +137,8 @@ public class TomlWriter
try try
{ {
write(from, outputStream, target); write(from, outputStream, target);
} finally }
finally
{ {
outputStream.close(); outputStream.close();
} }
@ -146,7 +153,7 @@ public class TomlWriter
*/ */
public void write(Object from, OutputStream target, @Nullable File file) throws IOException public void write(Object from, OutputStream target, @Nullable File file) throws IOException
{ {
OutputStreamWriter writer = new OutputStreamWriter(target, "UTF-8"); OutputStreamWriter writer = new OutputStreamWriter(target, StandardCharsets.UTF_8);
write(from, writer, file); write(from, writer, file);
writer.flush(); writer.flush();
} }
@ -170,7 +177,8 @@ public class TomlWriter
context.file = file; context.file = file;
} }
valueWriter.write(from, context); valueWriter.write(from, context);
} else }
else
{ {
throw new IllegalArgumentException("An object of class " + from.getClass().getSimpleName() + " cannot produce valid TOML. Please pass in a Map or a custom type."); throw new IllegalArgumentException("An object of class " + from.getClass().getSimpleName() + " cannot produce valid TOML. Please pass in a Map or a custom type.");
} }

View File

@ -2,7 +2,8 @@ package dev.plex.toml;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
interface ValueReader { interface ValueReader
{
/** /**
* @param s must already have been trimmed * @param s must already have been trimmed

View File

@ -1,7 +1,6 @@
package dev.plex.toml; package dev.plex.toml;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static dev.plex.toml.ArrayValueReader.ARRAY_VALUE_READER; import static dev.plex.toml.ArrayValueReader.ARRAY_VALUE_READER;
import static dev.plex.toml.BooleanValueReaderWriter.BOOLEAN_VALUE_READER_WRITER; import static dev.plex.toml.BooleanValueReaderWriter.BOOLEAN_VALUE_READER_WRITER;
import static dev.plex.toml.DateValueReaderWriter.DATE_VALUE_READER_WRITER; import static dev.plex.toml.DateValueReaderWriter.DATE_VALUE_READER_WRITER;
@ -10,14 +9,18 @@ import static dev.plex.toml.MultilineLiteralStringValueReader.MULTILINE_LITERAL_
import static dev.plex.toml.MultilineStringValueReader.MULTILINE_STRING_VALUE_READER; import static dev.plex.toml.MultilineStringValueReader.MULTILINE_STRING_VALUE_READER;
import static dev.plex.toml.StringValueReaderWriter.STRING_VALUE_READER_WRITER; import static dev.plex.toml.StringValueReaderWriter.STRING_VALUE_READER_WRITER;
class ValueReaders { class ValueReaders
{
static final ValueReaders VALUE_READERS = new ValueReaders(); static final ValueReaders VALUE_READERS = new ValueReaders();
Object convert(String value, AtomicInteger index, dev.plex.toml.Context context) { Object convert(String value, AtomicInteger index, dev.plex.toml.Context context)
{
String substring = value.substring(index.get()); String substring = value.substring(index.get());
for (dev.plex.toml.ValueReader valueParser : READERS) { for (dev.plex.toml.ValueReader valueParser : READERS)
if (valueParser.canRead(substring)) { {
if (valueParser.canRead(substring))
{
return valueParser.read(value, index, context); return valueParser.read(value, index, context);
} }
} }
@ -27,7 +30,9 @@ class ValueReaders {
return errors; return errors;
} }
private ValueReaders() {} private ValueReaders()
{
}
private static final dev.plex.toml.ValueReader[] READERS = { private static final dev.plex.toml.ValueReader[] READERS = {
MULTILINE_STRING_VALUE_READER, MULTILINE_LITERAL_STRING_VALUE_READER, LITERAL_STRING_VALUE_READER, STRING_VALUE_READER_WRITER, DATE_VALUE_READER_WRITER, NumberValueReaderWriter.NUMBER_VALUE_READER_WRITER, BOOLEAN_VALUE_READER_WRITER, ARRAY_VALUE_READER, InlineTableValueReader.INLINE_TABLE_VALUE_READER MULTILINE_STRING_VALUE_READER, MULTILINE_LITERAL_STRING_VALUE_READER, LITERAL_STRING_VALUE_READER, STRING_VALUE_READER_WRITER, DATE_VALUE_READER_WRITER, NumberValueReaderWriter.NUMBER_VALUE_READER_WRITER, BOOLEAN_VALUE_READER_WRITER, ARRAY_VALUE_READER, InlineTableValueReader.INLINE_TABLE_VALUE_READER

View File

@ -1,6 +1,7 @@
package dev.plex.toml; package dev.plex.toml;
interface ValueWriter { interface ValueWriter
{
boolean canWrite(Object value); boolean canWrite(Object value);
void write(Object value, WriterContext context); void write(Object value, WriterContext context);

View File

@ -1,12 +1,16 @@
package dev.plex.toml; package dev.plex.toml;
class ValueWriters { class ValueWriters
{
static final ValueWriters WRITERS = new ValueWriters(); static final ValueWriters WRITERS = new ValueWriters();
ValueWriter findWriterFor(Object value) { ValueWriter findWriterFor(Object value)
for (ValueWriter valueWriter : VALUE_WRITERS) { {
if (valueWriter.canWrite(value)) { for (ValueWriter valueWriter : VALUE_WRITERS)
{
if (valueWriter.canWrite(value))
{
return valueWriter; return valueWriter;
} }
} }
@ -14,9 +18,12 @@ class ValueWriters {
return ObjectValueWriter.OBJECT_VALUE_WRITER; return ObjectValueWriter.OBJECT_VALUE_WRITER;
} }
private ValueWriters() {} private ValueWriters()
{
}
private static dev.plex.toml.DateValueReaderWriter getPlatformSpecificDateConverter() { private static dev.plex.toml.DateValueReaderWriter getPlatformSpecificDateConverter()
{
String specificationVersion = Runtime.class.getPackage().getSpecificationVersion(); String specificationVersion = Runtime.class.getPackage().getSpecificationVersion();
return specificationVersion != null && specificationVersion.startsWith("1.6") ? dev.plex.toml.DateValueReaderWriter.DATE_PARSER_JDK_6 : dev.plex.toml.DateValueReaderWriter.DATE_VALUE_READER_WRITER; return specificationVersion != null && specificationVersion.startsWith("1.6") ? dev.plex.toml.DateValueReaderWriter.DATE_PARSER_JDK_6 : dev.plex.toml.DateValueReaderWriter.DATE_VALUE_READER_WRITER;
} }

View File

@ -68,7 +68,8 @@ class WriterContext
} }
return this; return this;
} catch (IOException e) }
catch (IOException e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -90,7 +91,8 @@ class WriterContext
empty = false; empty = false;
return this; return this;
} catch (IOException e) }
catch (IOException e)
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -113,7 +115,8 @@ class WriterContext
if (isArrayOfTable) if (isArrayOfTable)
{ {
write("[[").write(key).write("]]\n"); write("[[").write(key).write("]]\n");
} else }
else
{ {
write('[').write(key).write("]\n"); write('[').write(key).write("]\n");
} }

View File

@ -1,8 +1,7 @@
package dev.plex.util; package dev.plex.util;
import net.kyori.adventure.text.format.NamedTextColor;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import net.kyori.adventure.text.format.NamedTextColor;
public class RandomUtil public class RandomUtil
{ {

View File

@ -3,7 +3,6 @@ package dev.plex.util;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.ClassPath; import com.google.common.reflect.ClassPath;
import dev.plex.Plex; import dev.plex.Plex;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;

View File

@ -2,6 +2,7 @@ package dev.plex;
import dev.plex.admin.Admin; import dev.plex.admin.Admin;
import dev.plex.admin.AdminList; import dev.plex.admin.AdminList;
import dev.plex.api.plugin.PlexPlugin;
import dev.plex.cache.DataUtils; import dev.plex.cache.DataUtils;
import dev.plex.cache.PlayerCache; import dev.plex.cache.PlayerCache;
import dev.plex.config.Config; import dev.plex.config.Config;
@ -10,7 +11,6 @@ import dev.plex.handlers.ListenerHandler;
import dev.plex.listener.impl.ChatListener; import dev.plex.listener.impl.ChatListener;
import dev.plex.module.ModuleManager; import dev.plex.module.ModuleManager;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.api.plugin.PlexPlugin;
import dev.plex.punishment.PunishmentManager; import dev.plex.punishment.PunishmentManager;
import dev.plex.rank.RankManager; import dev.plex.rank.RankManager;
import dev.plex.services.ServiceManager; import dev.plex.services.ServiceManager;
@ -23,7 +23,11 @@ import dev.plex.storage.player.MongoPlayerData;
import dev.plex.storage.player.SQLPlayerData; import dev.plex.storage.player.SQLPlayerData;
import dev.plex.storage.punishment.SQLNotes; import dev.plex.storage.punishment.SQLNotes;
import dev.plex.storage.punishment.SQLPunishment; import dev.plex.storage.punishment.SQLPunishment;
import dev.plex.util.*; import dev.plex.util.BuildInfo;
import dev.plex.util.BungeeUtil;
import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils;
import dev.plex.util.UpdateChecker;
import dev.plex.world.CustomWorld; import dev.plex.world.CustomWorld;
import java.io.File; import java.io.File;
import lombok.Getter; import lombok.Getter;

View File

@ -3,7 +3,6 @@ package dev.plex.cache;
import dev.plex.Plex; import dev.plex.Plex;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.storage.StorageType; import dev.plex.storage.StorageType;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;

View File

@ -1,6 +1,9 @@
package dev.plex.command.impl; package dev.plex.command.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import dev.plex.api.event.AdminAddEvent;
import dev.plex.api.event.AdminRemoveEvent;
import dev.plex.api.event.AdminSetRankEvent;
import dev.plex.cache.DataUtils; import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand; import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
@ -9,9 +12,6 @@ import dev.plex.command.annotation.System;
import dev.plex.command.exception.ConsoleOnlyException; import dev.plex.command.exception.ConsoleOnlyException;
import dev.plex.command.exception.PlayerNotFoundException; import dev.plex.command.exception.PlayerNotFoundException;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.api.event.AdminAddEvent;
import dev.plex.api.event.AdminRemoveEvent;
import dev.plex.api.event.AdminSetRankEvent;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;

View File

@ -1,12 +1,12 @@
package dev.plex.command.impl; package dev.plex.command.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.command.PlexCommand; import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException; import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import java.util.List; import java.util.List;

View File

@ -1,12 +1,12 @@
package dev.plex.command.impl; package dev.plex.command.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.command.PlexCommand; import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException; import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import java.util.List; import java.util.List;

View File

@ -9,11 +9,10 @@ import dev.plex.punishment.Punishment;
import dev.plex.punishment.PunishmentType; import dev.plex.punishment.PunishmentType;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import dev.plex.util.TimeUtils;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.List; import java.util.List;
import dev.plex.util.TimeUtils;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -1,11 +1,11 @@
package dev.plex.command.impl; package dev.plex.command.impl;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.command.PlexCommand; import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException; import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import java.util.Arrays; import java.util.Arrays;

View File

@ -14,6 +14,9 @@ import dev.plex.util.BungeeUtil;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import dev.plex.util.TimeUtils; import dev.plex.util.TimeUtils;
import dev.plex.util.WebUtils; import dev.plex.util.WebUtils;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.UUID;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -22,10 +25,6 @@ import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.UUID;
@CommandParameters(name = "kick", description = "Kicks a player", usage = "/<command> <player>") @CommandParameters(name = "kick", description = "Kicks a player", usage = "/<command> <player>")
@CommandPermissions(level = Rank.ADMIN, permission = "plex.kick", source = RequiredCommandSource.ANY) @CommandPermissions(level = Rank.ADMIN, permission = "plex.kick", source = RequiredCommandSource.ANY)
public class KickCMD extends PlexCommand public class KickCMD extends PlexCommand

View File

@ -9,11 +9,10 @@ import dev.plex.punishment.Punishment;
import dev.plex.punishment.PunishmentType; import dev.plex.punishment.PunishmentType;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import dev.plex.util.TimeUtils;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.List; import java.util.List;
import dev.plex.util.TimeUtils;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View File

@ -9,12 +9,11 @@ import dev.plex.punishment.Punishment;
import dev.plex.punishment.PunishmentType; import dev.plex.punishment.PunishmentType;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import dev.plex.util.TimeUtils;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import dev.plex.util.TimeUtils;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.title.Title; import net.kyori.adventure.title.Title;

View File

@ -1,12 +1,12 @@
package dev.plex.command.impl; package dev.plex.command.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.command.PlexCommand; import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException; import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import java.util.List; import java.util.List;

View File

@ -1,12 +1,12 @@
package dev.plex.command.impl; package dev.plex.command.impl;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.command.PlexCommand; import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters; import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions; import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException; import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource; import dev.plex.command.source.RequiredCommandSource;
import dev.plex.api.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import java.util.List; import java.util.List;

View File

@ -1,9 +1,9 @@
package dev.plex.listener.impl; package dev.plex.listener.impl;
import dev.plex.cache.DataUtils;
import dev.plex.api.event.AdminAddEvent; import dev.plex.api.event.AdminAddEvent;
import dev.plex.api.event.AdminRemoveEvent; import dev.plex.api.event.AdminRemoveEvent;
import dev.plex.api.event.AdminSetRankEvent; import dev.plex.api.event.AdminSetRankEvent;
import dev.plex.cache.DataUtils;
import dev.plex.listener.PlexListener; import dev.plex.listener.PlexListener;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;

View File

@ -5,7 +5,6 @@ import dev.plex.util.PlexUtils;
import dev.plex.util.minimessage.SafeMiniMessage; import dev.plex.util.minimessage.SafeMiniMessage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.kyori.adventure.inventory.Book;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;

View File

@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull;
public class ChatListener extends PlexListener public class ChatListener extends PlexListener
{ {
private final static TextReplacementConfig URL_REPLACEMENT_CONFIG = TextReplacementConfig.builder().match("(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]").replacement((matchResult, builder) -> Component.empty().content(matchResult.group()).clickEvent(ClickEvent.openUrl(matchResult.group()))).build(); private final static TextReplacementConfig URL_REPLACEMENT_CONFIG = TextReplacementConfig.builder().match("(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]").replacement((matchResult, builder) -> Component.empty().content(matchResult.group()).clickEvent(ClickEvent.openUrl(matchResult.group()))).build();
@EventHandler @EventHandler
public void onChat(AsyncChatEvent event) public void onChat(AsyncChatEvent event)
{ {
@ -34,6 +35,7 @@ public class ChatListener extends PlexListener
public static class ChatHandlerImpl implements IChatHandler public static class ChatHandlerImpl implements IChatHandler
{ {
private final PlexChatRenderer renderer = new PlexChatRenderer(); private final PlexChatRenderer renderer = new PlexChatRenderer();
@Override @Override
public void doChat(AsyncChatEvent event) public void doChat(AsyncChatEvent event)
{ {
@ -44,7 +46,8 @@ public class ChatListener extends PlexListener
{ {
renderer.hasPrefix = true; renderer.hasPrefix = true;
renderer.prefix = prefix; renderer.prefix = prefix;
} else }
else
{ {
renderer.hasPrefix = false; renderer.hasPrefix = false;
renderer.prefix = null; renderer.prefix = null;

View File

@ -1,9 +1,9 @@
package dev.plex.listener.impl; package dev.plex.listener.impl;
import dev.plex.cache.DataUtils;
import dev.plex.api.event.AdminAddEvent; import dev.plex.api.event.AdminAddEvent;
import dev.plex.api.event.AdminRemoveEvent; import dev.plex.api.event.AdminRemoveEvent;
import dev.plex.api.event.AdminSetRankEvent; import dev.plex.api.event.AdminSetRankEvent;
import dev.plex.cache.DataUtils;
import dev.plex.listener.PlexListener; import dev.plex.listener.PlexListener;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;

View File

@ -21,7 +21,7 @@ import org.bukkit.inventory.meta.SkullMeta;
public class PunishmentMenu extends AbstractMenu public class PunishmentMenu extends AbstractMenu
{ {
private List<Inventory> inventories = Lists.newArrayList(); private final List<Inventory> inventories = Lists.newArrayList();
public PunishmentMenu() public PunishmentMenu()
{ {

View File

@ -17,7 +17,6 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import lombok.Getter; import lombok.Getter;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
@Getter @Getter
@ -124,7 +123,8 @@ public class ModuleManager
try try
{ {
Plex.get().getServer().getCommandMap().getCommand(plexCommand.getName()).unregister(Plex.get().getServer().getCommandMap()); Plex.get().getServer().getCommandMap().getCommand(plexCommand.getName()).unregister(Plex.get().getServer().getCommandMap());
} catch (Exception ignored) }
catch (Exception ignored)
{ {
} }

View File

@ -14,6 +14,10 @@ import dev.plex.punishment.extra.Note;
import dev.plex.rank.enums.Rank; import dev.plex.rank.enums.Rank;
import dev.plex.storage.StorageType; import dev.plex.storage.StorageType;
import dev.plex.util.adapter.ZonedDateTimeSerializer; import dev.plex.util.adapter.ZonedDateTimeSerializer;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@ -23,11 +27,6 @@ import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachment;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
@Getter @Getter
@Setter @Setter
@Entity(value = "players", useDiscriminator = false) @Entity(value = "players", useDiscriminator = false)
@ -119,11 +118,13 @@ public class PlexPlayer implements IPlexPlayer
if (player.isOp()) if (player.isOp())
{ {
return Rank.OP; return Rank.OP;
} else }
else
{ {
return Rank.NONOP; return Rank.NONOP;
} }
} else }
else
{ {
return Rank.valueOf(rank.toUpperCase()); return Rank.valueOf(rank.toUpperCase());
} }

View File

@ -6,11 +6,10 @@ import dev.plex.Plex;
import dev.plex.util.MojangUtils; import dev.plex.util.MojangUtils;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import dev.plex.util.TimeUtils; import dev.plex.util.TimeUtils;
import java.time.ZonedDateTime;
import java.util.UUID;
import dev.plex.util.adapter.ZonedDateTimeDeserializer; import dev.plex.util.adapter.ZonedDateTimeDeserializer;
import dev.plex.util.adapter.ZonedDateTimeSerializer; import dev.plex.util.adapter.ZonedDateTimeSerializer;
import java.time.ZonedDateTime;
import java.util.UUID;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;

View File

@ -10,6 +10,7 @@ import dev.plex.player.PlexPlayer;
import dev.plex.storage.StorageType; import dev.plex.storage.StorageType;
import dev.plex.util.PlexLog; import dev.plex.util.PlexLog;
import dev.plex.util.PlexUtils; import dev.plex.util.PlexUtils;
import dev.plex.util.TimeUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -21,8 +22,6 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import dev.plex.util.TimeUtils;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;

View File

@ -2,10 +2,9 @@ package dev.plex.punishment.extra;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import dev.morphia.annotations.Entity; import dev.morphia.annotations.Entity;
import dev.plex.util.adapter.ZonedDateTimeSerializer;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.UUID; import java.util.UUID;
import dev.plex.util.adapter.ZonedDateTimeSerializer;
import lombok.Data; import lombok.Data;
@Data @Data

View File

@ -30,7 +30,7 @@ public enum Rank implements IRank
private String prefix; private String prefix;
@Getter @Getter
private NamedTextColor color; private final NamedTextColor color;
Rank(int level, String loginMessage, String readable, String prefix, NamedTextColor color) Rank(int level, String loginMessage, String readable, String prefix, NamedTextColor color)
{ {

View File

@ -26,7 +26,7 @@ public enum Title
private String prefix; private String prefix;
@Getter @Getter
private NamedTextColor color; private final NamedTextColor color;
Title(int level, String loginMessage, String readable, String prefix, NamedTextColor color) Title(int level, String loginMessage, String readable, String prefix, NamedTextColor color)
{ {

View File

@ -7,8 +7,8 @@ import lombok.Setter;
@Getter @Getter
public abstract class AbstractService implements IService, PlexBase public abstract class AbstractService implements IService, PlexBase
{ {
private boolean asynchronous; private final boolean asynchronous;
private boolean repeating; private final boolean repeating;
@Setter @Setter
private int taskId; private int taskId;

View File

@ -7,7 +7,6 @@ import dev.plex.cache.PlayerCache;
import dev.plex.player.PlexPlayer; import dev.plex.player.PlexPlayer;
import dev.plex.storage.StorageType; import dev.plex.storage.StorageType;
import dev.plex.util.PlexLog; import dev.plex.util.PlexLog;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -38,7 +37,8 @@ public class SQLPlayerData
statement.setString(1, uuid.toString()); statement.setString(1, uuid.toString());
ResultSet set = statement.executeQuery(); ResultSet set = statement.executeQuery();
return set.next(); return set.next();
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }
@ -53,7 +53,8 @@ public class SQLPlayerData
statement.setString(1, username); statement.setString(1, username);
ResultSet set = statement.executeQuery(); ResultSet set = statement.executeQuery();
return set.next(); return set.next();
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }
@ -104,7 +105,8 @@ public class SQLPlayerData
plexPlayer.setCommandSpy(commandspy); plexPlayer.setCommandSpy(commandspy);
} }
return plexPlayer; return plexPlayer;
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }
@ -153,7 +155,8 @@ public class SQLPlayerData
return plexPlayer; return plexPlayer;
} }
return null; return null;
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }
@ -216,11 +219,13 @@ public class SQLPlayerData
plexPlayer.setCommandSpy(commandspy); plexPlayer.setCommandSpy(commandspy);
} }
return plexPlayer; return plexPlayer;
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }
} else if (Plex.get().getStorageType() == StorageType.SQLITE) }
else if (Plex.get().getStorageType() == StorageType.SQLITE)
{ {
PlexLog.warn("Querying a user by IP running SQLite can cause performance issues! Please try to switch to a remote DB ASAP!"); PlexLog.warn("Querying a user by IP running SQLite can cause performance issues! Please try to switch to a remote DB ASAP!");
try (Connection con = Plex.get().getSqlConnection().getCon()) try (Connection con = Plex.get().getSqlConnection().getCon())
@ -260,7 +265,8 @@ public class SQLPlayerData
plexPlayer.setCommandSpy(commandspy); plexPlayer.setCommandSpy(commandspy);
} }
return plexPlayer; return plexPlayer;
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }
@ -290,7 +296,8 @@ public class SQLPlayerData
statement.setBoolean(9, player.isCommandSpy()); statement.setBoolean(9, player.isCommandSpy());
statement.setString(10, player.getUuid().toString()); statement.setString(10, player.getUuid().toString());
statement.executeUpdate(); statement.executeUpdate();
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }
@ -318,7 +325,8 @@ public class SQLPlayerData
statement.setBoolean(9, player.isVanished()); statement.setBoolean(9, player.isVanished());
statement.setBoolean(10, player.isCommandSpy()); statement.setBoolean(10, player.isCommandSpy());
statement.execute(); statement.execute();
} catch (SQLException throwables) }
catch (SQLException throwables)
{ {
throwables.printStackTrace(); throwables.printStackTrace();
} }

View File

@ -4,12 +4,13 @@ import com.google.common.collect.Lists;
import dev.plex.Plex; import dev.plex.Plex;
import dev.plex.punishment.extra.Note; import dev.plex.punishment.extra.Note;
import dev.plex.util.TimeUtils; import dev.plex.util.TimeUtils;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.time.*; import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;

View File

@ -6,7 +6,6 @@ import dev.plex.punishment.Punishment;
import dev.plex.punishment.PunishmentType; import dev.plex.punishment.PunishmentType;
import dev.plex.util.PlexLog; import dev.plex.util.PlexLog;
import dev.plex.util.TimeUtils; import dev.plex.util.TimeUtils;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -47,7 +46,8 @@ public class SQLPunishment
punishment.setIp(set.getString("ip")); punishment.setIp(set.getString("ip"));
punishments.add(punishment); punishments.add(punishment);
} }
} catch (SQLException e) }
catch (SQLException e)
{ {
e.printStackTrace(); e.printStackTrace();
return punishments; return punishments;
@ -76,7 +76,8 @@ public class SQLPunishment
punishment.setIp(set.getString("ip")); punishment.setIp(set.getString("ip"));
punishments.add(punishment); punishments.add(punishment);
} }
} catch (SQLException e) }
catch (SQLException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -103,7 +104,8 @@ public class SQLPunishment
statement.setLong(9, punishment.getEndDate().toInstant().toEpochMilli()); statement.setLong(9, punishment.getEndDate().toInstant().toEpochMilli());
PlexLog.debug("Executing punishment"); PlexLog.debug("Executing punishment");
statement.execute(); statement.execute();
} catch (SQLException e) }
catch (SQLException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -126,7 +128,8 @@ public class SQLPunishment
statement1.setString(3, uuid.toString()); statement1.setString(3, uuid.toString());
statement1.setString(4, PunishmentType.TEMPBAN.name()); statement1.setString(4, PunishmentType.TEMPBAN.name());
statement1.executeUpdate(); statement1.executeUpdate();
} catch (SQLException e) }
catch (SQLException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@ -151,7 +154,8 @@ public class SQLPunishment
statement1.setString(3, uuid.toString()); statement1.setString(3, uuid.toString());
statement1.setString(4, PunishmentType.TEMPBAN.name()); statement1.setString(4, PunishmentType.TEMPBAN.name());
statement1.executeUpdate(); statement1.executeUpdate();
} catch (SQLException e) }
catch (SQLException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }

View File

@ -1,9 +1,7 @@
package dev.plex.util; package dev.plex.util;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.time.LocalDateTime;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;

View File

@ -2,6 +2,7 @@ package dev.plex.util;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializer; import com.google.gson.JsonDeserializer;
import dev.plex.Plex;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.time.Instant; import java.time.Instant;
@ -9,8 +10,6 @@ import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Arrays; import java.util.Arrays;
import dev.plex.Plex;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;

View File

@ -4,6 +4,14 @@ import dev.plex.Plex;
import dev.plex.PlexBase; import dev.plex.PlexBase;
import dev.plex.cache.PlayerCache; import dev.plex.cache.PlayerCache;
import dev.plex.storage.StorageType; import dev.plex.storage.StorageType;
import java.sql.Connection;
import java.sql.SQLException;
import java.time.Month;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
@ -17,15 +25,6 @@ import org.bukkit.command.PluginCommandYamlParser;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import java.sql.Connection;
import java.sql.SQLException;
import java.time.Month;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
public class PlexUtils implements PlexBase public class PlexUtils implements PlexBase
{ {
private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
@ -71,18 +70,21 @@ public class PlexUtils implements PlexBase
if (Plex.get().getStorageType() == StorageType.MARIADB) if (Plex.get().getStorageType() == StorageType.MARIADB)
{ {
PlexLog.log("Successfully enabled MySQL!"); PlexLog.log("Successfully enabled MySQL!");
} else if (Plex.get().getStorageType() == StorageType.SQLITE) }
else if (Plex.get().getStorageType() == StorageType.SQLITE)
{ {
PlexLog.log("Successfully enabled SQLite!"); PlexLog.log("Successfully enabled SQLite!");
} }
} catch (SQLException e) }
catch (SQLException e)
{ {
if (Plex.get().getMongoConnection().getDatastore() != null) if (Plex.get().getMongoConnection().getDatastore() != null)
{ {
PlexLog.log("Successfully enabled MongoDB!"); PlexLog.log("Successfully enabled MongoDB!");
} }
} }
} else }
else
{ {
if (Plex.get().getMongoConnection().getDatastore() != null) if (Plex.get().getMongoConnection().getDatastore() != null)
{ {
@ -173,7 +175,8 @@ public class PlexUtils implements PlexBase
try try
{ {
return ((TextComponent)component).content(); return ((TextComponent)component).content();
} catch (Exception e) }
catch (Exception e)
{ {
PlexLog.warn("Unable to get text of component", e.getLocalizedMessage()); PlexLog.warn("Unable to get text of component", e.getLocalizedMessage());
return ""; return "";
@ -192,7 +195,8 @@ public class PlexUtils implements PlexBase
} }
return builder.toString(); return builder.toString();
} catch (Exception e) }
catch (Exception e)
{ {
PlexLog.warn("Unable to get text of components", e.getLocalizedMessage()); PlexLog.warn("Unable to get text of components", e.getLocalizedMessage());
return ""; return "";

View File

@ -5,7 +5,6 @@ import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import dev.plex.Plex; import dev.plex.Plex;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.time.Instant; import java.time.Instant;
import java.time.ZoneId; import java.time.ZoneId;
@ -13,7 +12,8 @@ import java.time.ZonedDateTime;
public class ZonedDateTimeDeserializer implements JsonDeserializer<ZonedDateTime> public class ZonedDateTimeDeserializer implements JsonDeserializer<ZonedDateTime>
{ {
private static String TIMEZONE = Plex.get().config.getString("server.timezone"); private static final String TIMEZONE = Plex.get().config.getString("server.timezone");
@Override @Override
public ZonedDateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException public ZonedDateTime deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException
{ {

View File

@ -5,13 +5,13 @@ import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer; import com.google.gson.JsonSerializer;
import dev.plex.Plex; import dev.plex.Plex;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
public class ZonedDateTimeSerializer implements JsonSerializer<ZonedDateTime> public class ZonedDateTimeSerializer implements JsonSerializer<ZonedDateTime>
{ {
private static String TIMEZONE = Plex.get().config.getString("server.timezone"); private static final String TIMEZONE = Plex.get().config.getString("server.timezone");
@Override @Override
public JsonElement serialize(ZonedDateTime src, Type typeOfSrc, JsonSerializationContext context) public JsonElement serialize(ZonedDateTime src, Type typeOfSrc, JsonSerializationContext context)
{ {

View File

@ -5,7 +5,7 @@ import org.bukkit.event.Listener;
public abstract class AbstractMenu implements Listener public abstract class AbstractMenu implements Listener
{ {
private String name; private final String name;
public AbstractMenu(String name) public AbstractMenu(String name)
{ {

View File

@ -1,6 +1,7 @@
package dev.plex.util.minimessage; package dev.plex.util.minimessage;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.List;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.Context; import net.kyori.adventure.text.minimessage.Context;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
@ -11,8 +12,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List;
public class SafeMiniMessage public class SafeMiniMessage
{ {
public static final MiniMessage MINI_MESSAGE = MiniMessage.builder().tags(new SafeMiniMessageTagResolver()).build(); public static final MiniMessage MINI_MESSAGE = MiniMessage.builder().tags(new SafeMiniMessageTagResolver()).build();