diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProvider.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProvider.kt index d5f7da0f4dea..29ac4e706acb 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProvider.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProvider.kt @@ -9,7 +9,6 @@ import git4idea.changes.GitBranchComparisonResult import kotlinx.coroutines.flow.Flow import org.jetbrains.annotations.ApiStatus import org.jetbrains.plugins.github.api.data.GHCommit -import java.util.concurrent.CompletableFuture interface GHPRChangesDataProvider { @@ -24,9 +23,6 @@ interface GHPRChangesDataProvider { suspend fun loadPatchFromMergeBase(commitSha: String, filePath: String): FilePatch? suspend fun signalChangesNeedReload() - - @Deprecated("Please migrate ro coroutines and use loadCommits") - fun loadCommitsFromApi(): CompletableFuture> } @ApiStatus.Internal diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProviderImpl.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProviderImpl.kt index f69ab1f75243..76ee55b9a7ed 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProviderImpl.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRChangesDataProviderImpl.kt @@ -13,13 +13,11 @@ import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.future.asCompletableFuture import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import org.jetbrains.plugins.github.api.data.GHCommit import org.jetbrains.plugins.github.pullrequest.data.GHPRIdentifier import org.jetbrains.plugins.github.pullrequest.data.service.GHPRChangesService -import java.util.concurrent.CompletableFuture internal class GHPRChangesDataProviderImpl(parentCs: CoroutineScope, private val changesService: GHPRChangesService, @@ -81,10 +79,6 @@ internal class GHPRChangesDataProviderImpl(parentCs: CoroutineScope, return changesService.loadPatch(mergeBase, commitSha).find { it.filePath == filePath } } - @Deprecated("Please migrate ro coroutines and use apiCommitsRequest") - override fun loadCommitsFromApi(): CompletableFuture> = - cs.async { loadCommits() }.asCompletableFuture() - private inner class ChangesDataLoader(parentCs: CoroutineScope, val refs: GHPRBranchesRefs) { private val cs = parentCs.childScope()