Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-10 01:11:34 +01:00
Code Issues Projects Releases Wiki Activity

Removed uses of PlanConfig#getString

Browse Source
This commit is contained in:
Rsl1122 2018-12-16 14:37:38 +02:00
parent bacfa2c181
commit 715111b433
24 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/bukkit/src/main/java/com/djrapitops/plan/system/database/BukkitDBSystem.java
View File

@ -61,7 +61,7 @@ public class BukkitDBSystem extends DBSystem {
@Override @Override
public void enable() throws EnableException { public void enable() throws EnableException {
String dbType = config.getString(DatabaseSettings.TYPE).toLowerCase().trim(); String dbType = config.get(DatabaseSettings.TYPE).toLowerCase().trim();
db = getActiveDatabaseByName(dbType); db = getActiveDatabaseByName(dbType);
super.enable(); super.enable();
} }

2
Plan/common/src/main/java/com/djrapitops/plan/data/store/containers/NetworkContainer.java
View File

@ -145,7 +145,7 @@ public class NetworkContainer extends DataContainer {
putCachingSupplier(NetworkKeys.NETWORK_NAME, () -> putCachingSupplier(NetworkKeys.NETWORK_NAME, () ->
Check.isBungeeAvailable() || Check.isVelocityAvailable() ? Check.isBungeeAvailable() || Check.isVelocityAvailable() ?
config.getString(ProxySettings.NETWORK_NAME) : config.get(ProxySettings.NETWORK_NAME) :
bungeeContainer.getValue(ServerKeys.NAME).orElse("Plan") bungeeContainer.getValue(ServerKeys.NAME).orElse("Plan")
); );
putSupplier(NetworkKeys.PLAYERS_ONLINE, serverProperties::getOnlinePlayers); putSupplier(NetworkKeys.PLAYERS_ONLINE, serverProperties::getOnlinePlayers);

4
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/H2DB.java
View File

@ -92,8 +92,8 @@ public class H2DB extends SQLDB {
} }
private Connection getConnectionFor(String dbFilePath) throws SQLException { private Connection getConnectionFor(String dbFilePath) throws SQLException {
String username = config.getString(DatabaseSettings.MYSQL_USER); String username = config.get(DatabaseSettings.MYSQL_USER);
String password = config.getString(DatabaseSettings.MYSQL_PASS); String password = config.get(DatabaseSettings.MYSQL_PASS);
JdbcDataSource jdbcDataSource = new JdbcDataSource(); JdbcDataSource jdbcDataSource = new JdbcDataSource();
jdbcDataSource.setURL("jdbc:h2:file:" + dbFilePath + ";mode=MySQL"); jdbcDataSource.setURL("jdbc:h2:file:" + dbFilePath + ";mode=MySQL");

12
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/MySQLDB.java
View File

@ -81,18 +81,18 @@ public class MySQLDB extends SQLDB {
try { try {
HikariConfig hikariConfig = new HikariConfig(); HikariConfig hikariConfig = new HikariConfig();
String host = config.getString(DatabaseSettings.MYSQL_HOST); String host = config.get(DatabaseSettings.MYSQL_HOST);
String port = config.getString(DatabaseSettings.MYSQL_PORT); String port = config.get(DatabaseSettings.MYSQL_PORT);
String database = config.getString(DatabaseSettings.MYSQL_DATABASE); String database = config.get(DatabaseSettings.MYSQL_DATABASE);
String launchOptions = config.getString(DatabaseSettings.MYSQL_LAUNCH_OPTIONS); String launchOptions = config.get(DatabaseSettings.MYSQL_LAUNCH_OPTIONS);
if (launchOptions.isEmpty() || !launchOptions.startsWith("?") || launchOptions.endsWith("&")) { if (launchOptions.isEmpty() || !launchOptions.startsWith("?") || launchOptions.endsWith("&")) {
launchOptions = "?rewriteBatchedStatements=true&useSSL=false"; launchOptions = "?rewriteBatchedStatements=true&useSSL=false";
logger.error(locale.getString(PluginLang.DB_MYSQL_LAUNCH_OPTIONS_FAIL, launchOptions)); logger.error(locale.getString(PluginLang.DB_MYSQL_LAUNCH_OPTIONS_FAIL, launchOptions));
} }
hikariConfig.setJdbcUrl("jdbc:mysql://" + host + ":" + port + "/" + database + launchOptions); hikariConfig.setJdbcUrl("jdbc:mysql://" + host + ":" + port + "/" + database + launchOptions);
String username = config.getString(DatabaseSettings.MYSQL_USER); String username = config.get(DatabaseSettings.MYSQL_USER);
String password = config.getString(DatabaseSettings.MYSQL_PASS); String password = config.get(DatabaseSettings.MYSQL_PASS);
hikariConfig.setUsername(username); hikariConfig.setUsername(username);
hikariConfig.setPassword(password); hikariConfig.setPassword(password);

4
Plan/common/src/main/java/com/djrapitops/plan/system/database/databases/sql/patches/Patch.java
View File

@ -66,7 +66,7 @@ public abstract class Patch {
public void prepare(PreparedStatement statement) throws SQLException { public void prepare(PreparedStatement statement) throws SQLException {
statement.setString(1, tableName); statement.setString(1, tableName);
if (secondParameter) { if (secondParameter) {
statement.setString(2, db.getConfig().getString(DatabaseSettings.MYSQL_DATABASE)); statement.setString(2, db.getConfig().get(DatabaseSettings.MYSQL_DATABASE));
} }
} }
@ -95,7 +95,7 @@ public abstract class Patch {
statement.setString(1, tableName); statement.setString(1, tableName);
statement.setString(2, columnName); statement.setString(2, columnName);
if (dbType != DBType.H2) { if (dbType != DBType.H2) {
statement.setString(3, db.getConfig().getString(DatabaseSettings.MYSQL_DATABASE)); statement.setString(3, db.getConfig().get(DatabaseSettings.MYSQL_DATABASE));
} }
} }

4
Plan/common/src/main/java/com/djrapitops/plan/system/info/server/ServerServerInfo.java
View File

@ -91,7 +91,7 @@ public class ServerServerInfo extends ServerInfo {
if (!serverID.isPresent()) { if (!serverID.isPresent()) {
return registerServer(serverUUID); return registerServer(serverUUID);
} }
String name = config.getString(PluginSettings.SERVER_NAME).replaceAll("[^a-zA-Z0-9_\\s]", "_"); String name = config.get(PluginSettings.SERVER_NAME).replaceAll("[^a-zA-Z0-9_\\s]", "_");
String webAddress = webServer.get().getAccessAddress(); String webAddress = webServer.get().getAccessAddress();
if ("plan".equalsIgnoreCase(name)) { if ("plan".equalsIgnoreCase(name)) {
name = "Server " + serverID.get(); name = "Server " + serverID.get();
@ -109,7 +109,7 @@ public class ServerServerInfo extends ServerInfo {
private Server registerServer(UUID serverUUID) throws IOException { private Server registerServer(UUID serverUUID) throws IOException {
String webAddress = webServer.get().getAccessAddress(); String webAddress = webServer.get().getAccessAddress();
String name = config.getString(PluginSettings.SERVER_NAME).replaceAll("[^a-zA-Z0-9_\\s]", "_"); String name = config.get(PluginSettings.SERVER_NAME).replaceAll("[^a-zA-Z0-9_\\s]", "_");
int maxPlayers = serverProperties.getMaxPlayers(); int maxPlayers = serverProperties.getMaxPlayers();
Server server = new Server(-1, serverUUID, name, webAddress, maxPlayers); Server server = new Server(-1, serverUUID, name, webAddress, maxPlayers);

4
Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java
View File

@ -130,12 +130,12 @@ public class LocaleSystem implements SubSystem {
private Optional<Locale> loadSettingLocale() { private Optional<Locale> loadSettingLocale() {
try { try {
String setting = config.getString(PluginSettings.LOCALE); String setting = config.get(PluginSettings.LOCALE);
if (!setting.equalsIgnoreCase("default")) { if (!setting.equalsIgnoreCase("default")) {
return Optional.of(Locale.forLangCodeString(plugin, setting)); return Optional.of(Locale.forLangCodeString(plugin, setting));
} }
} catch (IOException e) { } catch (IOException e) {
logger.warn("Failed to read locale from jar: " + config.getString(PluginSettings.LOCALE) + ", " + e.toString()); logger.warn("Failed to read locale from jar: " + config.get(PluginSettings.LOCALE) + ", " + e.toString());
logger.warn("Using Default Locale as a fallback (EN)"); logger.warn("Using Default Locale as a fallback (EN)");
} }
return Optional.empty(); return Optional.empty();

2
Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigSystem.java
View File

@ -82,7 +82,7 @@ public abstract class ConfigSystem implements SubSystem {
} }
private void setDebugMode() { private void setDebugMode() {
String debugMode = config.getString(PluginSettings.DEBUG); String debugMode = config.get(PluginSettings.DEBUG);
List<DebugLogger> loggers = new ArrayList<>(); List<DebugLogger> loggers = new ArrayList<>();
if (Verify.equalsOne(debugMode, "true", "both", "console")) { if (Verify.equalsOne(debugMode, "true", "both", "console")) {

8
Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/PlanConfig.java
View File

@ -23,6 +23,7 @@ import com.djrapitops.plan.system.settings.paths.TimeSettings;
import com.djrapitops.plan.system.settings.paths.key.Setting; import com.djrapitops.plan.system.settings.paths.key.Setting;
import com.djrapitops.plugin.config.Config; import com.djrapitops.plugin.config.Config;
import com.djrapitops.plugin.config.ConfigNode; import com.djrapitops.plugin.config.ConfigNode;
import com.djrapitops.plugin.utilities.Verify;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
@ -69,10 +70,9 @@ public class PlanConfig extends Config {
public <T> T get(Setting<T> setting) { public <T> T get(Setting<T> setting) {
T value = setting.getValueFrom(this); T value = setting.getValueFrom(this);
boolean valid = setting.isValid(value); Verify.isTrue(setting.isValid(value), () -> new IllegalStateException(
if (!valid) { "Config value for " + setting.getPath() + " has a bad value: '" + value + "'"
throw new IllegalStateException("Config value for " + setting.getPath() + " has a bad value: '" + value + "'"); ));
}
return value; return value;
} }

18
Plan/common/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java
View File

@ -133,10 +133,10 @@ public class WebServer implements SubSystem {
if (!usingHttps) { if (!usingHttps) {
logger.log(L.INFO_COLOR, "§e" + locale.getString(PluginLang.WEB_SERVER_NOTIFY_HTTP_USER_AUTH)); logger.log(L.INFO_COLOR, "§e" + locale.getString(PluginLang.WEB_SERVER_NOTIFY_HTTP_USER_AUTH));
server = HttpServer.create(new InetSocketAddress(config.getString(WebserverSettings.INTERNAL_IP), port), 10); server = HttpServer.create(new InetSocketAddress(config.get(WebserverSettings.INTERNAL_IP), port), 10);
} else if (server == null) { } else if (server == null) {
logger.log(L.INFO_COLOR, "§eWebServer: Proxy HTTPS Override enabled. HTTP Server in use, make sure that your Proxy webserver is routing with HTTPS and AlternativeIP.Link points to the Proxy"); logger.log(L.INFO_COLOR, "§eWebServer: Proxy HTTPS Override enabled. HTTP Server in use, make sure that your Proxy webserver is routing with HTTPS and AlternativeIP.Link points to the Proxy");
server = HttpServer.create(new InetSocketAddress(config.getString(WebserverSettings.INTERNAL_IP), port), 10); server = HttpServer.create(new InetSocketAddress(config.get(WebserverSettings.INTERNAL_IP), port), 10);
} }
server.createContext("/", requestHandler); server.createContext("/", requestHandler);
@ -157,7 +157,7 @@ public class WebServer implements SubSystem {
} }
private boolean startHttpsServer() { private boolean startHttpsServer() {
String keyStorePath = config.getString(WebserverSettings.CERTIFICATE_PATH); String keyStorePath = config.get(WebserverSettings.CERTIFICATE_PATH);
if (keyStorePath.equalsIgnoreCase("proxy")) { if (keyStorePath.equalsIgnoreCase("proxy")) {
return true; return true;
@ -172,9 +172,9 @@ public class WebServer implements SubSystem {
errorHandler.log(L.ERROR, this.getClass(), e); errorHandler.log(L.ERROR, this.getClass(), e);
} }
char[] storepass = config.getString(WebserverSettings.CERTIFICATE_STOREPASS).toCharArray(); char[] storepass = config.get(WebserverSettings.CERTIFICATE_STOREPASS).toCharArray();
char[] keypass = config.getString(WebserverSettings.CERTIFICATE_KEYPASS).toCharArray(); char[] keypass = config.get(WebserverSettings.CERTIFICATE_KEYPASS).toCharArray();
String alias = config.getString(WebserverSettings.CERTIFICATE_ALIAS); String alias = config.get(WebserverSettings.CERTIFICATE_ALIAS);
boolean startSuccessful = false; boolean startSuccessful = false;
try (FileInputStream fIn = new FileInputStream(keyStorePath)) { try (FileInputStream fIn = new FileInputStream(keyStorePath)) {
@ -195,7 +195,7 @@ public class WebServer implements SubSystem {
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("SunX509"); TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("SunX509");
trustManagerFactory.init(keystore); trustManagerFactory.init(keystore);
server = HttpsServer.create(new InetSocketAddress(config.getString(WebserverSettings.INTERNAL_IP), port), 10); server = HttpsServer.create(new InetSocketAddress(config.get(WebserverSettings.INTERNAL_IP), port), 10);
SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
sslContext.init(keyManagerFactory.getKeyManagers(), null/*trustManagerFactory.getTrustManagers()*/, null); sslContext.init(keyManagerFactory.getKeyManagers(), null/*trustManagerFactory.getTrustManagers()*/, null);
@ -281,12 +281,12 @@ public class WebServer implements SubSystem {
} }
public String getAccessAddress() { public String getAccessAddress() {
return isEnabled() ? getProtocol() + "://" + getIP() : config.getString(WebserverSettings.EXTERNAL_LINK); return isEnabled() ? getProtocol() + "://" + getIP() : config.get(WebserverSettings.EXTERNAL_LINK);
} }
private String getIP() { private String getIP() {
return config.isTrue(WebserverSettings.SHOW_ALTERNATIVE_IP) return config.isTrue(WebserverSettings.SHOW_ALTERNATIVE_IP)
? config.getString(WebserverSettings.ALTERNATIVE_IP).replace("%port%", String.valueOf(port)) ? config.get(WebserverSettings.ALTERNATIVE_IP).replace("%port%", String.valueOf(port))
: serverProperties.getIp() + ":" + port; : serverProperties.getIp() + ":" + port;
} }
} }

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/DecimalFormatter.java
View File

@ -37,6 +37,6 @@ public class DecimalFormatter implements Formatter<Double> {
@Override @Override
public String apply(Double value) { public String apply(Double value) {
// DecimalFormat is initialized here because config is not fully enabled in the constructor // DecimalFormat is initialized here because config is not fully enabled in the constructor
return new DecimalFormat(config.getString(FormatSettings.DECIMALS)).format(value); return new DecimalFormat(config.get(FormatSettings.DECIMALS)).format(value);
} }
} }

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/ClockFormatter.java
View File

@ -37,7 +37,7 @@ public class ClockFormatter extends DateFormatter {
} }
private String format(Long date) { private String format(Long date) {
String format = config.getString(FormatSettings.DATE_CLOCK); String format = config.get(FormatSettings.DATE_CLOCK);
return format(date, format); return format(date, format);
} }

4
Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java
View File

@ -48,7 +48,7 @@ public abstract class DateFormatter implements Formatter<Long> {
protected String format(long epochMs, String format) { protected String format(long epochMs, String format) {
boolean useServerTime = config.isTrue(TimeSettings.USE_SERVER_TIME); boolean useServerTime = config.isTrue(TimeSettings.USE_SERVER_TIME);
String localeSetting = config.getString(PluginSettings.LOCALE); String localeSetting = config.get(PluginSettings.LOCALE);
java.util.Locale usedLocale = localeSetting.equalsIgnoreCase("default") java.util.Locale usedLocale = localeSetting.equalsIgnoreCase("default")
? java.util.Locale.ENGLISH ? java.util.Locale.ENGLISH
: java.util.Locale.forLanguageTag(localeSetting); : java.util.Locale.forLanguageTag(localeSetting);
@ -59,7 +59,7 @@ public abstract class DateFormatter implements Formatter<Long> {
} }
protected String replaceRecentDays(long epochMs, String format) { protected String replaceRecentDays(long epochMs, String format) {
return replaceRecentDays(epochMs, format, config.getString(FormatSettings.DATE_RECENT_DAYS_PATTERN)); return replaceRecentDays(epochMs, format, config.get(FormatSettings.DATE_RECENT_DAYS_PATTERN));
} }
protected String replaceRecentDays(long epochMs, String format, String pattern) { protected String replaceRecentDays(long epochMs, String format, String pattern) {

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/SecondFormatter.java
View File

@ -37,7 +37,7 @@ public class SecondFormatter extends DateFormatter {
} }
private String format(Long date) { private String format(Long date) {
String format = config.getString(FormatSettings.DATE_FULL); String format = config.get(FormatSettings.DATE_FULL);
if (config.isTrue(FormatSettings.DATE_RECENT_DAYS)) { if (config.isTrue(FormatSettings.DATE_RECENT_DAYS)) {
format = replaceRecentDays(date, format); format = replaceRecentDays(date, format);

20
Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/TimeAmountFormatter.java
View File

@ -66,9 +66,9 @@ public class TimeAmountFormatter implements Formatter<Long> {
appendMonths(builder, months); appendMonths(builder, months);
appendDays(builder, days); appendDays(builder, days);
String hourFormat = config.getString(FormatSettings.HOURS); String hourFormat = config.get(FormatSettings.HOURS);
String minuteFormat = config.getString(FormatSettings.MINUTES); String minuteFormat = config.get(FormatSettings.MINUTES);
String secondFormat = config.getString(FormatSettings.SECONDS); String secondFormat = config.get(FormatSettings.SECONDS);
appendHours(builder, hours, hourFormat); appendHours(builder, hours, hourFormat);
appendMinutes(builder, minutes, hours, hourFormat, minuteFormat); appendMinutes(builder, minutes, hours, hourFormat, minuteFormat);
@ -76,7 +76,7 @@ public class TimeAmountFormatter implements Formatter<Long> {
String formattedTime = StringUtils.remove(builder.toString(), ZERO_PH); String formattedTime = StringUtils.remove(builder.toString(), ZERO_PH);
if (formattedTime.isEmpty()) { if (formattedTime.isEmpty()) {
return config.getString(FormatSettings.ZERO_SECONDS); return config.get(FormatSettings.ZERO_SECONDS);
} }
return formattedTime; return formattedTime;
} }
@ -124,21 +124,21 @@ public class TimeAmountFormatter implements Formatter<Long> {
} }
private void appendDays(StringBuilder builder, long days) { private void appendDays(StringBuilder builder, long days) {
String singular = config.getString(FormatSettings.DAY); String singular = config.get(FormatSettings.DAY);
String plural = config.getString(FormatSettings.DAYS); String plural = config.get(FormatSettings.DAYS);
appendValue(builder, days, singular, plural, DAYS_PH); appendValue(builder, days, singular, plural, DAYS_PH);
} }
private void appendMonths(StringBuilder builder, long months) { private void appendMonths(StringBuilder builder, long months) {
String singular = config.getString(FormatSettings.MONTH); String singular = config.get(FormatSettings.MONTH);
String plural = config.getString(FormatSettings.MONTHS); String plural = config.get(FormatSettings.MONTHS);
appendValue(builder, months, singular, plural, MONTHS_PH); appendValue(builder, months, singular, plural, MONTHS_PH);
} }
private void appendYears(StringBuilder builder, long years) { private void appendYears(StringBuilder builder, long years) {
String singular = config.getString(FormatSettings.YEAR); String singular = config.get(FormatSettings.YEAR);
String plural = config.getString(FormatSettings.YEARS); String plural = config.get(FormatSettings.YEARS);
appendValue(builder, years, singular, plural, YEARS_PH); appendValue(builder, years, singular, plural, YEARS_PH);
} }

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/YearFormatter.java
View File

@ -37,7 +37,7 @@ public class YearFormatter extends DateFormatter {
} }
private String format(Long date) { private String format(Long date) {
String format = config.getString(FormatSettings.DATE_NO_SECONDS); String format = config.get(FormatSettings.DATE_NO_SECONDS);
if (config.isTrue(FormatSettings.DATE_RECENT_DAYS)) { if (config.isTrue(FormatSettings.DATE_RECENT_DAYS)) {
format = replaceRecentDays(date, format); format = replaceRecentDays(date, format);

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java
View File

@ -249,7 +249,7 @@ public class InspectPage implements Page {
String serverName = serverNames.get(serverUUID); String serverName = serverNames.get(serverUUID);
replacer.put("networkName", replacer.put("networkName",
serverName.equalsIgnoreCase("bungeecord") serverName.equalsIgnoreCase("bungeecord")
? config.getString(ProxySettings.NETWORK_NAME) ? config.get(ProxySettings.NETWORK_NAME)
: serverName : serverName
); );

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PlayersPage.java
View File

@ -76,7 +76,7 @@ public class PlayersPage implements Page {
if (Check.isBukkitAvailable()) { if (Check.isBukkitAvailable()) {
placeholderReplacer.put("networkName", serverInfo.getServer().getName()); placeholderReplacer.put("networkName", serverInfo.getServer().getName());
} else { } else {
placeholderReplacer.put("networkName", config.getString(ProxySettings.NETWORK_NAME)); placeholderReplacer.put("networkName", config.get(ProxySettings.NETWORK_NAME));
} }
timings.start("Players page players table parsing"); timings.start("Players page players table parsing");

2
Plan/common/src/test/java/com/djrapitops/plan/data/store/mutators/formatting/DecimalFormatterTest.java
View File

@ -22,7 +22,7 @@ public class DecimalFormatterTest {
@Before @Before
public void setUp() { public void setUp() {
PlanConfig config = Mockito.mock(PlanConfig.class); PlanConfig config = Mockito.mock(PlanConfig.class);
when(config.getString(FormatSettings.DECIMALS)).thenReturn("#.##"); when(config.get(FormatSettings.DECIMALS)).thenReturn("#.##");
underTest = new DecimalFormatter(config); underTest = new DecimalFormatter(config);
} }

24
Plan/common/src/test/java/com/djrapitops/plan/data/store/mutators/formatting/TimeAmountFormatterDefaultTest.java
View File

@ -24,18 +24,18 @@ public class TimeAmountFormatterDefaultTest {
@BeforeClass @BeforeClass
public static void setUpClass() { public static void setUpClass() {
PlanConfig config = Mockito.mock(PlanConfig.class); PlanConfig config = Mockito.mock(PlanConfig.class);
when(config.getString(FormatSettings.YEAR)).thenReturn("1 year, "); when(config.get(FormatSettings.YEAR)).thenReturn("1 year, ");
when(config.getString(FormatSettings.YEARS)).thenReturn("%years% years, "); when(config.get(FormatSettings.YEARS)).thenReturn("%years% years, ");
when(config.getString(FormatSettings.MONTH)).thenReturn("1 month, "); when(config.get(FormatSettings.MONTH)).thenReturn("1 month, ");
when(config.getString(FormatSettings.YEAR)).thenReturn("1 year, "); when(config.get(FormatSettings.YEAR)).thenReturn("1 year, ");
when(config.getString(FormatSettings.MONTH)).thenReturn("1 month, "); when(config.get(FormatSettings.MONTH)).thenReturn("1 month, ");
when(config.getString(FormatSettings.MONTHS)).thenReturn("%months% months, "); when(config.get(FormatSettings.MONTHS)).thenReturn("%months% months, ");
when(config.getString(FormatSettings.DAY)).thenReturn("1d "); when(config.get(FormatSettings.DAY)).thenReturn("1d ");
when(config.getString(FormatSettings.DAYS)).thenReturn("%days%d "); when(config.get(FormatSettings.DAYS)).thenReturn("%days%d ");
when(config.getString(FormatSettings.HOURS)).thenReturn("%hours%h "); when(config.get(FormatSettings.HOURS)).thenReturn("%hours%h ");
when(config.getString(FormatSettings.MINUTES)).thenReturn("%minutes%m "); when(config.get(FormatSettings.MINUTES)).thenReturn("%minutes%m ");
when(config.getString(FormatSettings.SECONDS)).thenReturn("%seconds%s"); when(config.get(FormatSettings.SECONDS)).thenReturn("%seconds%s");
when(config.getString(FormatSettings.ZERO_SECONDS)).thenReturn("0s"); when(config.get(FormatSettings.ZERO_SECONDS)).thenReturn("0s");
underTest = new TimeAmountFormatter(config); underTest = new TimeAmountFormatter(config);
} }

20
Plan/common/src/test/java/com/djrapitops/plan/data/store/mutators/formatting/TimeAmountFormatterExtraZerosTest.java
View File

@ -24,16 +24,16 @@ public class TimeAmountFormatterExtraZerosTest {
@BeforeClass @BeforeClass
public static void setUpClass() { public static void setUpClass() {
PlanConfig config = Mockito.mock(PlanConfig.class); PlanConfig config = Mockito.mock(PlanConfig.class);
when(config.getString(FormatSettings.YEAR)).thenReturn("1 year, "); when(config.get(FormatSettings.YEAR)).thenReturn("1 year, ");
when(config.getString(FormatSettings.YEARS)).thenReturn("%years% years, "); when(config.get(FormatSettings.YEARS)).thenReturn("%years% years, ");
when(config.getString(FormatSettings.MONTH)).thenReturn("1 month, "); when(config.get(FormatSettings.MONTH)).thenReturn("1 month, ");
when(config.getString(FormatSettings.MONTHS)).thenReturn("%months% months, "); when(config.get(FormatSettings.MONTHS)).thenReturn("%months% months, ");
when(config.getString(FormatSettings.DAY)).thenReturn("1d "); when(config.get(FormatSettings.DAY)).thenReturn("1d ");
when(config.getString(FormatSettings.DAYS)).thenReturn("%days%d "); when(config.get(FormatSettings.DAYS)).thenReturn("%days%d ");
when(config.getString(FormatSettings.HOURS)).thenReturn("%zero%%hours%:"); when(config.get(FormatSettings.HOURS)).thenReturn("%zero%%hours%:");
when(config.getString(FormatSettings.MINUTES)).thenReturn("%hours%%zero%%minutes%:"); when(config.get(FormatSettings.MINUTES)).thenReturn("%hours%%zero%%minutes%:");
when(config.getString(FormatSettings.SECONDS)).thenReturn("%minutes%%zero%%seconds%"); when(config.get(FormatSettings.SECONDS)).thenReturn("%minutes%%zero%%seconds%");
when(config.getString(FormatSettings.ZERO_SECONDS)).thenReturn("00:00:00"); when(config.get(FormatSettings.ZERO_SECONDS)).thenReturn("00:00:00");
underTest = new TimeAmountFormatter(config); underTest = new TimeAmountFormatter(config);
} }

2
Plan/common/src/test/java/utilities/dagger/PluginSuperClassBindingModule.java
View File

@ -59,7 +59,7 @@ public class PluginSuperClassBindingModule {
@Override @Override
public void enable() throws EnableException { public void enable() throws EnableException {
databases.add(sqLiteDB.usingDefaultFile()); databases.add(sqLiteDB.usingDefaultFile());
String dbType = config.getString(DatabaseSettings.TYPE).toLowerCase().trim(); String dbType = config.get(DatabaseSettings.TYPE).toLowerCase().trim();
db = getActiveDatabaseByName(dbType); db = getActiveDatabaseByName(dbType);
super.enable(); super.enable();
} }

2
Plan/sponge/src/main/java/com/djrapitops/plan/system/database/SpongeDBSystem.java
View File

@ -61,7 +61,7 @@ public class SpongeDBSystem extends DBSystem {
@Override @Override
public void enable() throws EnableException { public void enable() throws EnableException {
String dbType = config.getString(DatabaseSettings.TYPE).toLowerCase().trim(); String dbType = config.get(DatabaseSettings.TYPE).toLowerCase().trim();
db = getActiveDatabaseByName(dbType); db = getActiveDatabaseByName(dbType);
super.enable(); super.enable();
} }

12
Plan/sponge/src/main/java/com/djrapitops/plan/system/database/databases/sql/SpongeMySQLDB.java
View File

@ -63,18 +63,18 @@ public class SpongeMySQLDB extends MySQLDB {
return; return;
} }
String host = config.getString(DatabaseSettings.MYSQL_HOST); String host = config.get(DatabaseSettings.MYSQL_HOST);
String port = config.getString(DatabaseSettings.MYSQL_PORT); String port = config.get(DatabaseSettings.MYSQL_PORT);
String database = config.getString(DatabaseSettings.MYSQL_DATABASE); String database = config.get(DatabaseSettings.MYSQL_DATABASE);
String launchOptions = config.getString(DatabaseSettings.MYSQL_LAUNCH_OPTIONS); String launchOptions = config.get(DatabaseSettings.MYSQL_LAUNCH_OPTIONS);
if (launchOptions.isEmpty() || !launchOptions.startsWith("?") || launchOptions.endsWith("&")) { if (launchOptions.isEmpty() || !launchOptions.startsWith("?") || launchOptions.endsWith("&")) {
logger.error("Launch Options were faulty, using default (?rewriteBatchedStatements=true&useSSL=false)"); logger.error("Launch Options were faulty, using default (?rewriteBatchedStatements=true&useSSL=false)");
launchOptions = "?rewriteBatchedStatements=true&useSSL=false"; launchOptions = "?rewriteBatchedStatements=true&useSSL=false";
} }
String url = host + ":" + port + "/" + database + launchOptions; String url = host + ":" + port + "/" + database + launchOptions;
String username = config.getString(DatabaseSettings.MYSQL_USER); String username = config.get(DatabaseSettings.MYSQL_USER);
String password = config.getString(DatabaseSettings.MYSQL_PASS); String password = config.get(DatabaseSettings.MYSQL_PASS);
try { try {
this.dataSource = sqlServiceProvider.get().getDataSource( this.dataSource = sqlServiceProvider.get().getDataSource(
"jdbc:mysql://" + username + ":" + password + "@" + url "jdbc:mysql://" + username + ":" + password + "@" + url