diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/backgroundtask/VotingPluginBackgroundTaskTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/backgroundtask/VotingPluginBackgroundTaskTest.java index 817b7f4c4..a3be3ceb8 100644 --- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/backgroundtask/VotingPluginBackgroundTaskTest.java +++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/backgroundtask/VotingPluginBackgroundTaskTest.java @@ -95,8 +95,8 @@ public void retiredFoliaPlayerStillCompletesOnlineSnapshot() { VotingPluginMain plugin = mock(VotingPluginMain.class, CALLS_REAL_METHODS); BukkitScheduler scheduler = mock(BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation implementation = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler implementation = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); org.bukkit.entity.Player player = mock(org.bukkit.entity.Player.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); when(scheduler.getFoliaLib()).thenReturn(folia); diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/commands/CommandLoaderSchedulingTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/commands/CommandLoaderSchedulingTest.java index 88603b67d..e43d88da9 100644 --- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/commands/CommandLoaderSchedulingTest.java +++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/commands/CommandLoaderSchedulingTest.java @@ -22,7 +22,7 @@ import com.bencodez.simpleapi.scheduler.BukkitScheduler; import com.bencodez.simpleapi.folialib.FoliaLib; -import com.bencodez.simpleapi.folialib.impl.ServerImplementation; +import com.bencodez.simpleapi.folialib.impl.PlatformScheduler; import com.bencodez.votingplugin.VotingPluginMain; import com.bencodez.votingplugin.config.Config; import com.bencodez.votingplugin.user.PointTransferResult; @@ -211,7 +211,7 @@ void bulkUserPlayerLookupYieldsBetweenBoundedPlatformBatches() { private static void configureEntityScheduler(BukkitScheduler scheduler) { FoliaLib folia = mock(FoliaLib.class); - ServerImplementation entityScheduler = mock(ServerImplementation.class); + PlatformScheduler entityScheduler = mock(PlatformScheduler.class); when(scheduler.getFoliaLib()).thenReturn(folia); when(folia.getImpl()).thenReturn(entityScheduler); when(entityScheduler.runAtEntityWithFallback(any(), any(), any(Runnable.class))) diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/placeholders/PlaceHoldersWorkerSafetyTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/placeholders/PlaceHoldersWorkerSafetyTest.java index 5def5072a..98c19219a 100644 --- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/placeholders/PlaceHoldersWorkerSafetyTest.java +++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/placeholders/PlaceHoldersWorkerSafetyTest.java @@ -39,7 +39,7 @@ import com.bencodez.advancedcore.api.user.AdvancedCoreUser; import com.bencodez.advancedcore.api.user.usercache.UserDataManager; import com.bencodez.simpleapi.folialib.FoliaLib; -import com.bencodez.simpleapi.folialib.impl.ServerImplementation; +import com.bencodez.simpleapi.folialib.impl.PlatformScheduler; import com.bencodez.simpleapi.scheduler.BukkitScheduler; import com.bencodez.votingplugin.VotingPluginMain; import com.bencodez.votingplugin.config.Config; @@ -225,7 +225,7 @@ void retiredEntityFallsBackToOfflineWorkerUpdate() { PlaceHoldersAccess.publishUserDataChangePlaceholders(fixture.placeholders); fixture.presence.playerOnline(fixture.player); FoliaLib folia = mock(FoliaLib.class); - ServerImplementation entityScheduler = mock(ServerImplementation.class); + PlatformScheduler entityScheduler = mock(PlatformScheduler.class); when(fixture.scheduler.getFoliaLib()).thenReturn(folia); when(folia.getImpl()).thenReturn(entityScheduler); when(entityScheduler.runAtEntityWithFallback(eq(fixture.player), any(), any(Runnable.class))) diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/reminders/VoteRemindersManagerTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/reminders/VoteRemindersManagerTest.java index 856caf40c..ebfcb880d 100644 --- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/reminders/VoteRemindersManagerTest.java +++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/reminders/VoteRemindersManagerTest.java @@ -36,7 +36,7 @@ import com.bencodez.simpleapi.time.ParsedDuration; import com.bencodez.simpleapi.scheduler.BukkitScheduler; import com.bencodez.simpleapi.folialib.FoliaLib; -import com.bencodez.simpleapi.folialib.impl.ServerImplementation; +import com.bencodez.simpleapi.folialib.impl.PlatformScheduler; import com.bencodez.advancedcore.api.rewards.RewardBuilder; import com.bencodez.votingplugin.VotingPluginMain; import com.bencodez.votingplugin.data.ServerData; @@ -258,7 +258,7 @@ void reminderDeliveryReleasesReservationsWhenTheEntitySchedulerRetires() throws VoteReminderCooldownStore store = mock(VoteReminderCooldownStore.class); BukkitScheduler scheduler = mock(BukkitScheduler.class); FoliaLib folia = mock(FoliaLib.class); - ServerImplementation implementation = mock(ServerImplementation.class); + PlatformScheduler implementation = mock(PlatformScheduler.class); Player player = mock(Player.class); PlaceholderPlayerPresence presence = new PlaceholderPlayerPresence(); UUID uuid = UUID.randomUUID(); diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/user/VotingPluginUserPointSchedulingTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/user/VotingPluginUserPointSchedulingTest.java index d0512ce02..d3206a359 100644 --- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/user/VotingPluginUserPointSchedulingTest.java +++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/user/VotingPluginUserPointSchedulingTest.java @@ -61,7 +61,7 @@ import com.bencodez.simpleapi.sql.mysql.ConnectionManager; import com.bencodez.simpleapi.scheduler.BukkitScheduler; import com.bencodez.simpleapi.folialib.FoliaLib; -import com.bencodez.simpleapi.folialib.impl.ServerImplementation; +import com.bencodez.simpleapi.folialib.impl.PlatformScheduler; import com.bencodez.votingplugin.VotingPluginMain; import com.bencodez.votingplugin.events.PlayerReceivePointsEvent; @@ -1967,7 +1967,7 @@ void sharedTransferClosesReservationBeforeListenerDatabaseReadAndSettlesAdjustme /** Runs the gate, off-thread journal claim, and Bukkit approval callback in order. */ private static void runTransferApprovalGate(ScheduledExecutorService persistence, BukkitScheduler scheduler, - VotingPluginMain plugin, ServerImplementation entityScheduler, Player player) { + VotingPluginMain plugin, PlatformScheduler entityScheduler, Player player) { ArgumentCaptor gate = ArgumentCaptor.forClass(Runnable.class); verify(scheduler).runTask(eq(plugin), gate.capture()); gate.getValue().run(); @@ -2106,9 +2106,9 @@ private static SagaFixture sagaFixture(boolean debitSucceeds) throws Exception { return fixture; } - private static ServerImplementation configureEntityScheduler(VotingPluginMain plugin, BukkitScheduler scheduler) { + private static PlatformScheduler configureEntityScheduler(VotingPluginMain plugin, BukkitScheduler scheduler) { FoliaLib folia = mock(FoliaLib.class); - ServerImplementation entityScheduler = mock(ServerImplementation.class); + PlatformScheduler entityScheduler = mock(PlatformScheduler.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); when(scheduler.getFoliaLib()).thenReturn(folia); when(folia.getImpl()).thenReturn(entityScheduler); @@ -2223,7 +2223,7 @@ private static final class PointFixture { VotingPluginMain plugin; ScheduledExecutorService persistence; BukkitScheduler scheduler; - ServerImplementation entityScheduler; + PlatformScheduler entityScheduler; Player player; Player targetPlayer; MySQL table; @@ -2237,7 +2237,7 @@ private static final class SagaFixture { VotingPluginMain plugin; ScheduledExecutorService persistence; BukkitScheduler scheduler; - ServerImplementation entityScheduler; + PlatformScheduler entityScheduler; Player player; Player targetPlayer; MySQL table; @@ -2263,7 +2263,7 @@ private static final class TransferSchedulingFixture { VotingPluginMain plugin; ScheduledExecutorService persistence; BukkitScheduler scheduler; - ServerImplementation entityScheduler; + PlatformScheduler entityScheduler; Player player; Player targetPlayer; MySQL table; diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/util/BukkitCompletionSchedulerTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/util/BukkitCompletionSchedulerTest.java index a899bda66..cf2bffa03 100644 --- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/util/BukkitCompletionSchedulerTest.java +++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/util/BukkitCompletionSchedulerTest.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import com.bencodez.simpleapi.folialib.FoliaLib; -import com.bencodez.simpleapi.folialib.impl.ServerImplementation; +import com.bencodez.simpleapi.folialib.impl.PlatformScheduler; import com.bencodez.simpleapi.scheduler.BukkitScheduler; import com.bencodez.votingplugin.VotingPluginMain; @@ -105,7 +105,7 @@ private static Fixture fixture() { VotingPluginMain plugin = mock(VotingPluginMain.class); BukkitScheduler scheduler = mock(BukkitScheduler.class); FoliaLib folia = mock(FoliaLib.class); - ServerImplementation entityScheduler = mock(ServerImplementation.class); + PlatformScheduler entityScheduler = mock(PlatformScheduler.class); Player player = mock(Player.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); when(scheduler.getFoliaLib()).thenReturn(folia); @@ -118,6 +118,6 @@ private static Fixture fixture() { } private record Fixture(VotingPluginMain plugin, BukkitScheduler scheduler, - ServerImplementation entityScheduler, Player player) { + PlatformScheduler entityScheduler, Player player) { } } diff --git a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/voteshop/service/VoteShopPurchaseServiceTest.java b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/voteshop/service/VoteShopPurchaseServiceTest.java index b29664395..5d01005d6 100644 --- a/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/voteshop/service/VoteShopPurchaseServiceTest.java +++ b/VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/voteshop/service/VoteShopPurchaseServiceTest.java @@ -664,8 +664,8 @@ void sharedMysqlDebitIsRefundedWhenEntitySchedulerRetiresWithoutFallback() throw com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); when(scheduler.getFoliaLib()).thenReturn(folia); when(folia.getImpl()).thenReturn(entityScheduler); @@ -745,8 +745,8 @@ void rejectedClaimedRewardQueuesDurableRefundAndFencesLateCallback() throws Exce com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); ScheduledExecutorService persistenceExecutor = mock(ScheduledExecutorService.class); RewardHandler rewardHandler = mock(RewardHandler.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); @@ -816,8 +816,8 @@ void rejectedCompensationExecutorStillRunsTheDurableRefund() throws Exception { com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); ScheduledExecutorService persistenceExecutor = mock(ScheduledExecutorService.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); when(scheduler.getFoliaLib()).thenReturn(folia); @@ -850,8 +850,8 @@ void synchronousAsyncClaimRejectionSchedulesCompensationOffTheEntityLane() throw com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); ScheduledExecutorService persistenceExecutor = mock(ScheduledExecutorService.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); when(scheduler.getFoliaLib()).thenReturn(folia); @@ -892,8 +892,8 @@ void rejectedClaimedRewardSettlementUsesAsyncFallbackAndCompletes() throws Excep com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); ScheduledExecutorService persistenceExecutor = mock(ScheduledExecutorService.class); RewardHandler rewardHandler = mock(RewardHandler.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); @@ -955,8 +955,8 @@ void successfulRewardSettlesWhenPlayerRetiresBeforePresentation() throws Excepti com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); ScheduledExecutorService persistenceExecutor = mock(ScheduledExecutorService.class); RewardHandler rewardHandler = mock(RewardHandler.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); @@ -1004,8 +1004,8 @@ void claimedRewardFailureCompletesCallerAndRetainsJournalForReconciliation() thr com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); ScheduledExecutorService persistenceExecutor = mock(ScheduledExecutorService.class); RewardHandler rewardHandler = mock(RewardHandler.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); @@ -1163,8 +1163,8 @@ void rejectedCompensationSchedulersLeaveADurableRecoveryMarker(@TempDir Path tem com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); ScheduledExecutorService persistenceExecutor = mock(ScheduledExecutorService.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); when(scheduler.getFoliaLib()).thenReturn(folia); @@ -1197,8 +1197,7 @@ void rejectedCompensationSchedulersLeaveADurableRecoveryMarker(@TempDir Path tem void failedCompensationMarkerIsRetriedByPeriodicRecovery(@TempDir Path temporaryDirectory) throws Exception { VotingPluginMain plugin = mockPluginForCompensation(temporaryDirectory); com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = plugin.getBukkitScheduler(); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - plugin.getBukkitScheduler().getFoliaLib().getImpl(); + var entityScheduler = plugin.getBukkitScheduler().getFoliaLib().getImpl(); when(entityScheduler.runAtEntityWithFallback(any(), any(), any(Runnable.class))) .thenReturn(EntityTaskResultTestCompat.schedulerRetired()); SharedMysqlPurchaseJournalAccess journal = SharedMysqlPurchaseJournalAccess.mock(); @@ -1232,8 +1231,7 @@ void failedCompensationMarkerIsRetriedByPeriodicRecovery(@TempDir Path temporary private static VotingPluginMain mockPluginForCompensation(Path dataDirectory) { VotingPluginMain plugin = mock(VotingPluginMain.class, org.mockito.Mockito.RETURNS_DEEP_STUBS); when(plugin.getDataFolder()).thenReturn(dataDirectory.toFile()); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - plugin.getBukkitScheduler().getFoliaLib().getImpl(); + var entityScheduler = plugin.getBukkitScheduler().getFoliaLib().getImpl(); when(entityScheduler.runAtEntityWithFallback(any(), any(), any(Runnable.class))) .thenReturn(EntityTaskResultTestCompat.schedulerRetired()); return plugin; @@ -1541,8 +1539,8 @@ void sharedPurchaseKeepsRewardConfigurationFromBeforeShopReload() throws Excepti com.bencodez.simpleapi.scheduler.BukkitScheduler scheduler = mock(com.bencodez.simpleapi.scheduler.BukkitScheduler.class); com.bencodez.simpleapi.folialib.FoliaLib folia = mock(com.bencodez.simpleapi.folialib.FoliaLib.class); - com.bencodez.simpleapi.folialib.impl.ServerImplementation entityScheduler = - mock(com.bencodez.simpleapi.folialib.impl.ServerImplementation.class); + com.bencodez.simpleapi.folialib.impl.PlatformScheduler entityScheduler = + mock(com.bencodez.simpleapi.folialib.impl.PlatformScheduler.class); when(plugin.getBukkitScheduler()).thenReturn(scheduler); AtomicReference claimWork = new AtomicReference<>(); doAnswer(invocation -> {