Skip to content

Commit

Permalink
PR review
Browse files Browse the repository at this point in the history
  • Loading branch information
nquinquenel committed Sep 20, 2024
1 parent 310ea8a commit 3fa9306
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 0 additions & 2 deletions src/main/java/org/sonarlint/intellij/core/BackendService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -742,15 +742,13 @@ class BackendService : Disposable {
}

fun validateConnection(server: ServerConnection): CompletableFuture<ValidateConnectionResponse> {
println("In matrix")
val credentials: Either<TokenDto, UsernamePasswordDto> = server.token?.let { Either.forLeft(TokenDto(server.token)) }
?: Either.forRight(UsernamePasswordDto(server.login, server.password))
val params: ValidateConnectionParams = if (server.isSonarCloud) {
ValidateConnectionParams(TransientSonarCloudConnectionDto(server.organizationKey, credentials))
} else {
ValidateConnectionParams(TransientSonarQubeConnectionDto(server.hostUrl, credentials))
}
println("Requesting matrix")
return requestFromBackend { it.connectionService.validateConnection(params) }
}

Expand Down
14 changes: 9 additions & 5 deletions src/main/java/org/sonarlint/intellij/ui/WhatsInThisViewPanel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.sonarlint.intellij.ui.CurrentFileStatusPanel.subscribeToEventsThatAff
import org.sonarlint.intellij.ui.UiUtils.Companion.runOnUiThread
import org.sonarlint.intellij.util.HelpLabelUtils.Companion.createHelpText
import org.sonarlint.intellij.util.HelpLabelUtils.Companion.createHelpTextNotConnected
import org.sonarlint.intellij.util.runOnPooledThread

class WhatsInThisViewPanel(val project: Project, private var helpText: String) {
var panel: JPanel
Expand Down Expand Up @@ -69,11 +70,14 @@ class WhatsInThisViewPanel(val project: Project, private var helpText: String) {
}

private fun switchCards() {
val projectBindingManager = SonarLintUtils.getService(project, ProjectBindingManager::class.java)
projectBindingManager.tryGetServerConnection().ifPresentOrElse({
switchCard(CONNECTED)
}) // No connection settings for project
{ switchCard(NOT_CONNECTED) }
// Checking connected mode state may take time, so lets move from EDT to pooled thread
runOnPooledThread(project) {
val projectBindingManager = SonarLintUtils.getService(project, ProjectBindingManager::class.java)
projectBindingManager.tryGetServerConnection().ifPresentOrElse({
switchCard(CONNECTED)
}) // No connection settings for project
{ switchCard(NOT_CONNECTED) }
}
}

private fun switchCard(cardName: String) {
Expand Down

0 comments on commit 3fa9306

Please sign in to comment.