File tree Expand file tree Collapse file tree 6 files changed +120
-93
lines changed
main/java/org/sonarsource/sonarlint/ls
test/java/org/sonarsource/sonarlint/ls Expand file tree Collapse file tree 6 files changed +120
-93
lines changed Original file line number Diff line number Diff line change 24
24
25
25
<properties >
26
26
<jdk .min.version>17</jdk .min.version>
27
- <sonarlint .core.version>10.32 .0.82302 </sonarlint .core.version>
27
+ <sonarlint .core.version>10.33 .0.82369 </sonarlint .core.version>
28
28
<slf4j .version>2.0.17</slf4j .version>
29
29
<!-- Version used by Xodus -->
30
30
<kotlin .version>1.6.10</kotlin .version>
Original file line number Diff line number Diff line change 37
37
import org .sonarsource .sonarlint .core .rpc .protocol .backend .binding .GetSharedConnectedModeConfigFileParams ;
38
38
import org .sonarsource .sonarlint .core .rpc .protocol .backend .binding .GetSharedConnectedModeConfigFileResponse ;
39
39
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetConnectionSuggestionsResponse ;
40
+ import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetMCPServerConfigurationParams ;
41
+ import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetMCPServerConfigurationResponse ;
40
42
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .auth .HelpGenerateUserTokenResponse ;
41
43
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .org .OrganizationDto ;
42
44
import org .sonarsource .sonarlint .core .rpc .protocol .backend .sca .ChangeDependencyRiskStatusParams ;
@@ -707,6 +709,9 @@ record AnalyseOpenFileIgnoringExcludesParams(
707
709
@ JsonRequest ("sonarlint/getSharedConnectedModeFileContent" )
708
710
CompletableFuture <GetSharedConnectedModeConfigFileResponse > getSharedConnectedModeConfigFileContents (GetSharedConnectedModeConfigFileParams params );
709
711
712
+ @ JsonRequest ("sonarlint/getMCPServerConfiguration" )
713
+ CompletableFuture <GetMCPServerConfigurationResponse > getMCPServerConfiguration (GetMCPServerConfigurationParams params );
714
+
710
715
enum BindingCreationMode {
711
716
AUTOMATIC ,
712
717
IMPORTED ,
Original file line number Diff line number Diff line change 92
92
import org .sonarsource .sonarlint .core .rpc .protocol .backend .binding .GetSharedConnectedModeConfigFileParams ;
93
93
import org .sonarsource .sonarlint .core .rpc .protocol .backend .binding .GetSharedConnectedModeConfigFileResponse ;
94
94
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetConnectionSuggestionsResponse ;
95
+ import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetMCPServerConfigurationParams ;
96
+ import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetMCPServerConfigurationResponse ;
95
97
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .auth .HelpGenerateUserTokenResponse ;
96
98
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .config .SonarCloudConnectionConfigurationDto ;
97
99
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .config .SonarQubeConnectionConfigurationDto ;
@@ -673,6 +675,11 @@ public CompletableFuture<GetSharedConnectedModeConfigFileResponse> getSharedConn
673
675
return backendServiceFacade .getBackendService ().getSharedConnectedModeConfigFileContents (params );
674
676
}
675
677
678
+ @ Override
679
+ public CompletableFuture <GetMCPServerConfigurationResponse > getMCPServerConfiguration (GetMCPServerConfigurationParams params ) {
680
+ return backendServiceFacade .getBackendService ().getMCPServerConfiguration (params );
681
+ }
682
+
676
683
@ Override
677
684
public void onTokenUpdate (OnTokenUpdateNotificationParams onTokenUpdateNotificationParams ) {
678
685
CompletableFutures .computeAsync (cancelToken -> {
Original file line number Diff line number Diff line change 55
55
import org .sonarsource .sonarlint .core .rpc .protocol .backend .config .scope .DidAddConfigurationScopesParams ;
56
56
import org .sonarsource .sonarlint .core .rpc .protocol .backend .config .scope .DidRemoveConfigurationScopeParams ;
57
57
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetConnectionSuggestionsResponse ;
58
+ import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetMCPServerConfigurationParams ;
59
+ import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetMCPServerConfigurationResponse ;
58
60
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .auth .HelpGenerateUserTokenParams ;
59
61
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .auth .HelpGenerateUserTokenResponse ;
60
62
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .common .TransientSonarCloudConnectionDto ;
@@ -259,6 +261,10 @@ public CompletableFuture<GetSharedConnectedModeConfigFileResponse> getSharedConn
259
261
return backend .getBindingService ().getSharedConnectedModeConfigFileContents (params );
260
262
}
261
263
264
+ public CompletableFuture <GetMCPServerConfigurationResponse > getMCPServerConfiguration (GetMCPServerConfigurationParams params ) {
265
+ return backend .getConnectionService ().getMCPServerConfiguration (params );
266
+ }
267
+
262
268
public void didChangeClientNodeJsPath (DidChangeClientNodeJsPathParams params ) {
263
269
backend .getAnalysisService ().didChangeClientNodeJsPath (params );
264
270
}
Original file line number Diff line number Diff line change 39
39
import org .sonarsource .sonarlint .core .rpc .protocol .backend .config .ConfigurationRpcService ;
40
40
import org .sonarsource .sonarlint .core .rpc .protocol .backend .config .binding .DidUpdateBindingParams ;
41
41
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .ConnectionRpcService ;
42
+ import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .GetMCPServerConfigurationParams ;
42
43
import org .sonarsource .sonarlint .core .rpc .protocol .backend .connection .org .ListUserOrganizationsParams ;
43
44
import org .sonarsource .sonarlint .core .rpc .protocol .backend .flightrecorder .FlightRecordingRpcService ;
44
45
import org .sonarsource .sonarlint .core .rpc .protocol .backend .hotspot .HotspotRpcService ;
@@ -253,4 +254,19 @@ void shouldAskBackendToDumpThreads() {
253
254
254
255
verify (flightRecordingService ).captureThreadDump ();
255
256
}
257
+
258
+ @ Test
259
+ void shouldForwardMCPServerConfigurationRequestToBackend () {
260
+ var connectionId = "connectionId" ;
261
+ var token = "token" ;
262
+
263
+ var argumentCaptor = ArgumentCaptor .forClass (GetMCPServerConfigurationParams .class );
264
+ when (backend .getConnectionService ()).thenReturn (connectionRpcService );
265
+
266
+ underTest .getMCPServerConfiguration (new GetMCPServerConfigurationParams (connectionId , token ));
267
+
268
+ verify (connectionRpcService ).getMCPServerConfiguration (argumentCaptor .capture ());
269
+ assertThat (argumentCaptor .getValue ().getConnectionId ()).isEqualTo (connectionId );
270
+ assertThat (argumentCaptor .getValue ().getToken ()).isEqualTo (token );
271
+ }
256
272
}
You can’t perform that action at this time.
0 commit comments