Remove ResolverConfig from configuration because this class is useless

Author: ileasile

jupyter-lib/test-kit/src/main/kotlin/org/jetbrains/kotlinx/jupyter/testkit/ReplProvider.kt

@@ -4,7 +4,6 @@ import jupyter.kotlin.DependsOn
 import org.jetbrains.kotlinx.jupyter.ReplForJupyter
 import org.jetbrains.kotlinx.jupyter.ReplForJupyterImpl
 import org.jetbrains.kotlinx.jupyter.defaultRepositories
-import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.libraries.EmptyResolutionInfoProvider
 import org.jetbrains.kotlinx.jupyter.libraries.LibraryResolver
 import java.io.File
@@ -33,7 +32,8 @@ fun interface ReplProvider {
                 EmptyResolutionInfoProvider,
                 classpath,
                 isEmbedded = true,
-                resolverConfig = ResolverConfig(defaultRepositories, resolver)
+                mavenRepositories = defaultRepositories,
+                libraryResolver = resolver
             ).apply {
                 initializeWithCurrentClasspath()
             }

src/main/kotlin/org/jetbrains/kotlinx/jupyter/config.kt

@@ -16,7 +16,7 @@ import org.jetbrains.kotlinx.jupyter.api.KotlinKernelVersion
 import org.jetbrains.kotlinx.jupyter.common.getNameForUser
 import org.jetbrains.kotlinx.jupyter.config.getLogger
 import org.jetbrains.kotlinx.jupyter.config.readResourceAsIniFile
-import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
+import org.jetbrains.kotlinx.jupyter.libraries.LibraryResolver
 import org.jetbrains.kotlinx.jupyter.libraries.ResolutionInfoProvider
 import org.jetbrains.kotlinx.jupyter.libraries.getStandardResolver
 import org.zeromq.SocketType
@@ -131,7 +131,8 @@ data class KernelConfig(
     val signatureKey: String,
     val scriptClasspath: List<File> = emptyList(),
     val homeDir: File?,
-    val resolverConfig: ResolverConfig?,
+    val mavenRepositories: List<RepositoryCoordinates> = listOf(),
+    val libraryResolver: LibraryResolver? = null,
     val resolutionInfoProvider: ResolutionInfoProvider,
     val embedded: Boolean = false,
     val debugPort: Int? = null,
@@ -162,13 +163,12 @@ data class KernelConfig(
                 signatureKey = if (cfg.sigScheme == null || cfg.key == null) "" else cfg.key,
                 scriptClasspath = args.scriptClasspath,
                 homeDir = args.homeDir,
-                resolverConfig = loadResolverConfig(args.homeDir?.toString(), resolutionInfoProvider),
+                mavenRepositories = defaultRepositories,
+                libraryResolver = getStandardResolver(args.homeDir?.toString(), resolutionInfoProvider),
                 resolutionInfoProvider = resolutionInfoProvider,
                 embedded = embedded,
                 debugPort = args.debugPort,
             )
         }
     }
 }
-
-fun loadResolverConfig(homeDir: String?, resolutionInfoProvider: ResolutionInfoProvider) = ResolverConfig(defaultRepositories, getStandardResolver(homeDir, resolutionInfoProvider))

src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/JupyterScriptDependenciesResolverImpl.kt

@@ -21,7 +21,7 @@ import kotlin.script.experimental.dependencies.impl.makeExternalDependenciesReso
 import kotlin.script.experimental.dependencies.impl.set
 import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
 
-open class JupyterScriptDependenciesResolverImpl(resolverConfig: ResolverConfig?) : JupyterScriptDependenciesResolver {
+open class JupyterScriptDependenciesResolverImpl(mavenRepositories: List<RepositoryCoordinates>) : JupyterScriptDependenciesResolver {
 
     private val log = getLogger("resolver")
 
@@ -38,7 +38,7 @@ open class JupyterScriptDependenciesResolverImpl(resolverConfig: ResolverConfig?
             FileSystemDependenciesResolver(),
             RemoteResolverWrapper(MavenDependenciesResolver())
         )
-        resolverConfig?.repositories?.forEach { addRepository(Repo(it)) }
+        mavenRepositories.forEach { addRepository(Repo(it)) }
     }
 
     private fun buildOptions(vararg options: Pair<DependenciesResolverOptionsName, String>): Options {

src/main/kotlin/org/jetbrains/kotlinx/jupyter/dependencies/ResolverConfig.kt

@@ -32,14 +32,14 @@ import org.jetbrains.kotlinx.jupyter.compiler.util.SerializedCompiledScriptsData
 import org.jetbrains.kotlinx.jupyter.config.catchAll
 import org.jetbrains.kotlinx.jupyter.config.getCompilationConfiguration
 import org.jetbrains.kotlinx.jupyter.dependencies.JupyterScriptDependenciesResolverImpl
-import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.dependencies.ScriptDependencyAnnotationHandlerImpl
 import org.jetbrains.kotlinx.jupyter.exceptions.LibraryProblemPart
 import org.jetbrains.kotlinx.jupyter.exceptions.rethrowAsLibraryException
 import org.jetbrains.kotlinx.jupyter.libraries.KERNEL_LIBRARIES
 import org.jetbrains.kotlinx.jupyter.libraries.LibrariesProcessor
 import org.jetbrains.kotlinx.jupyter.libraries.LibrariesProcessorImpl
 import org.jetbrains.kotlinx.jupyter.libraries.LibrariesScanner
+import org.jetbrains.kotlinx.jupyter.libraries.LibraryResolver
 import org.jetbrains.kotlinx.jupyter.libraries.LibraryResourcesProcessorImpl
 import org.jetbrains.kotlinx.jupyter.libraries.ResolutionInfoProvider
 import org.jetbrains.kotlinx.jupyter.libraries.getDefaultResolutionInfoSwitcher
@@ -79,6 +79,7 @@ import kotlin.script.experimental.api.fileExtension
 import kotlin.script.experimental.api.implicitReceivers
 import kotlin.script.experimental.api.refineConfiguration
 import kotlin.script.experimental.api.with
+import kotlin.script.experimental.dependencies.RepositoryCoordinates
 import kotlin.script.experimental.jvm.BasicJvmReplEvaluator
 import kotlin.script.experimental.jvm.JvmDependency
 import kotlin.script.experimental.jvm.baseClassLoader
@@ -142,7 +143,9 @@ interface ReplForJupyter {
 
     val currentClassLoader: ClassLoader
 
-    val resolverConfig: ResolverConfig?
+    val mavenRepositories: List<RepositoryCoordinates>
+
+    val libraryResolver: LibraryResolver?
 
     val runtimeProperties: ReplRuntimeProperties
 
@@ -168,7 +171,8 @@ class ReplForJupyterImpl(
     override val resolutionInfoProvider: ResolutionInfoProvider,
     private val scriptClasspath: List<File> = emptyList(),
     override val homeDir: File? = null,
-    override val resolverConfig: ResolverConfig? = null,
+    override val mavenRepositories: List<RepositoryCoordinates> = listOf(),
+    override val libraryResolver: LibraryResolver? = null,
     override val runtimeProperties: ReplRuntimeProperties = defaultRuntimeProperties,
     private val scriptReceivers: List<Any> = emptyList(),
     override val isEmbedded: Boolean = false,
@@ -183,7 +187,8 @@ class ReplForJupyterImpl(
             config.resolutionInfoProvider,
             config.scriptClasspath,
             config.homeDir,
-            config.resolverConfig,
+            config.mavenRepositories,
+            config.libraryResolver,
             runtimeProperties,
             scriptReceivers,
             config.embedded
@@ -233,7 +238,7 @@ class ReplForJupyterImpl(
 
     private val internalVariablesMarkersProcessor: InternalVariablesMarkersProcessor = InternalVariablesMarkersProcessorImpl()
 
-    private val resolver = JupyterScriptDependenciesResolverImpl(resolverConfig)
+    private val resolver = JupyterScriptDependenciesResolverImpl(mavenRepositories)
 
     private val beforeCellExecution = mutableListOf<ExecutionCallback<*>>()
     private val shutdownCodes = mutableListOf<ExecutionCallback<*>>()
@@ -244,7 +249,7 @@ class ReplForJupyterImpl(
         runtimeProperties.jvmTargetForSnippets
     )
 
-    private val librariesProcessor: LibrariesProcessor = LibrariesProcessorImpl(resolverConfig?.libraries, runtimeProperties.version)
+    private val librariesProcessor: LibrariesProcessor = LibrariesProcessorImpl(libraryResolver, runtimeProperties.version)
 
     private val magics = MagicsProcessor(
         FullMagicsHandler(

src/main/kotlin/org/jetbrains/kotlinx/jupyter/repl.kt

@@ -38,7 +38,6 @@ open class KernelServerTestsBase {
         signatureScheme = "hmac1-sha256",
         signatureKey = "",
         scriptClasspath = classpath,
-        resolverConfig = null,
         homeDir = File(""),
         resolutionInfoProvider = EmptyResolutionInfoProvider,
     )

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/KernelServerTestsBase.kt

@@ -139,7 +139,7 @@ class ParseMagicsTests {
         val switcher = ResolutionInfoSwitcher.noop(EmptyResolutionInfoProvider)
         val magicsHandler = FullMagicsHandler(
             options,
-            LibrariesProcessorImpl(testResolverConfig.libraries, defaultRuntimeProperties.version),
+            LibrariesProcessorImpl(testLibraryResolver, defaultRuntimeProperties.version),
             switcher,
         )
         val processor = MagicsProcessor(magicsHandler)

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/parseMagicsTests.kt

@@ -3,7 +3,6 @@ package org.jetbrains.kotlinx.jupyter.test.repl
 import kotlinx.coroutines.runBlocking
 import org.jetbrains.kotlinx.jupyter.ReplForJupyter
 import org.jetbrains.kotlinx.jupyter.ReplForJupyterImpl
-import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.libraries.EmptyResolutionInfoProvider
 import org.jetbrains.kotlinx.jupyter.libraries.KERNEL_LIBRARIES
 import org.jetbrains.kotlinx.jupyter.libraries.getDefaultDirectoryResolutionInfoProvider
@@ -12,8 +11,8 @@ import org.jetbrains.kotlinx.jupyter.repl.CompletionResult
 import org.jetbrains.kotlinx.jupyter.repl.ListErrorsResult
 import org.jetbrains.kotlinx.jupyter.test.classpath
 import org.jetbrains.kotlinx.jupyter.test.standardResolverRuntimeProperties
+import org.jetbrains.kotlinx.jupyter.test.testLibraryResolver
 import org.jetbrains.kotlinx.jupyter.test.testRepositories
-import org.jetbrains.kotlinx.jupyter.test.testResolverConfig
 import java.io.File
 
 abstract class AbstractReplTest {
@@ -44,13 +43,13 @@ abstract class AbstractReplTest {
     }
 
     protected fun makeReplWithTestResolver(): ReplForJupyter {
-        return ReplForJupyterImpl(resolutionInfoProvider, classpath, homeDir, testResolverConfig)
+        return ReplForJupyterImpl(resolutionInfoProvider, classpath, homeDir, libraryResolver = testLibraryResolver)
     }
 
     protected fun makeReplWithStandardResolver(): ReplForJupyter {
         val standardResolutionInfoProvider = getDefaultDirectoryResolutionInfoProvider(KERNEL_LIBRARIES.homeLibrariesDir(homeDir))
-        val config = ResolverConfig(testRepositories, getStandardResolver(".", standardResolutionInfoProvider))
-        return ReplForJupyterImpl(standardResolutionInfoProvider, classpath, homeDir, config, standardResolverRuntimeProperties)
+        val resolver = getStandardResolver(".", standardResolutionInfoProvider)
+        return ReplForJupyterImpl(standardResolutionInfoProvider, classpath, homeDir, testRepositories, resolver, standardResolverRuntimeProperties)
     }
 
     protected fun makeEmbeddedRepl(): ReplForJupyter {

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/AbstractReplTest.kt

@@ -16,7 +16,6 @@ import org.jetbrains.kotlinx.jupyter.api.libraries.ResourceType
 import org.jetbrains.kotlinx.jupyter.api.libraries.Variable
 import org.jetbrains.kotlinx.jupyter.api.textResult
 import org.jetbrains.kotlinx.jupyter.defaultRuntimeProperties
-import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.exceptions.LibraryProblemPart
 import org.jetbrains.kotlinx.jupyter.exceptions.ReplEvalRuntimeException
 import org.jetbrains.kotlinx.jupyter.exceptions.ReplException
@@ -41,14 +40,12 @@ class CustomLibraryResolverTests : AbstractReplTest() {
 
     private fun makeRepl(vararg libs: Pair<String, LibraryDefinition>) = makeRepl(libs.toList().toLibraries())
 
-    private fun makeRepl(libs: LibraryResolver) = ReplForJupyterImpl(
+    private fun makeRepl(libraryResolver: LibraryResolver) = ReplForJupyterImpl(
         resolutionInfoProvider,
         classpathWithTestLib,
         homeDir,
-        ResolverConfig(
-            testRepositories,
-            libs
-        )
+        testRepositories,
+        libraryResolver
     )
 
     private fun testOneLibUsage(definition: LibraryDefinition, args: List<Variable> = emptyList()): ReplForJupyter {

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/CustomLibraryResolverTests.kt

@@ -5,7 +5,6 @@ import kotlinx.serialization.json.JsonPrimitive
 import org.jetbrains.kotlinx.jupyter.ReplForJupyterImpl
 import org.jetbrains.kotlinx.jupyter.api.Renderable
 import org.jetbrains.kotlinx.jupyter.api.libraries.LibraryDefinition
-import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.exceptions.ReplCompilerException
 import org.jetbrains.kotlinx.jupyter.libraries.EmptyResolutionInfoProvider
 import org.jetbrains.kotlinx.jupyter.test.classpath
@@ -19,11 +18,7 @@ import org.junit.jupiter.api.assertThrows
 class IntegrationApiTests {
 
     private fun makeRepl(vararg libs: Pair<String, LibraryDefinition>): ReplForJupyterImpl {
-        val config = ResolverConfig(
-            testRepositories,
-            libs.toList().toLibraries()
-        )
-        return ReplForJupyterImpl(EmptyResolutionInfoProvider, classpath, null, config)
+        return ReplForJupyterImpl(EmptyResolutionInfoProvider, classpath, null, testRepositories, libs.toList().toLibraries())
     }
 
     @Test

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/IntegrationApiTests.kt

@@ -24,7 +24,6 @@ import org.jetbrains.kotlinx.jupyter.api.libraries.LibraryResolutionRequest
 import org.jetbrains.kotlinx.jupyter.api.libraries.Variable
 import org.jetbrains.kotlinx.jupyter.defaultRepositories
 import org.jetbrains.kotlinx.jupyter.defaultRuntimeProperties
-import org.jetbrains.kotlinx.jupyter.dependencies.ResolverConfig
 import org.jetbrains.kotlinx.jupyter.libraries.AbstractLibraryResolutionInfo
 import org.jetbrains.kotlinx.jupyter.libraries.ChainedLibraryResolver
 import org.jetbrains.kotlinx.jupyter.libraries.KERNEL_LIBRARIES
@@ -59,11 +58,8 @@ val classpath = scriptCompilationClasspathFromContext(
     classLoader = DependsOn::class.java.classLoader
 )
 
-val testResolverConfig: ResolverConfig
-    get() = ResolverConfig(
-        testRepositories,
-        getResolverFromNamesMap(parseLibraryDescriptors(readLibraries()))
-    )
+val testLibraryResolver: LibraryResolver
+    get() = getResolverFromNamesMap(parseLibraryDescriptors(readLibraries()))
 
 fun assertUnit(value: Any?) = assertEquals(Unit, value)