Changed the SingleEntryHashMap inside the EnsembleTimerHolder to clea…

…r out the old entry when a new one is being added via put.
jitterted · Dec 18, 2024 · 2d13535 · 2d13535
1 parent d062355
commit 2d13535
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/com/jitterted/mobreg/application/EnsembleTimerHolder.java b/src/main/java/com/jitterted/mobreg/application/EnsembleTimerHolder.java
@@ -191,9 +191,8 @@ public boolean hasTimer() {
     static class SingleEntryHashMap<K, V> extends HashMap<K, V> {
         @Override
         public V put(K key, V value) {
-            if (this.size() == 1 && !this.containsKey(key)) {
-                throw new IllegalStateException("A SingleEntryHashMap cannot have more than one entry, has entry for %s, attempting to add entry for %s"
-                                                        .formatted(keySet().iterator().next(), key));
+            if (this.size() == 1) {
+                this.clear();
             }
             return super.put(key, value);
         }

diff --git a/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/EnsembleTimerHolderTest.java b/src/test/java/com/jitterted/mobreg/adapter/in/web/admin/EnsembleTimerHolderTest.java
@@ -79,9 +79,12 @@ void createTimerFailsWhenTimerExistsForAnotherEnsemble() {
             EnsembleTimerHolder ensembleTimerHolder = EnsembleTimerHolder.createNull(builder.ensembleRepository(), builder.memberRepository());
             ensembleTimerHolder.createTimerFor(ensembleWithTimerCreatedFirst.getId(), new NoOpShuffler());
 
-            assertThatIllegalStateException().isThrownBy(
-                () -> ensembleTimerHolder
-                        .createTimerFor(ensembleWithTimerCreatedSecond.getId(), new NoOpShuffler()));
+            EnsembleTimer timerForSecondEnsemble = ensembleTimerHolder.createTimerFor(ensembleWithTimerCreatedSecond.getId(), new NoOpShuffler());
+
+            assertThat(timerForSecondEnsemble.ensembleId().id())
+                    .isEqualTo(ensembleWithTimerCreatedSecondId);
+            assertThatIllegalStateException()
+                    .isThrownBy(() -> ensembleTimerHolder.timerFor(ensembleWithTimerCreatedFirst.getId()));
         }
     }