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

PlanConfig#getOrDefault

Browse Source
This commit is contained in:
Rsl1122 2019-02-28 17:46:23 +02:00
parent 233a930c9c
commit be8a3b484f
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/db/SQLDB.java
View File

@ -113,7 +113,7 @@ public abstract class SQLDB extends AbstractDatabase {
} }
transactionExecutor.shutdown(); transactionExecutor.shutdown();
try { try {
Long waitMs = config.get(TimeSettings.DB_TRANSACTION_FINISH_WAIT_DELAY); Long waitMs = config.getOrDefault(TimeSettings.DB_TRANSACTION_FINISH_WAIT_DELAY, TimeUnit.SECONDS.toMillis(20L));
if (!transactionExecutor.awaitTermination(waitMs, TimeUnit.MILLISECONDS)) { if (!transactionExecutor.awaitTermination(waitMs, TimeUnit.MILLISECONDS)) {
List<Runnable> unfinished = transactionExecutor.shutdownNow(); List<Runnable> unfinished = transactionExecutor.shutdownNow();
int unfinishedCount = unfinished.size(); int unfinishedCount = unfinished.size();

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

@ -19,6 +19,7 @@ package com.djrapitops.plan.system.settings.config;
import com.djrapitops.plan.data.plugin.PluginsConfigSection; import com.djrapitops.plan.data.plugin.PluginsConfigSection;
import com.djrapitops.plan.system.settings.paths.TimeSettings; 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.logging.console.PluginLogger;
import com.djrapitops.plugin.utilities.Verify; import com.djrapitops.plugin.utilities.Verify;
import javax.inject.Inject; import javax.inject.Inject;
@ -39,15 +40,18 @@ public class PlanConfig extends Config {
private final PluginsConfigSection pluginsConfigSection; private final PluginsConfigSection pluginsConfigSection;
private final WorldAliasSettings worldAliasSettings; private final WorldAliasSettings worldAliasSettings;
private final PluginLogger logger;
@Inject @Inject
public PlanConfig( public PlanConfig(
@Named("configFile") File file, @Named("configFile") File file,
WorldAliasSettings worldAliasSettings WorldAliasSettings worldAliasSettings,
PluginLogger logger
) { ) {
super(file); super(file);
this.worldAliasSettings = worldAliasSettings; this.worldAliasSettings = worldAliasSettings;
this.logger = logger;
pluginsConfigSection = new PluginsConfigSection(this); pluginsConfigSection = new PluginsConfigSection(this);
} }
@ -69,6 +73,15 @@ public class PlanConfig extends Config {
return value; return value;
} }
public <T> T getOrDefault(Setting<T> setting, T defaultValue) {
try {
return get(setting);
} catch (IllegalStateException e) {
logger.warn(e.getMessage() + ", using '" + defaultValue + "'");
return defaultValue;
}
}
public boolean isTrue(Setting<Boolean> setting) { public boolean isTrue(Setting<Boolean> setting) {
return get(setting); return get(setting);
} }

2
Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java
View File

@ -134,7 +134,7 @@ public class ConfigSettingKeyTest {
} }
private PlanConfig createConfig(File configFile) throws IOException { private PlanConfig createConfig(File configFile) throws IOException {
PlanConfig config = new PlanConfig(configFile, null); PlanConfig config = new PlanConfig(configFile, null, logger);
config.save(); config.save();
return config; return config;
} }

8
Plan/common/src/test/java/com/djrapitops/plan/system/settings/changes/ConfigUpdaterTest.java
View File

@ -84,7 +84,7 @@ class ConfigUpdaterTest {
Path config = tempDir.resolve("oldconfig.yml"); Path config = tempDir.resolve("oldconfig.yml");
Files.copy(oldConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING); Files.copy(oldConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
PlanConfig planConfig = new PlanConfig(config.toFile(), null); PlanConfig planConfig = new PlanConfig(config.toFile(), null, logger);
UNDER_TEST.applyConfigUpdate(planConfig); UNDER_TEST.applyConfigUpdate(planConfig);
@ -100,7 +100,7 @@ class ConfigUpdaterTest {
Path config = tempDir.resolve("oldconfig.yml"); Path config = tempDir.resolve("oldconfig.yml");
Files.copy(oldBungeeConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING); Files.copy(oldBungeeConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
PlanConfig planConfig = new PlanConfig(config.toFile(), null); PlanConfig planConfig = new PlanConfig(config.toFile(), null, logger);
UNDER_TEST.applyConfigUpdate(planConfig); UNDER_TEST.applyConfigUpdate(planConfig);
@ -122,7 +122,7 @@ class ConfigUpdaterTest {
Path config = tempDir.resolve("oldconfig.yml"); Path config = tempDir.resolve("oldconfig.yml");
Files.copy(oldConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING); Files.copy(oldConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
PlanConfig planConfig = new PlanConfig(config.toFile(), null); PlanConfig planConfig = new PlanConfig(config.toFile(), null, logger);
ConfigChange[] changes = UNDER_TEST.configEnhancementPatch(); ConfigChange[] changes = UNDER_TEST.configEnhancementPatch();
assertMoveChangesAreAppliedProperly(planConfig, changes); assertMoveChangesAreAppliedProperly(planConfig, changes);
@ -133,7 +133,7 @@ class ConfigUpdaterTest {
Path config = tempDir.resolve("oldconfig.yml"); Path config = tempDir.resolve("oldconfig.yml");
Files.copy(oldBungeeConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING); Files.copy(oldBungeeConfig.toPath(), config, StandardCopyOption.REPLACE_EXISTING);
PlanConfig planConfig = new PlanConfig(config.toFile(), null); PlanConfig planConfig = new PlanConfig(config.toFile(), null, logger);
ConfigChange[] changes = UNDER_TEST.configEnhancementPatch(); ConfigChange[] changes = UNDER_TEST.configEnhancementPatch();
assertMoveChangesAreAppliedProperly(planConfig, changes); assertMoveChangesAreAppliedProperly(planConfig, changes);