diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsStorage.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsSink.kt similarity index 88% rename from compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsStorage.kt rename to compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsSink.kt index 2408ca4383c..1a814b26732 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsStorage.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsSink.kt @@ -20,9 +20,9 @@ import java.io.Serializable import java.rmi.Remote import java.rmi.RemoteException -interface CompilationResultsStorage : Remote { +interface CompilationResultsSink : Remote { @Throws(RemoteException::class) - fun store(compilationResultCategory: Int, value: Serializable) + fun push(compilationResultCategory: Int, value: Serializable) } enum class CompilationResultCategory(val code: Int) { diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt index bf8bdbd23cd..2cff4f0fb07 100644 --- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt +++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt @@ -135,7 +135,7 @@ interface CompileService : Remote { compilerArguments: CommonCompilerArguments, compilationOptions: CompilationOptions, servicesFacade: CompilerServicesFacadeBase, - compilationResultsStorage: CompilationResultsStorage? + compilationResultsSink: CompilationResultsSink? ): CallResult @Throws(RemoteException::class) diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt index ab1f7475b04..1cfd0b7f516 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt @@ -324,7 +324,7 @@ class CompileServiceImpl( compilerArguments: CommonCompilerArguments, compilationOptions: CompilationOptions, servicesFacade: CompilerServicesFacadeBase, - compilationResultsStorage: CompilationResultsStorage? + compilationResultsSink: CompilationResultsSink? ): CompileService.CallResult { val messageCollector = CompileServicesFacadeMessageCollector(servicesFacade, compilationOptions) val daemonReporter = DaemonMessageReporter(servicesFacade, compilationOptions) @@ -356,7 +356,7 @@ class CompileServiceImpl( withIC { doCompile(sessionId, daemonReporter, tracer = null) { eventManger, profiler -> - execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, compilationResultsStorage!!, + execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, compilationResultsSink!!, messageCollector, daemonReporter) } } @@ -388,11 +388,11 @@ class CompileServiceImpl( k2jvmArgs: K2JVMCompilerArguments, incrementalCompilationOptions: IncrementalCompilationOptions, servicesFacade: IncrementalCompilerServicesFacade, - compilationResultsStorage: CompilationResultsStorage, + compilationResultsSink: CompilationResultsSink, compilerMessageCollector: MessageCollector, daemonMessageReporter: DaemonMessageReporter ): ExitCode { - val reporter = RemoteICReporter(servicesFacade, compilationResultsStorage, incrementalCompilationOptions) + val reporter = RemoteICReporter(servicesFacade, compilationResultsSink, incrementalCompilationOptions) val annotationFileUpdater = if (servicesFacade.hasAnnotationsFileUpdater()) RemoteAnnotationsFileUpdater(servicesFacade) else null val moduleFile = k2jvmArgs.module?.let(::File) diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt index f7ca08c6cc8..d6f93f2bf61 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt @@ -24,7 +24,7 @@ import java.io.Serializable internal class RemoteICReporter( private val servicesFacade: CompilerServicesFacadeBase, - private val compilationResultsStorage: CompilationResultsStorage, + private val compilationResultsSink: CompilationResultsSink, compilationOptions: CompilationOptions ) : ICReporter { private val shouldReportMessages = ReportCategory.IC_MESSAGE.code in compilationOptions.reportCategories @@ -39,7 +39,7 @@ internal class RemoteICReporter( override fun reportCompileIteration(sourceFiles: Collection, exitCode: ExitCode) { if (shouldReportCompileIteration) { - compilationResultsStorage.store(CompilationResultCategory.IC_COMPILE_ITERATION.code, CompileIterationResult(sourceFiles, exitCode.toString())) + compilationResultsSink.push(CompilationResultCategory.IC_COMPILE_ITERATION.code, CompileIterationResult(sourceFiles, exitCode.toString())) } } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResultsStorage.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResultsSink.kt similarity index 82% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResultsStorage.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResultsSink.kt index 512c85936b1..2ab8a469227 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResultsStorage.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilationResultsSink.kt @@ -2,7 +2,7 @@ package org.jetbrains.kotlin.compilerRunner import org.gradle.api.Project import org.jetbrains.kotlin.daemon.common.CompilationResultCategory -import org.jetbrains.kotlin.daemon.common.CompilationResultsStorage +import org.jetbrains.kotlin.daemon.common.CompilationResultsSink import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT import org.jetbrains.kotlin.daemon.report.CompileIterationResult import org.jetbrains.kotlin.gradle.plugin.kotlinDebug @@ -11,12 +11,12 @@ import java.io.Serializable import java.rmi.RemoteException import java.rmi.server.UnicastRemoteObject -internal class GradleCompilationResultsStorage(project: Project): CompilationResultsStorage, UnicastRemoteObject(SOCKET_ANY_FREE_PORT) { +internal class GradleCompilationResultsSink(project: Project): CompilationResultsSink, UnicastRemoteObject(SOCKET_ANY_FREE_PORT) { private val log = project.logger private val projectRootFile = project.rootProject.projectDir @Throws(RemoteException::class) - override fun store(compilationResultCategory: Int, value: Serializable) { + override fun push(compilationResultCategory: Int, value: Serializable) { if (compilationResultCategory == CompilationResultCategory.IC_COMPILE_ITERATION.code) { @Suppress("UNCHECKED_CAST") val compileIterationResult = value as? CompileIterationResult diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index 075a6e42398..556b5a58d30 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -172,7 +172,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil val servicesFacade = GradleCompilerServicesFacadeImpl(project, environment.messageCollector) val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId -> - daemon.compile(sessionId, environment.compilerArgs, compilationOptions, servicesFacade, compilationResultsStorage = null) + daemon.compile(sessionId, environment.compilerArgs, compilationOptions, servicesFacade, compilationResultsSink = null) } val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) } @@ -203,7 +203,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil val servicesFacade = GradleIncrementalCompilerServicesFacadeImpl(project, environment) val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId -> - daemon.compile(sessionId, environment.compilerArgs, compilationOptions, servicesFacade, GradleCompilationResultsStorage(project)) + daemon.compile(sessionId, environment.compilerArgs, compilationOptions, servicesFacade, GradleCompilationResultsSink(project)) } val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }