Skip to content

Commit 57f9738

Browse files
AngeloFilasetaDanySK
authored andcommitted
fix(graphql): EmbeddedServer now encapsulates ApplicationEngine
1 parent 598385f commit 57f9738

File tree

1 file changed

+16
-16
lines changed
  • alchemist-graphql/src/jvmMain/kotlin/it/unibo/alchemist/boundary/monitors

1 file changed

+16
-16
lines changed

alchemist-graphql/src/jvmMain/kotlin/it/unibo/alchemist/boundary/monitors/GraphQLMonitor.kt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99

1010
package it.unibo.alchemist.boundary.monitors
1111

12-
import io.ktor.server.engine.ApplicationEngine
12+
import io.ktor.server.engine.EmbeddedServer
1313
import io.ktor.server.engine.embeddedServer
1414
import io.ktor.server.netty.Netty
15+
import io.ktor.server.netty.NettyApplicationEngine
1516
import it.unibo.alchemist.boundary.OutputMonitor
1617
import it.unibo.alchemist.boundary.graphql.monitor.EnvironmentSubscriptionMonitor
1718
import it.unibo.alchemist.boundary.graphql.server.modules.graphQLModule
@@ -36,14 +37,14 @@ private val logger = LoggerFactory.getLogger(GraphQLMonitor::class.java)
3637
*/
3738
class GraphQLMonitor<T, P : Position<out P>> @JvmOverloads constructor(
3839
val environment: Environment<T, P>,
39-
val host: String = DefaultGraphQLSettings.DEFAULT_HOST,
40-
val port: Int = DefaultGraphQLSettings.DEFAULT_PORT,
41-
val teardownOnSimulationTermination: Boolean = true,
40+
private val host: String = DefaultGraphQLSettings.DEFAULT_HOST,
41+
private val port: Int = DefaultGraphQLSettings.DEFAULT_PORT,
42+
private val teardownOnSimulationTermination: Boolean = true,
4243
private val serverDispatcher: CoroutineDispatcher = Dispatchers.Default,
4344
) : OutputMonitor<Any, Nothing> {
4445

4546
private val subscriptionMonitor = EnvironmentSubscriptionMonitor<Any, Nothing>()
46-
private lateinit var server: ApplicationEngine
47+
private lateinit var server: EmbeddedServer<NettyApplicationEngine, NettyApplicationEngine.Configuration>
4748

4849
override fun initialized(environment: Environment<Any, Nothing>) {
4950
environment.simulation.addOutputMonitor(subscriptionMonitor)
@@ -61,7 +62,7 @@ class GraphQLMonitor<T, P : Position<out P>> @JvmOverloads constructor(
6162
"alchemist-graphql-server@$host:$port",
6263
).start()
6364
runBlocking {
64-
logger.info("Starting GraphQL server at $host:${server.resolvedConnectors().first().port}")
65+
logger.info("Starting GraphQL server at $host:${server.engine.resolvedConnectors().first().port}")
6566
}
6667
mutex.acquireUninterruptibly()
6768
}
@@ -72,14 +73,13 @@ class GraphQLMonitor<T, P : Position<out P>> @JvmOverloads constructor(
7273
}
7374
}
7475

75-
private fun makeServer(): ApplicationEngine =
76-
embeddedServer(
77-
Netty,
78-
port = port,
79-
host = host,
80-
module = {
81-
graphQLModule(this@GraphQLMonitor.environment)
82-
graphQLRoutingModule()
83-
},
84-
)
76+
private fun makeServer() = embeddedServer(
77+
Netty,
78+
port = port,
79+
host = host,
80+
module = {
81+
graphQLModule(this@GraphQLMonitor.environment)
82+
graphQLRoutingModule()
83+
},
84+
)
8585
}

0 commit comments

Comments
 (0)