Selaa lähdekoodia

SONAR-20260 Fix quality gate

tags/10.2.0.77647
Léo Geoffroy 9 kuukautta sitten
vanhempi
commit
5362244699

+ 3
- 1
server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectexport/rule/ExportAdHocRulesStep.java Näytä tiedosto

@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.ibatis.cursor.Cursor;
import org.slf4j.LoggerFactory;
import org.sonar.api.rules.CleanCodeAttribute;
import org.sonar.ce.task.projectexport.steps.DumpElement;
import org.sonar.ce.task.projectexport.steps.DumpWriter;
import org.sonar.ce.task.projectexport.steps.ProjectHolder;
@@ -73,6 +74,7 @@ public class ExportAdHocRulesStep implements ComputationStep {
}

private static ProjectDump.AdHocRule convertToAdHocRule(RuleDto ruleDto, ProjectDump.AdHocRule.Builder builder) {
CleanCodeAttribute cleanCodeAttribute = ruleDto.getCleanCodeAttribute();
return builder
.clear()
.setRef(ruleDto.getUuid())
@@ -84,7 +86,7 @@ public class ExportAdHocRulesStep implements ComputationStep {
.setType(ruleDto.getType())
.setScope(ruleDto.getScope().name())
.setMetadata(buildMetadata(ruleDto))
.setCleanCodeAttribute(ruleDto.getCleanCodeAttribute() != null ? ruleDto.getCleanCodeAttribute().name() : null)
.setCleanCodeAttribute(cleanCodeAttribute != null ? cleanCodeAttribute.name() : null)
.addAllImpacts(buildImpacts(ruleDto.getDefaultImpacts()))
.build();
}

+ 4
- 2
server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleForIndexingDto.java Näytä tiedosto

@@ -27,6 +27,7 @@ import java.util.Set;
import javax.annotation.CheckForNull;
import org.sonar.api.rule.RuleKey;
import org.sonar.api.rule.RuleStatus;
import org.sonar.api.rules.CleanCodeAttribute;
import org.sonar.api.rules.RuleType;
import org.sonar.db.issue.ImpactDto;

@@ -87,8 +88,9 @@ public class RuleForIndexingDto {
ruleForIndexingDto.setRuleDescriptionSectionsDtos(Sets.newHashSet(r.getRuleDescriptionSectionDtos()));
}

if (r.getCleanCodeAttribute() != null) {
ruleForIndexingDto.cleanCodeAttributeCategory = r.getCleanCodeAttribute().getAttributeCategory().name();
CleanCodeAttribute cleanCodeAttribute = r.getCleanCodeAttribute();
if (cleanCodeAttribute != null) {
ruleForIndexingDto.cleanCodeAttributeCategory = cleanCodeAttribute.getAttributeCategory().name();
}
ruleForIndexingDto.setImpacts(r.getDefaultImpacts());


+ 0
- 1
server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleMapper.java Näytä tiedosto

@@ -33,7 +33,6 @@ import org.sonar.api.resources.Language;
import org.sonar.api.resources.Languages;
import org.sonar.api.rule.RuleKey;
import org.sonar.api.rules.CleanCodeAttribute;
import org.sonar.api.rules.RuleType;
import org.sonar.api.server.debt.DebtRemediationFunction;
import org.sonar.api.server.debt.internal.DefaultDebtRemediationFunction;
import org.sonar.db.issue.ImpactDto;

Loading…
Peruuta
Tallenna