starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-22 00:08:33 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Remove pkl.core.messaging from core APIs (#770)

Browse Source
This commit is contained in:
Josh B
2024-11-01 14:53:16 -07:00
committed by GitHub
parent fa25fb46fd
commit 9692504b5f
8 changed files with 288 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkl-server/src/main/kotlin/org/pkl/server/ClientModuleKeyFactory.kt
View File

@@ -18,9 +18,9 @@ package org.pkl.server
import java.net.URI
import java.util.Optional
import org.pkl.core.messaging.*
import org.pkl.core.messaging.MessageTransportModuleResolver
import org.pkl.core.messaging.Messages.*
import org.pkl.core.module.*
import org.pkl.core.module.ExternalModuleResolver
internal class ClientModuleKeyFactory(
private val readerSpecs: Collection<ModuleReaderSpec>,
@@ -29,7 +29,8 @@ internal class ClientModuleKeyFactory(
) : ModuleKeyFactory {
private val schemes = readerSpecs.map { it.scheme }
private val resolver: ExternalModuleResolver = ExternalModuleResolver(transport, evaluatorId)
private val resolver: MessageTransportModuleResolver =
MessageTransportModuleResolver(transport, evaluatorId)
override fun create(uri: URI): Optional<ModuleKey> =
when (uri.scheme) {

4
pkl-server/src/main/kotlin/org/pkl/server/Server.kt
View File

@@ -27,6 +27,7 @@ import org.pkl.core.evaluatorSettings.PklEvaluatorSettings.ExternalReader
import org.pkl.core.externalreader.ExternalReaderProcess
import org.pkl.core.http.HttpClient
import org.pkl.core.messaging.MessageTransport
import org.pkl.core.messaging.MessageTransportResourceResolver
import org.pkl.core.messaging.MessageTransports
import org.pkl.core.messaging.ProtocolException
import org.pkl.core.module.ModuleKeyFactories
@@ -34,7 +35,6 @@ import org.pkl.core.module.ModuleKeyFactory
import org.pkl.core.module.ModulePathResolver
import org.pkl.core.packages.PackageUri
import org.pkl.core.project.DeclaredDependencies
import org.pkl.core.resource.ExternalResourceResolver
import org.pkl.core.resource.ResourceReader
import org.pkl.core.resource.ResourceReaders
import org.pkl.core.util.IoUtils
@@ -248,7 +248,7 @@ class Server(private val transport: MessageTransport) : AutoCloseable {
add(
ResourceReaders.externalResolver(
readerSpec,
ExternalResourceResolver(transport, evaluatorId)
MessageTransportResourceResolver(transport, evaluatorId)
)
)
}