move name to requestsdata to be usable in extension functions for Req…

…uestsData
doip-sim-ecu · Jan 26, 2022 · ffd19d9 · ffd19d9
1 parent 0dff34a
commit ffd19d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doip-sim-ecu-dsl/src/main/kotlin/SimDsl.kt b/doip-sim-ecu-dsl/src/main/kotlin/SimDsl.kt
@@ -233,7 +233,7 @@ fun MutableList<RequestMatcher>.removeByName(name: String): RequestMatcher? {
 
 data class ResetHandler(val name: String?, val handler: (SimEcu) -> Unit)
 
-open class RequestsData(requests: List<RequestMatcher> = emptyList(), resetHandler: List<ResetHandler> = emptyList()) {
+open class RequestsData(val name: String, requests: List<RequestMatcher> = emptyList(), resetHandler: List<ResetHandler> = emptyList()) {
     /**
      * List of all defined requests in the order they were defined
      */
@@ -317,13 +317,13 @@ open class RequestsData(requests: List<RequestMatcher> = emptyList(), resetHandl
  * Define the data associated with the ecu
  */
 open class EcuData(
-    val name: String,
+    name: String,
     var physicalAddress: Int = 0,
     var functionalAddress: Int = 0,
     var nrcOnNoMatch: Boolean = true,
     requests: List<RequestMatcher> = emptyList(),
     resetHandler: List<ResetHandler> = emptyList()
-) : RequestsData(requests, resetHandler)
+) : RequestsData(name, requests, resetHandler)
 
 val gateways: MutableList<GatewayData> = mutableListOf()
 val gatewayInstances: MutableList<SimGateway> = mutableListOf()

diff --git a/doip-sim-ecu-dsl/src/main/kotlin/SimGateway.kt b/doip-sim-ecu-dsl/src/main/kotlin/SimGateway.kt
@@ -8,7 +8,7 @@ import doip.simulation.standard.StandardTcpConnectionGateway
 import java.net.InetAddress
 import kotlin.properties.Delegates
 
-open class GatewayData(val name: String) : RequestsData() {
+open class GatewayData(name: String) : RequestsData(name) {
     /**
      * Network address this gateway should bind on (default: 0.0.0.0)
      */