refactor: Mark parts of observer builder as internal to not pollute api

Author: 0ffz

geary-core/src/com/mineinabyss/geary/observers/Observer.kt

@@ -13,7 +13,7 @@ data class Observer(
     val listenToEvents: EntityType,
     val mustHoldData: Boolean,
     val handle: ObserverHandle,
-    val onClose: (Observer) -> Unit,
+    internal val onClose: (Observer) -> Unit,
 ) : AutoCloseable {
     var closed = false
         private set

geary-core/src/com/mineinabyss/geary/observers/builders/ObserverEventsBuilder.kt

@@ -10,6 +10,7 @@ import com.mineinabyss.geary.systems.query.QueryShorthands
 import com.mineinabyss.geary.systems.query.ShorthandQuery
 
 data class ObserverWithoutData(
+    @PublishedApi
     override val listenToEvents: List<ComponentId>,
     override val world: Geary,
     override val onBuild: (Observer) -> Unit,
@@ -50,13 +51,13 @@ data class ObserverWithData<R>(
 }
 
 abstract class ObserverEventsBuilder<Context> : ExecutableObserver<Context> {
-    abstract val world: Geary
-    abstract val listenToEvents: List<ComponentId>
-    abstract val mustHoldData: Boolean
-    abstract val onBuild: (Observer) -> Unit
-    abstract val onClose: (Observer) -> Unit
-
-    val comp: ComponentProvider get() = world.componentProvider
+    internal abstract val world: Geary
+    internal abstract val listenToEvents: List<ComponentId>
+    internal abstract val mustHoldData: Boolean
+    internal abstract val onBuild: (Observer) -> Unit
+    internal abstract val onClose: (Observer) -> Unit
+    @PublishedApi
+    internal val comp: ComponentProvider get() = world.componentProvider
 
     abstract fun provideContext(entity: EntityId, data: Any?): Context
 

geary-core/test@jvm/com/mineinabyss/geary/observers/RemoveObserverTest.kt

@@ -11,21 +11,22 @@ import kotlin.test.Test
 class RemoveObserverTest : GearyTest() {
     @Test
     fun `should stop observing events after removed`() {
+        // arrange
         val called = mutableListOf<Int>()
         val observer = observe<OnSet>().exec(query<Int>()) { (data) ->
             called += data
         }
 
+        // act
         val entity = entity {
             set(1)
             set(2)
         }
-
-
-        eventRunner.removeObserver(observer)
-
+        observer.close()
         entity.set(3)
 
+        // assert
+
         called shouldBe listOf(1, 2)
     }
 }