Skip to content

Commit 8a4a4e0

Browse files
nquinquenelnquinquenel
committed
Rebase fix
1 parent 052e50d commit 8a4a4e0

File tree

12 files changed

+39
-33
lines changed

12 files changed

+39
-33
lines changed

‎backend/core/src/main/java/org/sonarsource/sonarlint/core/plugin/PluginStatus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static PluginStatus unsupported(SonarLanguage language) {
6060
}
6161

6262
public static PluginStatus failed(SonarLanguage language) {
63-
return forLanguage(language, ArtifactState.FAILED, null, null, null, null);
63+
return forLanguage(language, ArtifactState.FAILED, null, null, null, null, null);
6464
}
6565

6666
public String pluginName() {

‎backend/core/src/main/java/org/sonarsource/sonarlint/core/plugin/PluginStatusMapper.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,19 @@ private PluginStatusMapper() {
3333
}
3434

3535
public static List<PluginStatusDto> toDto(List<PluginStatus> statuses) {
36-
return statuses.stream().map(status -> toDto(status)).toList();
36+
return statuses.stream().map(PluginStatusMapper::toDto).toList();
3737
}
3838

3939
public static PluginStatusDto toDto(PluginStatus status) {
4040
return new PluginStatusDto(
41-
Language.valueOf(status.language().name()),
42-
status.language().getName(),
41+
status.language() != null ? Language.valueOf(status.language().name()) : null,
42+
status.language() != null ? status.language().getName() : null,
4343
toDto(status.state()),
4444
toDto(status.source()),
4545
status.actualVersion() == null ? null : status.actualVersion().toString(),
4646
status.overriddenVersion() == null ? null : status.overriddenVersion().toString(),
47-
status.serverVersion());
47+
status.serverVersion()
48+
);
4849
}
4950

5051
public static PluginStateDto toDto(ArtifactState state) {

‎backend/core/src/main/java/org/sonarsource/sonarlint/core/plugin/resolvers/ConnectedModeCompanionPluginResolver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private void resolveOrScheduleCompanion(String connectionId, ServerPlugin plugin
9999

100100
private void addStoredCompanion(String connectionId, String key, StoredPlugin stored, ConcurrentHashMap<String, PluginStatus> result) {
101101
var source = downloader.sourceFor(connectionId);
102-
result.put(key, PluginStatus.forCompanion(key, ArtifactState.SYNCED, source, stored.getJarPath()));
102+
result.put(key, PluginStatus.forCompanion(key, ArtifactState.SYNCED, source, stored.getJarPath(), null));
103103
}
104104

105105
private void processCompanionPlugin(String connectionId, ServerPlugin plugin, ConcurrentHashMap<String, PluginStatus> result) {
@@ -113,7 +113,7 @@ private void processCompanionPlugin(String connectionId, ServerPlugin plugin, Co
113113
return;
114114
}
115115
downloader.scheduleCompanionPluginDownload(connectionId, plugin);
116-
result.put(plugin.getKey(), PluginStatus.forCompanion(plugin.getKey(), ArtifactState.DOWNLOADING, null, null));
116+
result.put(plugin.getKey(), PluginStatus.forCompanion(plugin.getKey(), ArtifactState.DOWNLOADING, null, null, null));
117117
}
118118

119119
private boolean isForceSynchronized(String pluginKey) {

‎backend/core/src/main/java/org/sonarsource/sonarlint/core/plugin/resolvers/EmbeddedArtifactResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private static Map<String, PluginStatus> computeCompanionPlugins(Map<String, Pat
8181
.filter(e -> !SonarLanguage.containsPlugin(e.getKey()))
8282
.collect(Collectors.toUnmodifiableMap(
8383
Map.Entry::getKey,
84-
e -> PluginStatus.forCompanion(e.getKey(), ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, e.getValue())));
84+
e -> PluginStatus.forCompanion(e.getKey(), ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, e.getValue(), null)));
8585
}
8686

8787
@Nullable

‎backend/core/src/main/java/org/sonarsource/sonarlint/core/plugin/resolvers/OnDemandArtifactResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private void downloadAndFireEvent(DownloadableArtifact artifact) {
144144
private List<PluginStatus> findAffectedLanguageStatuses(DownloadableArtifact artifact, Path pluginPath) {
145145
var version = Version.create(artifact.version());
146146
return findAffected(artifact)
147-
.map(e -> PluginStatus.forLanguage(e.getKey(), ArtifactState.ACTIVE, ArtifactSource.ON_DEMAND, version, null, pluginPath))
147+
.map(e -> PluginStatus.forLanguage(e.getKey(), ArtifactState.ACTIVE, ArtifactSource.ON_DEMAND, version, null, pluginPath, null))
148148
.toList();
149149
}
150150

‎backend/core/src/main/java/org/sonarsource/sonarlint/core/plugin/resolvers/ServerPluginDownloader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void asyncCompanionDownload(String connectionId, ServerPlugin plugin) {
8383
} catch (Exception e) {
8484
LOG.error("Failed to download companion plugin '{}' for connection '{}'", plugin.getKey(), connectionId, e);
8585
eventPublisher.publishEvent(new PluginStatusUpdateEvent(connectionId,
86-
List.of(PluginStatus.forCompanion(plugin.getKey(), ArtifactState.FAILED, null, null))));
86+
List.of(PluginStatus.forCompanion(plugin.getKey(), ArtifactState.FAILED, null, null, null))));
8787
}
8888
}
8989

@@ -95,7 +95,7 @@ private void downloadPluginAndFireEvent(String connectionId, ServerPlugin server
9595
var source = sourceFor(connectionId);
9696
var version = storedPath != null ? PluginJarUtils.readVersion(storedPath) : null;
9797
var statuses = SonarLanguage.getLanguagesByPluginKey(pluginKey).stream()
98-
.map(l -> PluginStatus.forLanguage(l, ArtifactState.SYNCED, source, version, null, storedPath))
98+
.map(l -> PluginStatus.forLanguage(l, ArtifactState.SYNCED, source, version, null, storedPath, null))
9999
.toList();
100100
eventPublisher.publishEvent(new PluginStatusUpdateEvent(connectionId, statuses));
101101
} else {
@@ -110,7 +110,7 @@ private void downloadCompanionAndFireEvent(String connectionId, ServerPlugin plu
110110
: null;
111111
var source = sourceFor(connectionId);
112112
eventPublisher.publishEvent(new PluginStatusUpdateEvent(connectionId,
113-
List.of(PluginStatus.forCompanion(plugin.getKey(), state, source, storedPath))));
113+
List.of(PluginStatus.forCompanion(plugin.getKey(), state, source, storedPath, null))));
114114
}
115115

116116
ArtifactState downloadPluginSync(String connectionId, ServerPlugin serverPlugin) {

‎backend/core/src/test/java/org/sonarsource/sonarlint/core/plugin/EmbeddedArtifactResolverTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void should_return_only_non_language_plugin_keys_as_companion_plugins() throws I
166166
var omnisharpJar = createJar("sonarlint-omnisharp-plugin.jar", "omnisharp");
167167
var javaJar = createJar("sonar-java-plugin.jar");
168168
var resolver = new EmbeddedArtifactResolver(mockParams(Set.of(omnisharpJar, javaJar), Map.of(), null));
169-
var expected = PluginStatus.forCompanion("omnisharp", ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, omnisharpJar);
169+
var expected = PluginStatus.forCompanion("omnisharp", ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, omnisharpJar, null);
170170

171171
var result = resolver.resolveCompanionPlugins(null);
172172

@@ -187,7 +187,7 @@ void should_return_companion_plugins_in_connected_mode_when_present_in_connected
187187
var omnisharpJar = createJar("sonarlint-omnisharp-plugin.jar", "omnisharp");
188188
var javaJar = createJar("sonar-java-plugin.jar");
189189
var resolver = new EmbeddedArtifactResolver(mockParams(Set.of(omnisharpJar, javaJar), Map.of("omnisharp", omnisharpJar), null));
190-
var expected = PluginStatus.forCompanion("omnisharp", ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, omnisharpJar);
190+
var expected = PluginStatus.forCompanion("omnisharp", ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, omnisharpJar, null);
191191

192192
var result = resolver.resolveCompanionPlugins("someConnection");
193193

‎backend/core/src/test/java/org/sonarsource/sonarlint/core/plugin/PluginStatusNotifierServiceTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.sonarsource.sonarlint.core.rpc.protocol.backend.plugin.PluginStateDto;
3333
import org.sonarsource.sonarlint.core.rpc.protocol.backend.plugin.PluginStatusDto;
3434
import org.sonarsource.sonarlint.core.rpc.protocol.client.plugin.DidChangePluginStatusesParams;
35+
import org.sonarsource.sonarlint.core.rpc.protocol.common.Language;
3536

3637
import static org.assertj.core.api.Assertions.assertThat;
3738
import static org.mockito.Mockito.mock;
@@ -50,8 +51,8 @@ class PluginStatusNotifierServiceTest {
5051
private final ConfigurationRepository configurationRepository = new ConfigurationRepository();
5152
private final PluginStatusNotifierService underTest = new PluginStatusNotifierService(pluginsService, client, configurationRepository);
5253

53-
private final PluginStatus standaloneStatus = PluginStatus.forCompanion("Standalone Plugin", ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, null, null);
54-
private final PluginStatus connectedStatus = PluginStatus.forCompanion("Connected Plugin", ArtifactState.ACTIVE, ArtifactSource.SONARQUBE_SERVER, null, "10.1.0");
54+
private final PluginStatus standaloneStatus = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, null, null, null, null);
55+
private final PluginStatus connectedStatus = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.ACTIVE, ArtifactSource.SONARQUBE_SERVER, null, null, null, "10.1");
5556

5657
@BeforeEach
5758
void setUp() {
@@ -97,11 +98,11 @@ void should_notify_only_bound_scopes_in_connected_mode() {
9798
}
9899

99100
private static PluginStatusDto standaloneStatusDto() {
100-
return new PluginStatusDto(org.sonarsource.sonarlint.core.rpc.protocol.common.Language.JAVA, "Java", PluginStateDto.ACTIVE, ArtifactSourceDto.EMBEDDED, null, null, null);
101+
return new PluginStatusDto(Language.JAVA, "Java", PluginStateDto.ACTIVE, ArtifactSourceDto.EMBEDDED, null, null, null);
101102
}
102103

103104
private static PluginStatusDto connectedStatusDto() {
104-
return new PluginStatusDto(org.sonarsource.sonarlint.core.rpc.protocol.common.Language.JAVA, "Java", PluginStateDto.ACTIVE, ArtifactSourceDto.SONARQUBE_SERVER, null, null, "10.0.0");
105+
return new PluginStatusDto(Language.JAVA, "Java", PluginStateDto.ACTIVE, ArtifactSourceDto.SONARQUBE_SERVER, null, null, "10.1");
105106
}
106107

107108
}

‎backend/core/src/test/java/org/sonarsource/sonarlint/core/plugin/PluginsServiceTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ void should_return_list_size_equal_to_sonar_language_values() {
328328

329329
@Test
330330
void should_return_active_embedded_with_empty_versions_when_plugin_in_embedded_analysis() {
331-
var expected = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, null, null, null);
331+
var expected = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.ACTIVE, ArtifactSource.EMBEDDED, null, null, null, null);
332332
var connectionId = "connection1";
333333
mockEmbeddedPlugins(Set.of("java"), Set.of("java"));
334334
mockConnectionPlugins(connectionId);
@@ -340,7 +340,7 @@ void should_return_active_embedded_with_empty_versions_when_plugin_in_embedded_a
340340

341341
@Test
342342
void should_return_failed_embedded_with_empty_versions_when_plugin_in_embedded_all_but_not_in_analysis() {
343-
var expected = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.FAILED, ArtifactSource.EMBEDDED, null, null, null);
343+
var expected = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.FAILED, ArtifactSource.EMBEDDED, null, null, null, null);
344344
var connectionId = "connection1";
345345
mockEmbeddedPlugins(Set.of("java"), Set.of());
346346
mockConnectionPlugins(connectionId);
@@ -352,7 +352,7 @@ void should_return_failed_embedded_with_empty_versions_when_plugin_in_embedded_a
352352

353353
@Test
354354
void should_return_synced_sonar_cloud_with_empty_versions_when_plugin_in_connection_analysis_and_is_sonar_cloud() {
355-
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.SYNCED, ArtifactSource.SONARQUBE_CLOUD, null, null, null);
355+
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.SYNCED, ArtifactSource.SONARQUBE_CLOUD, null, null, null, null);
356356
var connectionId = "SQC";
357357
mockEmbeddedPlugins();
358358
mockConnectionPlugins(connectionId, Set.of("python"), Set.of("python"));
@@ -365,7 +365,7 @@ void should_return_synced_sonar_cloud_with_empty_versions_when_plugin_in_connect
365365

366366
@Test
367367
void should_return_failed_sonar_cloud_with_empty_versions_when_plugin_in_connection_all_but_not_in_analysis_and_is_sonar_cloud() {
368-
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.FAILED, ArtifactSource.SONARQUBE_CLOUD, null, null, null);
368+
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.FAILED, ArtifactSource.SONARQUBE_CLOUD, null, null, null, null);
369369
var connectionId = "SQC";
370370
mockEmbeddedPlugins();
371371
mockConnectionPlugins(connectionId, Set.of("python"), Set.of());
@@ -378,7 +378,7 @@ void should_return_failed_sonar_cloud_with_empty_versions_when_plugin_in_connect
378378

379379
@Test
380380
void should_return_synced_sonar_qube_server_with_empty_versions_when_plugin_in_connection_analysis_and_not_sonar_cloud() {
381-
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.SYNCED, ArtifactSource.SONARQUBE_SERVER, null, null, null);
381+
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.SYNCED, ArtifactSource.SONARQUBE_SERVER, null, null, null, "10.0");
382382
var connectionId = "SQS";
383383
mockEmbeddedPlugins();
384384
mockConnectionPlugins(connectionId, Set.of("python"), Set.of("python"));
@@ -391,7 +391,7 @@ void should_return_synced_sonar_qube_server_with_empty_versions_when_plugin_in_c
391391

392392
@Test
393393
void should_return_failed_sonar_qube_server_with_empty_versions_when_plugin_in_connection_all_but_not_in_analysis_and_not_sonar_cloud() {
394-
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.FAILED, ArtifactSource.SONARQUBE_SERVER, null, null, null);
394+
var expected = PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.FAILED, ArtifactSource.SONARQUBE_SERVER, null, null, null, "10.0");
395395
var connectionId = "SQS";
396396
mockEmbeddedPlugins();
397397
mockConnectionPlugins(connectionId, Set.of("python"), Set.of());
@@ -423,7 +423,7 @@ void should_return_unsupported_with_null_fields_when_plugin_in_sonar_language_bu
423423

424424
@Test
425425
void should_use_connection_plugin_values_when_plugin_present_in_both_embedded_and_connection() {
426-
var expected = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.SYNCED, ArtifactSource.SONARQUBE_SERVER, null, null, null);
426+
var expected = PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.SYNCED, ArtifactSource.SONARQUBE_SERVER, null, null, null, "10.0");
427427
var connectionId = "SQS";
428428
mockEmbeddedPlugins(Set.of("java"), Set.of("java"));
429429
mockConnectionPlugins(connectionId, Set.of("java"), Set.of("java"));
@@ -442,8 +442,8 @@ void should_return_premium_only_for_languages_exclusively_in_connected_mode_when
442442

443443
var result = underTest.getPluginStatuses(null);
444444

445-
assertThat(result).contains(PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.PREMIUM, null, null, null, null))
446-
.doesNotContain(PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.PREMIUM, null, null, null, null));
445+
assertThat(result).contains(PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.PREMIUM, null, null, null, null, null))
446+
.doesNotContain(PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.PREMIUM, null, null, null, null, null));
447447
}
448448

449449
@Test
@@ -457,8 +457,8 @@ void should_return_premium_for_languages_not_in_connection_plugins_when_connecti
457457

458458
var result = underTest.getPluginStatuses(connectionId);
459459

460-
assertThat(result).contains(PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.PREMIUM, null, null, null, null))
461-
.doesNotContain(PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.PREMIUM, null, null, null, null));
460+
assertThat(result).contains(PluginStatus.forLanguage(SonarLanguage.PYTHON, ArtifactState.PREMIUM, null, null, null, null, null))
461+
.doesNotContain(PluginStatus.forLanguage(SonarLanguage.JAVA, ArtifactState.PREMIUM, null, null, null, null, null));
462462
}
463463

464464
@Test

‎backend/core/src/test/java/org/sonarsource/sonarlint/core/plugin/resolvers/OnDemandArtifactResolverTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ private static ResolvedArtifact downloading() {
199199

200200
private static PluginStatus activeStatus(SonarLanguage lang, Path path) {
201201
return PluginStatus.forLanguage(lang, ArtifactState.ACTIVE, ArtifactSource.ON_DEMAND,
202-
Version.create(DownloadableArtifact.CFAMILY_PLUGIN.version()), null, path);
202+
Version.create(DownloadableArtifact.CFAMILY_PLUGIN.version()), null, path, null);
203203
}
204204

205205
private static PluginStatus failedStatus(SonarLanguage lang) {
206-
return PluginStatus.forLanguage(lang, ArtifactState.FAILED, null, null, null, null);
206+
return PluginStatus.forLanguage(lang, ArtifactState.FAILED, null, null, null, null, null);
207207
}
208208

209209
}

0 commit comments

Comments
 (0)