mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-26 22:10:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed runtime configuration

Browse Source 
- Timeout overrides retain original values for restoration
- Timeout restoration preserves operator changes and symbolic links
- Tests cover timeout persistence and failed configuration writes
- Runtime targets use separate Gradle caches and shared module outputs
- Modded build inputs include test fixtures and runtime cache settings
This commit is contained in:
Brian Neumann-Fopiano committed 2026-10-18 18:15:46 -04:00
1 parent 64f7a7a9ac
commit b357eee181
10 files changed
+380 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/art/arcane/iris/pack/datapack/ServerConfiguratorTimeoutTest.java
+12 -7
View File
@@ -1,5 +1,6 @@
package art.arcane.iris.pack.datapack;
import art.arcane.iris.pack.datapack.ServerConfigurator.ServerTimeoutConfiguration;
import art.arcane.iris.spi.IrisLogging;
import org.bukkit.Bukkit;
import org.bukkit.Server;
@@ -41,7 +42,7 @@ public class ServerConfiguratorTimeoutTest {
return null;
});
ServerConfigurator.increaseKeepAliveSpigot(file, live);
ServerConfigurator.increaseKeepAliveSpigot(file, live, timeouts());
assertEquals(300L, live.getLong("settings.timeout-time"));
live.set("world-settings.default.sample-world-setting", true);
@@ -62,7 +63,7 @@ public class ServerConfiguratorTimeoutTest {
YamlConfiguration live = load(file);
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(file, live);
ServerConfigurator.increaseKeepAliveSpigot(file, live, timeouts());
assertEquals(600L, live.getLong("settings.timeout-time"));
assertEquals(original, Files.readString(file));
@@ -81,7 +82,7 @@ public class ServerConfiguratorTimeoutTest {
YamlConfiguration live = load(link);
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(link, live);
ServerConfigurator.increaseKeepAliveSpigot(link, live, timeouts());
assertTrue(Files.isSymbolicLink(link));
assertEquals(relativeTarget, Files.readSymbolicLink(link));
@@ -99,7 +100,7 @@ public class ServerConfiguratorTimeoutTest {
+ "misc:\n sample-setting: retained\n");
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increasePaperWatchdog(file);
ServerConfigurator.increasePaperWatchdog(file, timeouts());
YamlConfiguration persisted = load(file);
assertEquals(180000L, persisted.getLong("watchdog.early-warning-delay"));
@@ -117,7 +118,7 @@ public class ServerConfiguratorTimeoutTest {
Files.writeString(file, original);
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increasePaperWatchdog(file);
ServerConfigurator.increasePaperWatchdog(file, timeouts());
assertEquals(original, Files.readString(file));
logging.verifyNoInteractions();
@@ -131,7 +132,7 @@ public class ServerConfiguratorTimeoutTest {
Files.writeString(file, malformed);
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
assertThrows(InvalidConfigurationException.class, () -> ServerConfigurator.increasePaperWatchdog(file));
assertThrows(InvalidConfigurationException.class, () -> ServerConfigurator.increasePaperWatchdog(file, timeouts()));
assertEquals(malformed, Files.readString(file));
logging.verifyNoInteractions();
@@ -148,7 +149,7 @@ public class ServerConfiguratorTimeoutTest {
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
assertThrows(IOException.class, () -> ServerConfigurator.increaseKeepAliveSpigot(
blockedParent.resolve("spigot.yml"), live));
blockedParent.resolve("spigot.yml"), live, timeouts()));
assertEquals(60L, live.getLong("settings.timeout-time"));
assertEquals("retained", live.getString("settings.sample-setting"));
@@ -175,6 +176,10 @@ public class ServerConfiguratorTimeoutTest {
}
}
private ServerTimeoutConfiguration timeouts() {
return new ServerTimeoutConfiguration(temporaryFolder.getRoot().toPath().resolve("server-timeouts.json"));
}
private static YamlConfiguration load(Path file) throws IOException, InvalidConfigurationException {
YamlConfiguration configuration = new YamlConfiguration();
configuration.load(file.toFile());
core/src/test/java/art/arcane/iris/pack/datapack/ServerTimeoutConfigurationTest.java
+182
View File
@@ -0,0 +1,182 @@
package art.arcane.iris.pack.datapack;
import art.arcane.iris.pack.datapack.ServerConfigurator.ServerTimeoutConfiguration;
import art.arcane.iris.spi.IrisLogging;
import art.arcane.volmlib.util.io.AtomicFileIO;
import org.bukkit.configuration.file.YamlConfiguration;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.mockito.MockedStatic;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.mockStatic;
public class ServerTimeoutConfigurationTest {
private static final String SPIGOT_KEY = "settings.timeout-time";
private static final String PAPER_KEY = "watchdog.early-warning-delay";
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Test
public void originalValuesSurviveRestartsAndRestoreIndependently() throws Exception {
Path spigot = configuration("spigot.yml", "settings:\n timeout-time: 60\n");
Path paper = configuration("paper-global.yml", "watchdog:\n early-warning-delay: 10000\n early-warning-every: 5000\n");
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(spigot, load(spigot), timeouts());
ServerConfigurator.increasePaperWatchdog(paper, timeouts());
ServerConfigurator.increaseKeepAliveSpigot(spigot, load(spigot), timeouts());
YamlConfiguration live = load(spigot);
timeouts().restore(SPIGOT_KEY, spigot, live);
assertEquals(60L, load(spigot).getLong(SPIGOT_KEY));
assertEquals(60L, live.getLong(SPIGOT_KEY));
assertEquals(180000L, load(paper).getLong(PAPER_KEY));
live.set("settings.unrelated", true);
live.save(spigot.toFile());
assertEquals(60L, load(spigot).getLong(SPIGOT_KEY));
timeouts().restore(PAPER_KEY, null, null);
assertEquals(10000L, load(paper).getLong(PAPER_KEY));
assertEquals(5000L, load(paper).getLong("watchdog.early-warning-every"));
assertFalse(Files.readString(recoveryFile()).contains("spigot.yml"));
assertFalse(Files.readString(recoveryFile()).contains("paper-global.yml"));
}
}
@Test
public void restoringAbsentSettingRemovesTheOverride() throws Exception {
Path file = configuration("spigot.yml", "settings:\n unrelated: retained\n");
YamlConfiguration live = load(file);
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(file, live, timeouts());
timeouts().restore(SPIGOT_KEY, file, live);
assertFalse(load(file).isSet(SPIGOT_KEY));
assertFalse(live.isSet(SPIGOT_KEY));
assertEquals("retained", load(file).getString("settings.unrelated"));
}
}
@Test
public void restorePreservesOperatorChangesAndOtherSettings() throws Exception {
Path file = configuration("spigot.yml", "settings:\n timeout-time: 60\n");
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(file, load(file), timeouts());
Files.writeString(file, "# Operator settings\nsettings:\n timeout-time: 90\n unrelated: retained\n");
String changed = Files.readString(file);
timeouts().restore(SPIGOT_KEY, file, load(file));
assertEquals(changed, Files.readString(file));
ServerConfigurator.increaseKeepAliveSpigot(file, load(file), timeouts());
timeouts().restore(SPIGOT_KEY, file, load(file));
assertEquals(90L, load(file).getLong(SPIGOT_KEY));
assertEquals("retained", load(file).getString("settings.unrelated"));
}
}
@Test
public void symlinkSurvivesRaiseAndRestore() throws Exception {
Path target = configuration("shared-spigot.yml", "settings:\n timeout-time: 60\n");
Path link = temporaryFolder.getRoot().toPath().resolve("spigot.yml");
Files.createSymbolicLink(link, target.getFileName());
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(link, load(link), timeouts());
timeouts().restore(SPIGOT_KEY, link, load(link));
assertTrue(Files.isSymbolicLink(link));
assertEquals(60L, load(target).getLong(SPIGOT_KEY));
}
}
@Test
public void aLaterAdjustmentRecordsTheOperatorsNewOriginal() throws Exception {
Path file = configuration("spigot.yml", "settings:\n timeout-time: 60\n");
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(file, load(file), timeouts());
Files.writeString(file, "settings:\n timeout-time: 90\n");
ServerConfigurator.increaseKeepAliveSpigot(file, load(file), timeouts());
timeouts().restore(SPIGOT_KEY, file, load(file));
assertEquals(90L, load(file).getLong(SPIGOT_KEY));
}
}
@Test
public void failedRecoveryWriteLeavesServerSettingsUntouched() throws Exception {
Path file = configuration("spigot.yml", "settings:\n timeout-time: 60\n");
YamlConfiguration live = load(file);
Path blocked = temporaryFolder.newFile("blocked").toPath();
ServerTimeoutConfiguration timeouts = new ServerTimeoutConfiguration(blocked.resolve("server-timeouts.json"));
assertThrows(IOException.class, () -> timeouts.raise(file, live, SPIGOT_KEY, 300L));
assertEquals(60L, load(file).getLong(SPIGOT_KEY));
assertEquals(60L, live.getLong(SPIGOT_KEY));
}
@Test
public void failedServerWriteKeepsTheOriginalAndRestoresTheLiveValue() throws Exception {
Path file = configuration("spigot.yml", "settings:\n timeout-time: 60\n");
YamlConfiguration live = load(file);
try (MockedStatic<AtomicFileIO> writes = mockStatic(AtomicFileIO.class, CALLS_REAL_METHODS)) {
writes.when(() -> AtomicFileIO.writeString(eq(file.toRealPath()), anyString()))
.thenThrow(new IOException("blocked server write"));
assertThrows(IOException.class, () -> timeouts().raise(file, live, SPIGOT_KEY, 300L));
}
assertEquals(60L, load(file).getLong(SPIGOT_KEY));
assertEquals(60L, live.getLong(SPIGOT_KEY));
assertTrue(Files.readString(recoveryFile()).contains("\"original\": 60"));
}
@Test
public void interruptedRestoreRetriesWithoutOverwritingLaterOperatorEdits() throws Exception {
Path file = configuration("spigot.yml", "settings:\n timeout-time: 60\n");
try (MockedStatic<IrisLogging> logging = mockStatic(IrisLogging.class)) {
ServerConfigurator.increaseKeepAliveSpigot(file, load(file), timeouts());
try (MockedStatic<AtomicFileIO> writes = mockStatic(AtomicFileIO.class, CALLS_REAL_METHODS)) {
writes.when(() -> AtomicFileIO.writeString(eq(recoveryFile()), anyString()))
.thenThrow(new IOException("interrupted recovery write"));
assertThrows(IOException.class, () -> timeouts().restore(SPIGOT_KEY, file, load(file)));
}
assertEquals(60L, load(file).getLong(SPIGOT_KEY));
assertTrue(Files.readString(recoveryFile()).contains("spigot.yml"));
Files.writeString(file, "settings:\n timeout-time: 120\n");
timeouts().restore(SPIGOT_KEY, file, load(file));
assertEquals(120L, load(file).getLong(SPIGOT_KEY));
assertFalse(Files.readString(recoveryFile()).contains("spigot.yml"));
}
}
@Test
public void malformedRecoveryDataPreventsNewConfigurationWrites() throws Exception {
Path file = configuration("spigot.yml", "settings:\n timeout-time: 60\n");
Files.writeString(recoveryFile(), "{invalid");
assertThrows(IOException.class, () -> timeouts().raise(file, load(file), SPIGOT_KEY, 300L));
assertEquals(60L, load(file).getLong(SPIGOT_KEY));
assertEquals("{invalid", Files.readString(recoveryFile()));
}
private Path configuration(String name, String content) throws IOException {
Path file = temporaryFolder.newFile(name).toPath();
Files.writeString(file, content);
return file;
}
private ServerTimeoutConfiguration timeouts() {
return new ServerTimeoutConfiguration(recoveryFile());
}
private Path recoveryFile() {
return temporaryFolder.getRoot().toPath().resolve("server-timeouts.json");
}
private static YamlConfiguration load(Path file) throws Exception {
YamlConfiguration configuration = new YamlConfiguration();
configuration.load(file.toFile());
return configuration;
}
}