From 8bf30dd3b3a3ba20a68e4de47948d04ab2d3b097 Mon Sep 17 00:00:00 2001
From: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>
Date: Mon, 21 Aug 2023 15:48:10 +0200
Subject: [PATCH] Improved GlobalContext

---
 .../typeutils/globalcontext/GlobalContext.kt  | 45 ++-----------------
 .../globalcontext/GlobalContextTest.kt        | 15 ++++++-
 2 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/main/kotlin/net/igsoft/typeutils/globalcontext/GlobalContext.kt b/src/main/kotlin/net/igsoft/typeutils/globalcontext/GlobalContext.kt
index f20269a..e6891f3 100644
--- a/src/main/kotlin/net/igsoft/typeutils/globalcontext/GlobalContext.kt
+++ b/src/main/kotlin/net/igsoft/typeutils/globalcontext/GlobalContext.kt
@@ -1,14 +1,12 @@
 package net.igsoft.typeutils.globalcontext
 
-import net.igsoft.typeutils.marker.Marker
 import net.igsoft.typeutils.marker.TypedMarker
 import net.igsoft.typeutils.property.ImmutableTypedProperties
 import net.igsoft.typeutils.property.TypedProperties
 import java.util.concurrent.ConcurrentHashMap
 
-@Suppress("unused")
-object GlobalContext : ImmutableTypedProperties {
-    private val context: TypedProperties = TypedProperties(ConcurrentHashMap())
+open class GlobalContextImplementation(private val context: TypedProperties = TypedProperties(ConcurrentHashMap())) :
+    ImmutableTypedProperties by context {
 
     fun <T> register(key: TypedMarker<T>, value: T) {
         require(!context.containsKey(key)) {
@@ -21,41 +19,6 @@ object GlobalContext : ImmutableTypedProperties {
     fun <T> registerOrReplace(key: TypedMarker<T>, value: T) {
         context[key] = value
     }
-
-    fun <T> getOrError(
-        marker: TypedMarker<T>,
-        message: String = "Key '${marker} doesn't exist in the GlobalContext'"
-    ): T {
-        return getOrElse(marker) { error(message) }
-    }
-
-    override fun get(key: Marker): Any? = context[key]
-
-    override operator fun <T> get(marker: TypedMarker<T>) = context[marker]
-
-    override fun getValue(marker: Marker): Any? = context.getValue(marker)
-
-    override fun <T> getValue(marker: TypedMarker<T>): T = context.getValue(marker)
-
-    override fun <T> getOrDefault(marker: TypedMarker<T>, defaultValue: T): T =
-        context.getOrDefault(marker, defaultValue)
-
-    override fun <T> getOrElse(marker: TypedMarker<T>, calculateValue: () -> T): T =
-        context.getOrElse(marker, calculateValue)
-
-    override val entries: Set<Map.Entry<Marker, Any?>> get() = context.entries
-
-    override val keys: Set<Marker> get() = context.keys
-
-    override val size: Int get() = context.size
-
-    override val values: Collection<Any?> get() = context.values
-
-    override fun containsKey(key: Marker): Boolean = context.containsKey(key)
-
-    override fun containsValue(value: Any?): Boolean = context.containsValue(value)
-
-    override fun isEmpty(): Boolean = context.isEmpty()
-
-    override fun iterator(): Iterator<Map.Entry<Marker, Any?>> = context.iterator()
 }
+
+object GlobalContext : GlobalContextImplementation()
diff --git a/src/test/kotlin/net/igsoft/typeutils/globalcontext/GlobalContextTest.kt b/src/test/kotlin/net/igsoft/typeutils/globalcontext/GlobalContextTest.kt
index 4e10169..3cdd6cb 100644
--- a/src/test/kotlin/net/igsoft/typeutils/globalcontext/GlobalContextTest.kt
+++ b/src/test/kotlin/net/igsoft/typeutils/globalcontext/GlobalContextTest.kt
@@ -9,12 +9,25 @@ data class Person(val firstName: String, val lastName: String, val age: Int)
 
 class GlobalContextTest {
     private val person by DefaultTypedMarker.create<Person>()
+    private val otherPerson by DefaultTypedMarker.create<Person>()
 
     @Test
-    fun `Assert that we can save and read objects on GlobalContext`() {
+    fun `Assert that we can register and read objects on GlobalContext`() {
         val personEntity = Person("Marcin", "Iksiński", 28)
         GlobalContext.register(person, personEntity)
 
         assertThat(GlobalContext[person]).isEqualTo(personEntity)
     }
+
+    @Test
+    fun `Assert that we can re-register objects on GlobalContext`() {
+        val personEntity = Person("Marcin", "Iksiński", 28)
+        val newPersonEntity = Person("Marcin", "Babiński", 52)
+
+        GlobalContext.register(otherPerson, personEntity)
+        assertThat(GlobalContext[otherPerson]).isEqualTo(personEntity)
+
+        GlobalContext.registerOrReplace(otherPerson, newPersonEntity)
+        assertThat(GlobalContext[otherPerson]).isEqualTo(newPersonEntity)
+    }
 }