Changed deprecated constructor into createNull static method

jitterted · Mar 14, 2024 · 315494f · 315494f
1 parent 92aab81
commit 315494f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/com/jitterted/mobreg/application/EnsembleTimerHolder.java b/src/main/java/com/jitterted/mobreg/application/EnsembleTimerHolder.java
@@ -17,17 +17,18 @@ public class EnsembleTimerHolder implements EnsembleTimerTickHandler {
     private final SingleEntryHashMap<EnsembleId, EnsembleTimer> ensembleTimers = new SingleEntryHashMap<>();
     private final SecondsTicker secondsTicker;
 
-    @Deprecated // Must use the constructor that takes a Broadcaster implementation
-    public EnsembleTimerHolder(EnsembleRepository ensembleRepository) {
-        this(ensembleRepository, ensembleTimer -> {}, new DoNothingSecondsTicker());
-    }
-
     public EnsembleTimerHolder(EnsembleRepository ensembleRepository, Broadcaster broadcaster, SecondsTicker secondsTicker) {
         this.ensembleRepository = ensembleRepository;
         this.broadcaster = broadcaster;
         this.secondsTicker = secondsTicker;
     }
 
+    public static EnsembleTimerHolder createNull(EnsembleRepository ensembleRepository) {
+        return new EnsembleTimerHolder(ensembleRepository,
+                                       ensembleTimer -> {},
+                                       new DoNothingSecondsTicker());
+    }
+
     @NotNull
     public EnsembleTimer timerFor(EnsembleId ensembleId) {
         if (!ensembleTimers.containsKey(ensembleId)) {

diff --git a/src/test/java/com/jitterted/mobreg/adapter/in/web/TestAdminConfiguration.java b/src/test/java/com/jitterted/mobreg/adapter/in/web/TestAdminConfiguration.java
@@ -58,7 +58,8 @@ public EnsembleService createEnsembleService(EnsembleRepository ensembleReposito
 
     @Bean
     public EnsembleTimerHolder createEnsembleTimerHolder(EnsembleRepository ensembleRepository) {
-        return new EnsembleTimerHolder(ensembleRepository);
+        // TODO: enable real broadcaster when feature is ready
+        return EnsembleTimerHolder.createNull(ensembleRepository);
     }
 
     // TODO: remove this once member registration works

diff --git a/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/EnsembleTimerControllerTest.java b/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/EnsembleTimerControllerTest.java
@@ -30,7 +30,7 @@ void createAndRedirectToTimerSessionForSpecificEnsemble() {
         TestEnsembleServiceBuilder builder = new TestEnsembleServiceBuilder()
                 .saveEnsemble(ensemble)
                 .withThreeParticipants();
-        EnsembleTimerHolder ensembleTimerHolder = new EnsembleTimerHolder(builder.ensembleRepository());
+        EnsembleTimerHolder ensembleTimerHolder = EnsembleTimerHolder.createNull(builder.ensembleRepository());
         EnsembleTimerController ensembleTimerController = new EnsembleTimerController(ensembleTimerHolder, new InMemoryMemberRepository());
 
         String redirectPage = ensembleTimerController.createTimerView(87L);
@@ -49,7 +49,7 @@ void viewTimerHasParticipantsInTheViewModelFromTheSpecifiedEnsembleAndTimerNotSt
                 .saveMemberAndAccept("Jane", "ghjane")
                 .saveMemberAndAccept("Paul", "ghpaul")
                 .saveMemberAndAccept("Sally", "ghsally");
-        EnsembleTimerHolder ensembleTimerHolder = new EnsembleTimerHolder(builder.ensembleRepository());
+        EnsembleTimerHolder ensembleTimerHolder = EnsembleTimerHolder.createNull(builder.ensembleRepository());
         EnsembleTimerController ensembleTimerController = new EnsembleTimerController(ensembleTimerHolder, builder.memberRepository());
         ensembleTimerController.createTimerView(153L);
 
@@ -78,7 +78,7 @@ void startTimerStartsTheSpecifiedEnsembleTimer() {
         TestEnsembleServiceBuilder builder = new TestEnsembleServiceBuilder()
                 .saveEnsemble(ensemble)
                 .withThreeParticipants();
-        EnsembleTimerHolder ensembleTimerHolder = new EnsembleTimerHolder(builder.ensembleRepository());
+        EnsembleTimerHolder ensembleTimerHolder = EnsembleTimerHolder.createNull(builder.ensembleRepository());
         EnsembleTimerController ensembleTimerController = new EnsembleTimerController(ensembleTimerHolder, new InMemoryMemberRepository());
         ensembleTimerController.createTimerView(279L);
 
@@ -96,7 +96,7 @@ public void rotateTimerRotatesParticipantsForFinishedEnsembleTimer() throws Exce
         TestEnsembleServiceBuilder builder = new TestEnsembleServiceBuilder()
                 .saveEnsemble(ensemble)
                 .withThreeParticipants();
-        EnsembleTimerHolder ensembleTimerHolder = new EnsembleTimerHolder(builder.ensembleRepository());
+        EnsembleTimerHolder ensembleTimerHolder = EnsembleTimerHolder.createNull(builder.ensembleRepository());
         EnsembleTimer ensembleTimer = ensembleTimerHolder.createTimerFor(EnsembleId.of(279));
         MemberId nextDriverBeforeRotation = ensembleTimer.rotation().nextDriver();
         EnsembleTimerFactory.pushTimerToFinishedState(ensembleTimer);

diff --git a/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/ParticipantsTransformerTest.java b/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/ParticipantsTransformerTest.java
@@ -24,7 +24,7 @@ void transformerCreatesMapOfRolesToFirstNamesNoParticipantsRole() {
                 .saveMemberAndAccept("Jane", "nextdriver")
                 .saveMemberAndAccept("Paul", "driver")
                 .saveMemberAndAccept("Sally", "navigator");
-        EnsembleTimerHolder ensembleTimerHolder = new EnsembleTimerHolder(builder.ensembleRepository());
+        EnsembleTimerHolder ensembleTimerHolder = EnsembleTimerHolder.createNull(builder.ensembleRepository());
         ensembleTimerHolder.createTimerFor(EnsembleId.of(371));
         EnsembleTimer ensembleTimer = ensembleTimerHolder.timerFor(EnsembleId.of(371));
 
@@ -49,7 +49,7 @@ void transformerCreatesMapOfRolesToFirstNamesWithParticipantsRole() {
                 .saveMemberAndAccept("Sally", "navigator")
                 .saveMemberAndAccept("Sri", "sri_participant")
                 .saveMemberAndAccept("Jha", "jha_participant");
-        EnsembleTimerHolder ensembleTimerHolder = new EnsembleTimerHolder(builder.ensembleRepository());
+        EnsembleTimerHolder ensembleTimerHolder = EnsembleTimerHolder.createNull(builder.ensembleRepository());
         ensembleTimerHolder.createTimerFor(EnsembleId.of(543));
         EnsembleTimer ensembleTimer = ensembleTimerHolder.timerFor(EnsembleId.of(543));