aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrlovAlexander <alexander.orlov@sonarsource.com>2024-10-17 12:13:24 +0200
committersonartech <sonartech@sonarsource.com>2024-10-18 20:03:11 +0000
commitd46582652ab35d9e24f6486380aedf10ba98d04a (patch)
treec04fb80f3284bc77edf7dcd9774d3bcc69af14aa
parent9b008e6d740cdf2d670597f9e36da786cecb8340 (diff)
downloadsonarqube-d46582652ab35d9e24f6486380aedf10ba98d04a.tar.gz
sonarqube-d46582652ab35d9e24f6486380aedf10ba98d04a.zip
SONAR-23259 Update QualityProfileChangesUpdater
-rw-r--r--server/sonar-webserver-core/src/main/java/org/sonar/server/rule/registration/QualityProfileChangesUpdater.java11
-rw-r--r--server/sonar-webserver-core/src/test/java/org/sonar/server/rule/registration/QualityProfileChangesUpdaterTest.java11
2 files changed, 4 insertions, 18 deletions
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/registration/QualityProfileChangesUpdater.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/registration/QualityProfileChangesUpdater.java
index d9b74a99222..8f55e1962a8 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/registration/QualityProfileChangesUpdater.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/rule/registration/QualityProfileChangesUpdater.java
@@ -88,17 +88,6 @@ public class QualityProfileChangesUpdater {
private static Set<RuleImpactChangeDto> createRuleImpactChanges(PluginRuleUpdate pluginRuleUpdate, RuleChangeDto ruleChangeDto) {
Set<RuleImpactChangeDto> ruleImpactChangeDtos = new HashSet<>();
- pluginRuleUpdate.getMatchingSoftwareQualities().stream()
- .map(softwareQuality -> {
- RuleImpactChangeDto ruleImpactChangeDto = new RuleImpactChangeDto();
- ruleImpactChangeDto.setRuleChangeUuid(ruleChangeDto.getUuid());
- ruleImpactChangeDto.setOldSeverity(pluginRuleUpdate.getOldImpacts().get(softwareQuality));
- ruleImpactChangeDto.setOldSoftwareQuality(softwareQuality);
- ruleImpactChangeDto.setNewSeverity(pluginRuleUpdate.getNewImpacts().get(softwareQuality));
- ruleImpactChangeDto.setNewSoftwareQuality(softwareQuality);
- return ruleImpactChangeDto;
- }).forEach(ruleImpactChangeDtos::add);
-
Iterator<SoftwareQuality> removedIterator = (Sets.difference(pluginRuleUpdate.getOldImpacts().keySet(), pluginRuleUpdate.getMatchingSoftwareQualities())).iterator();
Iterator<SoftwareQuality> addedIterator = (Sets.difference(pluginRuleUpdate.getNewImpacts().keySet(), pluginRuleUpdate.getMatchingSoftwareQualities())).iterator();
while (removedIterator.hasNext() || addedIterator.hasNext()) {
diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/registration/QualityProfileChangesUpdaterTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/registration/QualityProfileChangesUpdaterTest.java
index 6b2680733df..91cf442389e 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/registration/QualityProfileChangesUpdaterTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/rule/registration/QualityProfileChangesUpdaterTest.java
@@ -21,8 +21,8 @@ package org.sonar.server.rule.registration;
import java.util.List;
import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.sonar.api.issue.impact.Severity;
import org.sonar.api.issue.impact.SoftwareQuality;
@@ -62,7 +62,7 @@ public class QualityProfileChangesUpdaterTest {
private final QualityProfileChangesUpdater underTest = new QualityProfileChangesUpdater(dbClient, UuidFactoryImpl.INSTANCE, sonarQubeVersion);
- @Before
+ @BeforeEach
public void before() {
when(dbClient.ruleChangeDao()).thenReturn(ruleChangeDao);
when(dbClient.qProfileChangeDao()).thenReturn(qualityProfileChangeDao);
@@ -123,10 +123,7 @@ public class QualityProfileChangesUpdaterTest {
assertThat(firstChange.getNewCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.CLEAR);
assertThat(firstChange.getOldCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.TESTED);
assertThat(firstChange.getRuleUuid()).isEqualTo(RULE_UUID);
- assertThat(firstChange.getRuleImpactChanges()).hasSize(1);
- assertThat(firstChange.getRuleImpactChanges()).extracting(RuleImpactChangeDto::getNewSoftwareQuality,
- RuleImpactChangeDto::getOldSoftwareQuality, RuleImpactChangeDto::getOldSeverity, RuleImpactChangeDto::getNewSeverity)
- .containsExactly(tuple(SoftwareQuality.RELIABILITY, SoftwareQuality.RELIABILITY, Severity.MEDIUM, Severity.LOW));
+ assertThat(firstChange.getRuleImpactChanges()).isEmpty();
assertThat(secondChange.getNewCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.EFFICIENT);
assertThat(secondChange.getOldCleanCodeAttribute()).isEqualTo(CleanCodeAttribute.DISTINCT);