minor refactoring

Author: idugalic

src/main/kotlin/com/fraktalio/example/fmodelspringdemo/adapter/web/rest/AggregateRestCommandController.kt

@@ -1,10 +1,14 @@
 package com.fraktalio.example.fmodelspringdemo.adapter.web.rest
 
 import com.fraktalio.example.fmodelspringdemo.application.Aggregate
-import com.fraktalio.example.fmodelspringdemo.domain.*
+import com.fraktalio.example.fmodelspringdemo.domain.Command
+import com.fraktalio.example.fmodelspringdemo.domain.CreateRestaurantCommand
+import com.fraktalio.example.fmodelspringdemo.domain.Event
+import com.fraktalio.example.fmodelspringdemo.domain.PlaceOrderCommand
 import com.fraktalio.fmodel.application.handleOptimistically
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -14,7 +18,7 @@ import java.util.*
 @RestController
 class AggregateRestCommandController(private val aggregate: Aggregate) {
 
-    @OptIn(FlowPreview::class)
+    @OptIn(ExperimentalCoroutinesApi::class)
     private fun handle(command: Command): Flow<Event?> =
         aggregate.handleOptimistically(command).map { it.first }
 

src/main/kotlin/com/fraktalio/example/fmodelspringdemo/adapter/web/rsocket/AggregateRsocketCommandController.kt

@@ -1,18 +1,19 @@
 package com.fraktalio.example.fmodelspringdemo.adapter.web.rsocket
 
 import com.fraktalio.example.fmodelspringdemo.application.Aggregate
-import com.fraktalio.example.fmodelspringdemo.domain.*
+import com.fraktalio.example.fmodelspringdemo.domain.Command
+import com.fraktalio.example.fmodelspringdemo.domain.Event
 import com.fraktalio.fmodel.application.handleOptimistically
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import org.springframework.messaging.handler.annotation.MessageMapping
 import org.springframework.messaging.handler.annotation.Payload
 import org.springframework.stereotype.Controller
-import java.util.*
 
 @Controller
 class AggregateRsocketCommandController(private val aggregate: Aggregate) {
-    @OptIn(FlowPreview::class)
+    @OptIn(ExperimentalCoroutinesApi::class)
     @MessageMapping("commands")
     fun handleCommand(@Payload commands: Flow<Command>): Flow<Event?> =
         aggregate.handleOptimistically(commands).map { it.first }

src/main/kotlin/com/fraktalio/example/fmodelspringdemo/application/Aggregate.kt

@@ -3,9 +3,8 @@ package com.fraktalio.example.fmodelspringdemo.application
 import com.fraktalio.example.fmodelspringdemo.domain.*
 import com.fraktalio.fmodel.application.EventLockingRepository
 import com.fraktalio.fmodel.application.EventSourcingLockingOrchestratingAggregate
-import com.fraktalio.fmodel.application.eventSourcingLockingOrchestratingAggregate
 import com.fraktalio.fmodel.domain.combine
-import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import java.util.*
 
 internal typealias AggregateEventRepository = EventLockingRepository<Command?, Event?, UUID?>
@@ -24,15 +23,15 @@ internal typealias Aggregate = EventSourcingLockingOrchestratingAggregate<Comman
  *
  * @author Иван Дугалић / Ivan Dugalic / @idugalic
  */
-@OptIn(FlowPreview::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 internal fun aggregate(
     orderDecider: OrderDecider,
     restaurantDecider: RestaurantDecider,
     orderSaga: OrderSaga,
     restaurantSaga: RestaurantSaga,
     eventRepository: AggregateEventRepository
 
-): Aggregate = eventSourcingLockingOrchestratingAggregate(
+): Aggregate = EventSourcingLockingOrchestratingAggregate(
     // Combining two deciders into one.
     decider = orderDecider.combine(restaurantDecider),
     // How and where do you want to store new events.

src/main/kotlin/com/fraktalio/example/fmodelspringdemo/application/MaterializedView.kt

@@ -3,7 +3,6 @@ package com.fraktalio.example.fmodelspringdemo.application
 import com.fraktalio.example.fmodelspringdemo.domain.*
 import com.fraktalio.fmodel.application.MaterializedView
 import com.fraktalio.fmodel.application.ViewStateRepository
-import com.fraktalio.fmodel.application.materializedView
 import com.fraktalio.fmodel.domain.combine
 
 /**
@@ -31,7 +30,7 @@ internal fun materializedView(
     restaurantView: RestaurantView,
     orderView: OrderView,
     viewStateRepository: MaterializedViewStateRepository
-): OrderRestaurantMaterializedView = materializedView(
+): OrderRestaurantMaterializedView = MaterializedView(
     // Combining two views into one, and (di)map the inconvenient Pair into a domain specific Data class (MaterializedViewState) that will represent view state better.
     view = restaurantView.combine(orderView).dimapOnState(
         fl = { Pair(it.restaurant, it.order) },