From 87290d15097b2b27cf5945fdb33e3c2a41ada5dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 23 Mar 2017 09:55:57 +0100 Subject: [PATCH] SONAR-8867 fix too long property identifier in RuleDto for most SGBDs --- .../org/sonar/db/rule/RuleDefinitionDto.java | 12 ++--- .../main/java/org/sonar/db/rule/RuleDto.java | 24 +++++----- .../org/sonar/db/rule/RuleMapper.xml | 6 +-- .../java/org/sonar/db/rule/RuleDaoTest.java | 48 +++++++++---------- .../java/org/sonar/db/rule/RuleTesting.java | 6 +-- .../task/projectanalysis/issue/RuleImpl.java | 4 +- .../org/sonar/server/rule/RegisterRules.java | 24 +++++----- .../org/sonar/server/rule/RuleCreator.java | 6 +-- .../org/sonar/server/rule/RuleUpdater.java | 6 +-- .../org/sonar/server/rule/ws/RuleMapper.java | 6 +-- .../server/rule/RegisterRulesMediumTest.java | 2 +- .../sonar/server/rule/RegisterRulesTest.java | 6 +-- .../server/rule/RuleCreatorMediumTest.java | 24 +++++----- .../server/rule/RuleUpdaterMediumTest.java | 48 +++++++++---------- .../rule/ws/SearchActionMediumTest.java | 24 +++++----- .../server/rule/ws/ShowActionMediumTest.java | 30 ++++++------ .../rule/ws/UpdateActionMediumTest.java | 12 ++--- 17 files changed, 144 insertions(+), 144 deletions(-) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java index 5a7b7ca6495..8525dad7330 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDefinitionDto.java @@ -201,31 +201,31 @@ public class RuleDefinitionDto { } @CheckForNull - public String getDefaultRemediationFunction() { + public String getDefRemediationFunction() { return defRemediationFunction; } - public RuleDefinitionDto setDefaultRemediationFunction(@Nullable String defaultRemediationFunction) { + public RuleDefinitionDto setDefRemediationFunction(@Nullable String defaultRemediationFunction) { this.defRemediationFunction = defaultRemediationFunction; return this; } @CheckForNull - public String getDefaultRemediationGapMultiplier() { + public String getDefRemediationGapMultiplier() { return defRemediationGapMultiplier; } - public RuleDefinitionDto setDefaultRemediationGapMultiplier(@Nullable String defaultRemediationGapMultiplier) { + public RuleDefinitionDto setDefRemediationGapMultiplier(@Nullable String defaultRemediationGapMultiplier) { this.defRemediationGapMultiplier = defaultRemediationGapMultiplier; return this; } @CheckForNull - public String getDefaultRemediationBaseEffort() { + public String getDefRemediationBaseEffort() { return defRemediationBaseEffort; } - public RuleDefinitionDto setDefaultRemediationBaseEffort(@Nullable String defaultRemediationBaseEffort) { + public RuleDefinitionDto setDefRemediationBaseEffort(@Nullable String defaultRemediationBaseEffort) { this.defRemediationBaseEffort = defaultRemediationBaseEffort; return this; } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java index 66267ab3e96..c591bb9c7fb 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/rule/RuleDto.java @@ -175,32 +175,32 @@ public class RuleDto { } @CheckForNull - public String getDefaultRemediationFunction() { - return definition.getDefaultRemediationFunction(); + public String getDefRemediationFunction() { + return definition.getDefRemediationFunction(); } - public RuleDto setDefaultRemediationFunction(@Nullable String defaultRemediationFunction) { - definition.setDefaultRemediationFunction(defaultRemediationFunction); + public RuleDto setDefRemediationFunction(@Nullable String defaultRemediationFunction) { + definition.setDefRemediationFunction(defaultRemediationFunction); return this; } @CheckForNull - public String getDefaultRemediationGapMultiplier() { - return definition.getDefaultRemediationGapMultiplier(); + public String getDefRemediationGapMultiplier() { + return definition.getDefRemediationGapMultiplier(); } - public RuleDto setDefaultRemediationGapMultiplier(@Nullable String defaultRemediationGapMultiplier) { - definition.setDefaultRemediationGapMultiplier(defaultRemediationGapMultiplier); + public RuleDto setDefRemediationGapMultiplier(@Nullable String defaultRemediationGapMultiplier) { + definition.setDefRemediationGapMultiplier(defaultRemediationGapMultiplier); return this; } @CheckForNull - public String getDefaultRemediationBaseEffort() { - return definition.getDefaultRemediationBaseEffort(); + public String getDefRemediationBaseEffort() { + return definition.getDefRemediationBaseEffort(); } - public RuleDto setDefaultRemediationBaseEffort(@Nullable String defaultRemediationBaseEffort) { - definition.setDefaultRemediationBaseEffort(defaultRemediationBaseEffort); + public RuleDto setDefRemediationBaseEffort(@Nullable String defaultRemediationBaseEffort) { + definition.setDefRemediationBaseEffort(defaultRemediationBaseEffort); return this; } diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml index 487a9837300..79666d24119 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml @@ -16,9 +16,9 @@ r.is_template as "isTemplate", r.language as "language", r.template_id as "templateId", - r.def_remediation_function as "defaultRemediationFunction", - r.def_remediation_gap_mult as "defaultRemediationGapMultiplier", - r.def_remediation_base_effort as "defaultRemediationBaseEffort", + r.def_remediation_function as "defRemediationFunction", + r.def_remediation_gap_mult as "defRemediationGapMultiplier", + r.def_remediation_base_effort as "defRemediationBaseEffort", r.gap_description as "gapDescription", r.system_tags as "systemTagsField", r.rule_type as "type", diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java index d1d062dd790..60616176066 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java @@ -266,9 +266,9 @@ public class RuleDaoTest { assertThat(ruleDto.getDescriptionFormat()).isEqualTo(RuleDto.Format.HTML); assertThat(ruleDto.getStatus()).isEqualTo(RuleStatus.READY); assertThat(ruleDto.getRepositoryKey()).isEqualTo("checkstyle"); - assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET"); - assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isEqualTo("5d"); - assertThat(ruleDto.getDefaultRemediationBaseEffort()).isEqualTo("10h"); + assertThat(ruleDto.getDefRemediationFunction()).isEqualTo("LINEAR_OFFSET"); + assertThat(ruleDto.getDefRemediationGapMultiplier()).isEqualTo("5d"); + assertThat(ruleDto.getDefRemediationBaseEffort()).isEqualTo("10h"); assertThat(ruleDto.getGapDescription()).isEqualTo("squid.S115.effortToFix"); } @@ -309,9 +309,9 @@ public class RuleDaoTest { .setIsTemplate(true) .setLanguage("dart") .setTemplateId(3) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) - .setDefaultRemediationGapMultiplier("5d") - .setDefaultRemediationBaseEffort("10h") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) + .setDefRemediationGapMultiplier("5d") + .setDefRemediationBaseEffort("10h") .setGapDescription("squid.S115.effortToFix") .setSystemTags(newHashSet("systag1", "systag2")) .setType(RuleType.BUG) @@ -333,9 +333,9 @@ public class RuleDaoTest { assertThat(ruleDto.getLanguage()).isEqualTo("dart"); assertThat(ruleDto.isTemplate()).isTrue(); assertThat(ruleDto.getTemplateId()).isEqualTo(3); - assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET"); - assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isEqualTo("5d"); - assertThat(ruleDto.getDefaultRemediationBaseEffort()).isEqualTo("10h"); + assertThat(ruleDto.getDefRemediationFunction()).isEqualTo("LINEAR_OFFSET"); + assertThat(ruleDto.getDefRemediationGapMultiplier()).isEqualTo("5d"); + assertThat(ruleDto.getDefRemediationBaseEffort()).isEqualTo("10h"); assertThat(ruleDto.getGapDescription()).isEqualTo("squid.S115.effortToFix"); assertThat(ruleDto.getSystemTags()).containsOnly("systag1", "systag2"); assertThat(ruleDto.getType()).isEqualTo(RuleType.BUG.getDbConstant()); @@ -360,9 +360,9 @@ public class RuleDaoTest { .setIsTemplate(true) .setLanguage("dart") .setTemplateId(3) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) - .setDefaultRemediationGapMultiplier("5d") - .setDefaultRemediationBaseEffort("10h") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.toString()) + .setDefRemediationGapMultiplier("5d") + .setDefRemediationBaseEffort("10h") .setGapDescription("squid.S115.effortToFix") .setSystemTags(newHashSet("systag1", "systag2")) .setType(RuleType.BUG) @@ -383,9 +383,9 @@ public class RuleDaoTest { assertThat(ruleDto.getLanguage()).isEqualTo("dart"); assertThat(ruleDto.isTemplate()).isTrue(); assertThat(ruleDto.getTemplateId()).isEqualTo(3); - assertThat(ruleDto.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET"); - assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isEqualTo("5d"); - assertThat(ruleDto.getDefaultRemediationBaseEffort()).isEqualTo("10h"); + assertThat(ruleDto.getDefRemediationFunction()).isEqualTo("LINEAR_OFFSET"); + assertThat(ruleDto.getDefRemediationGapMultiplier()).isEqualTo("5d"); + assertThat(ruleDto.getDefRemediationBaseEffort()).isEqualTo("10h"); assertThat(ruleDto.getGapDescription()).isEqualTo("squid.S115.effortToFix"); assertThat(ruleDto.getSystemTags()).containsOnly("systag1", "systag2"); assertThat(ruleDto.getType()).isEqualTo(RuleType.BUG.getDbConstant()); @@ -432,11 +432,11 @@ public class RuleDaoTest { assertThat(ruleDto.getNoteCreatedAt()).isNotNull(); assertThat(ruleDto.getNoteUpdatedAt()).isNotNull(); assertThat(ruleDto.getRemediationFunction()).isEqualTo("LINEAR"); - assertThat(ruleDto.getDefaultRemediationFunction()).isNull(); + assertThat(ruleDto.getDefRemediationFunction()).isNull(); assertThat(ruleDto.getRemediationGapMultiplier()).isEqualTo("1h"); - assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isNull(); + assertThat(ruleDto.getDefRemediationGapMultiplier()).isNull(); assertThat(ruleDto.getRemediationBaseEffort()).isEqualTo("5min"); - assertThat(ruleDto.getDefaultRemediationBaseEffort()).isNull(); + assertThat(ruleDto.getDefRemediationBaseEffort()).isNull(); assertThat(ruleDto.getGapDescription()).isNull(); assertThat(ruleDto.getTags()).containsOnly("tag1", "tag2"); assertThat(ruleDto.getSystemTags()).isEmpty(); @@ -489,11 +489,11 @@ public class RuleDaoTest { assertThat(ruleDto.getNoteCreatedAt()).isNull(); assertThat(ruleDto.getNoteUpdatedAt()).isNull(); assertThat(ruleDto.getRemediationFunction()).isNull(); - assertThat(ruleDto.getDefaultRemediationFunction()).isNull(); + assertThat(ruleDto.getDefRemediationFunction()).isNull(); assertThat(ruleDto.getRemediationGapMultiplier()).isNull(); - assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isNull(); + assertThat(ruleDto.getDefRemediationGapMultiplier()).isNull(); assertThat(ruleDto.getRemediationBaseEffort()).isNull(); - assertThat(ruleDto.getDefaultRemediationBaseEffort()).isNull(); + assertThat(ruleDto.getDefRemediationBaseEffort()).isNull(); assertThat(ruleDto.getGapDescription()).isNull(); assertThat(ruleDto.getTags()).isEmpty(); assertThat(ruleDto.getSystemTags()).isEmpty(); @@ -521,11 +521,11 @@ public class RuleDaoTest { assertThat(ruleDto.getNoteCreatedAt()).isNotNull(); assertThat(ruleDto.getNoteUpdatedAt()).isNotNull(); assertThat(ruleDto.getRemediationFunction()).isEqualTo("LINEAR"); - assertThat(ruleDto.getDefaultRemediationFunction()).isNull(); + assertThat(ruleDto.getDefRemediationFunction()).isNull(); assertThat(ruleDto.getRemediationGapMultiplier()).isEqualTo("1h"); - assertThat(ruleDto.getDefaultRemediationGapMultiplier()).isNull(); + assertThat(ruleDto.getDefRemediationGapMultiplier()).isNull(); assertThat(ruleDto.getRemediationBaseEffort()).isEqualTo("5min"); - assertThat(ruleDto.getDefaultRemediationBaseEffort()).isNull(); + assertThat(ruleDto.getDefRemediationBaseEffort()).isNull(); assertThat(ruleDto.getGapDescription()).isNull(); assertThat(ruleDto.getTags()).containsOnly("tag1", "tag2"); assertThat(ruleDto.getSystemTags()).isEmpty(); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTesting.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTesting.java index c56015f0adf..a35add1f3c5 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTesting.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleTesting.java @@ -113,9 +113,9 @@ public class RuleTesting { .setIsTemplate(false) .setSystemTags(ImmutableSet.of("systag1", "systag2")) .setLanguage("js") - .setDefaultRemediationFunction("LINEAR_OFFSET") - .setDefaultRemediationGapMultiplier("5d") - .setDefaultRemediationBaseEffort("10h") + .setDefRemediationFunction("LINEAR_OFFSET") + .setDefRemediationGapMultiplier("5d") + .setDefRemediationBaseEffort("10h") .setGapDescription(ruleKey.repository() + "." + ruleKey.rule() + ".effortToFix") .setType(RuleType.CODE_SMELL) .setCreatedAt(new Date().getTime()) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java index 32625cd9dd7..adda0c98725 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleImpl.java @@ -123,9 +123,9 @@ public class RuleImpl implements Rule { if (fn != null) { return new DefaultDebtRemediationFunction(DebtRemediationFunction.Type.valueOf(fn), dto.getRemediationGapMultiplier(), dto.getRemediationBaseEffort()); } - String defaultFn = dto.getDefaultRemediationFunction(); + String defaultFn = dto.getDefRemediationFunction(); if (defaultFn != null) { - return new DefaultDebtRemediationFunction(DebtRemediationFunction.Type.valueOf(defaultFn), dto.getDefaultRemediationGapMultiplier(), dto.getDefaultRemediationBaseEffort()); + return new DefaultDebtRemediationFunction(DebtRemediationFunction.Type.valueOf(defaultFn), dto.getDefRemediationGapMultiplier(), dto.getDefRemediationBaseEffort()); } return null; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java index a36a969ea4a..88608b56b2f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java @@ -275,16 +275,16 @@ public class RegisterRules implements Startable { @Nullable String remediationCoefficient, @Nullable String remediationOffset, @Nullable String effortToFixDescription) { boolean changed = false; - if (!StringUtils.equals(dto.getDefaultRemediationFunction(), remediationFunction)) { - dto.setDefaultRemediationFunction(remediationFunction); + if (!StringUtils.equals(dto.getDefRemediationFunction(), remediationFunction)) { + dto.setDefRemediationFunction(remediationFunction); changed = true; } - if (!StringUtils.equals(dto.getDefaultRemediationGapMultiplier(), remediationCoefficient)) { - dto.setDefaultRemediationGapMultiplier(remediationCoefficient); + if (!StringUtils.equals(dto.getDefRemediationGapMultiplier(), remediationCoefficient)) { + dto.setDefRemediationGapMultiplier(remediationCoefficient); changed = true; } - if (!StringUtils.equals(dto.getDefaultRemediationBaseEffort(), remediationOffset)) { - dto.setDefaultRemediationBaseEffort(remediationOffset); + if (!StringUtils.equals(dto.getDefRemediationBaseEffort(), remediationOffset)) { + dto.setDefRemediationBaseEffort(remediationOffset); changed = true; } if (!StringUtils.equals(dto.getGapDescription(), effortToFixDescription)) { @@ -421,16 +421,16 @@ public class RegisterRules implements Startable { customRule.setConfigKey(templateRule.getConfigKey()); changed = true; } - if (!StringUtils.equals(customRule.getDefaultRemediationFunction(), templateRule.getDefaultRemediationFunction())) { - customRule.setDefaultRemediationFunction(templateRule.getDefaultRemediationFunction()); + if (!StringUtils.equals(customRule.getDefRemediationFunction(), templateRule.getDefRemediationFunction())) { + customRule.setDefRemediationFunction(templateRule.getDefRemediationFunction()); changed = true; } - if (!StringUtils.equals(customRule.getDefaultRemediationGapMultiplier(), templateRule.getDefaultRemediationGapMultiplier())) { - customRule.setDefaultRemediationGapMultiplier(templateRule.getDefaultRemediationGapMultiplier()); + if (!StringUtils.equals(customRule.getDefRemediationGapMultiplier(), templateRule.getDefRemediationGapMultiplier())) { + customRule.setDefRemediationGapMultiplier(templateRule.getDefRemediationGapMultiplier()); changed = true; } - if (!StringUtils.equals(customRule.getDefaultRemediationBaseEffort(), templateRule.getDefaultRemediationBaseEffort())) { - customRule.setDefaultRemediationBaseEffort(templateRule.getDefaultRemediationBaseEffort()); + if (!StringUtils.equals(customRule.getDefRemediationBaseEffort(), templateRule.getDefRemediationBaseEffort())) { + customRule.setDefRemediationBaseEffort(templateRule.getDefRemediationBaseEffort()); changed = true; } if (!StringUtils.equals(customRule.getGapDescription(), templateRule.getGapDescription())) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java index 03a4fc948d1..bb8f8f50e38 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java @@ -165,9 +165,9 @@ public class RuleCreator { .setSeverity(newRule.severity()) .setStatus(newRule.status()) .setLanguage(templateRuleDto.getLanguage()) - .setDefaultRemediationFunction(templateRuleDto.getDefaultRemediationFunction()) - .setDefaultRemediationGapMultiplier(templateRuleDto.getDefaultRemediationGapMultiplier()) - .setDefaultRemediationBaseEffort(templateRuleDto.getDefaultRemediationBaseEffort()) + .setDefRemediationFunction(templateRuleDto.getDefRemediationFunction()) + .setDefRemediationGapMultiplier(templateRuleDto.getDefRemediationGapMultiplier()) + .setDefRemediationBaseEffort(templateRuleDto.getDefRemediationBaseEffort()) .setGapDescription(templateRuleDto.getGapDescription()) .setSystemTags(templateRuleDto.getSystemTags()) .setType(templateRuleDto.getType()) diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java index 0425bf7bf66..1534474f159 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java @@ -220,9 +220,9 @@ public class RuleUpdater { private static boolean isSameAsDefaultFunction(DebtRemediationFunction fn, RuleDto rule) { return new EqualsBuilder() - .append(fn.type().name(), rule.getDefaultRemediationFunction()) - .append(fn.gapMultiplier(), rule.getDefaultRemediationGapMultiplier()) - .append(fn.baseEffort(), rule.getDefaultRemediationBaseEffort()) + .append(fn.type().name(), rule.getDefRemediationFunction()) + .append(fn.gapMultiplier(), rule.getDefRemediationGapMultiplier()) + .append(fn.baseEffort(), rule.getDefRemediationBaseEffort()) .isEquals(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java index a1602790635..93c5ecf2333 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapper.java @@ -309,14 +309,14 @@ public class RuleMapper { @CheckForNull private static DebtRemediationFunction defaultDebtRemediationFunction(final RuleDto ruleDto) { - final String function = ruleDto.getDefaultRemediationFunction(); + final String function = ruleDto.getDefRemediationFunction(); if (function == null || function.isEmpty()) { return null; } else { return new DefaultDebtRemediationFunction( DebtRemediationFunction.Type.valueOf(function.toUpperCase(Locale.ENGLISH)), - ruleDto.getDefaultRemediationGapMultiplier(), - ruleDto.getDefaultRemediationBaseEffort()); + ruleDto.getDefRemediationGapMultiplier(), + ruleDto.getDefRemediationBaseEffort()); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java index 6fa533a1345..485efbac593 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesMediumTest.java @@ -298,7 +298,7 @@ public class RegisterRulesMediumTest { assertThat(customRule.getConfigKey()).isEqualTo("new_internal"); assertThat(customRule.getSeverityString()).isEqualTo(Severity.BLOCKER); assertThat(customRule.getStatus()).isEqualTo(RuleStatus.BETA); - assertThat(customRule.getDefaultRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); + assertThat(customRule.getDefRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); assertThat(customRule.getGapDescription()).isEqualTo("Effort"); assertThat(ruleIndex.search(new RuleQuery().setKey(customRuleKey.toString()), new SearchOptions()).getTotal()).isEqualTo(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java index fe68c12718a..2ade090e95a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java @@ -105,9 +105,9 @@ public class RegisterRulesTest { assertThat(rule1.getStatus()).isEqualTo(RuleStatus.BETA); assertThat(rule1.getCreatedAt()).isEqualTo(DATE1.getTime()); assertThat(rule1.getUpdatedAt()).isEqualTo(DATE1.getTime()); - assertThat(rule1.getDefaultRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); - assertThat(rule1.getDefaultRemediationGapMultiplier()).isEqualTo("5d"); - assertThat(rule1.getDefaultRemediationBaseEffort()).isEqualTo("10h"); + assertThat(rule1.getDefRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); + assertThat(rule1.getDefRemediationGapMultiplier()).isEqualTo("5d"); + assertThat(rule1.getDefRemediationBaseEffort()).isEqualTo("10h"); assertThat(rule1.getType()).isEqualTo(RuleType.CODE_SMELL.getDbConstant()); List params = dbClient.ruleDao().selectRuleParamsByRuleKey(dbTester.getSession(), RULE_KEY1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java index 3162c1acab7..2bc5365138c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorMediumTest.java @@ -111,9 +111,9 @@ public class RuleCreatorMediumTest { assertThat(rule.getStatus()).isEqualTo(RuleStatus.READY); assertThat(rule.getLanguage()).isEqualTo("java"); assertThat(rule.getConfigKey()).isEqualTo("S001"); - assertThat(rule.getDefaultRemediationFunction()).isEqualTo("LINEAR_OFFSET"); - assertThat(rule.getDefaultRemediationGapMultiplier()).isEqualTo("1h"); - assertThat(rule.getDefaultRemediationBaseEffort()).isEqualTo("5min"); + assertThat(rule.getDefRemediationFunction()).isEqualTo("LINEAR_OFFSET"); + assertThat(rule.getDefRemediationGapMultiplier()).isEqualTo("1h"); + assertThat(rule.getDefRemediationBaseEffort()).isEqualTo("5min"); assertThat(rule.getGapDescription()).isEqualTo("desc"); assertThat(rule.getTags()).containsOnly("usertag1", "usertag2"); assertThat(rule.getSystemTags()).containsOnly("tag1", "tag4"); @@ -506,9 +506,9 @@ public class RuleCreatorMediumTest { .setIsTemplate(true) .setLanguage("java") .setConfigKey("S001") - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1h") - .setDefaultRemediationBaseEffort("5min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1h") + .setDefRemediationBaseEffort("5min") .setGapDescription("desc") .setTags(Sets.newHashSet("usertag1", "usertag2")) .setSystemTags(Sets.newHashSet("tag1", "tag4")) @@ -528,9 +528,9 @@ public class RuleCreatorMediumTest { .setIsTemplate(true) .setLanguage("java") .setConfigKey("S002") - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1h") - .setDefaultRemediationBaseEffort("5min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1h") + .setDefRemediationBaseEffort("5min") .setGapDescription("desc") .setCreatedAt(new Date().getTime()) .setUpdatedAt(new Date().getTime()); @@ -548,9 +548,9 @@ public class RuleCreatorMediumTest { .setIsTemplate(true) .setLanguage("java") .setConfigKey("S003") - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1h") - .setDefaultRemediationBaseEffort("5min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1h") + .setDefRemediationBaseEffort("5min") .setGapDescription("desc") .setCreatedAt(new Date().getTime()) .setUpdatedAt(new Date().getTime()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java index 09ef46d77d7..99b64927cff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterMediumTest.java @@ -237,9 +237,9 @@ public class RuleUpdaterMediumTest { @Test public void override_debt() { ruleDao.insert(dbSession, RuleTesting.newDto(RULE_KEY) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1d") - .setDefaultRemediationBaseEffort("5min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1d") + .setDefRemediationBaseEffort("5min") .getDefinition()); dbSession.commit(); @@ -255,17 +255,17 @@ public class RuleUpdaterMediumTest { assertThat(rule.getRemediationGapMultiplier()).isNull(); assertThat(rule.getRemediationBaseEffort()).isEqualTo("1min"); - assertThat(rule.getDefaultRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); - assertThat(rule.getDefaultRemediationGapMultiplier()).isEqualTo("1d"); - assertThat(rule.getDefaultRemediationBaseEffort()).isEqualTo("5min"); + assertThat(rule.getDefRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); + assertThat(rule.getDefRemediationGapMultiplier()).isEqualTo("1d"); + assertThat(rule.getDefRemediationBaseEffort()).isEqualTo("5min"); } @Test public void override_debt_only_offset() { ruleDao.insert(dbSession, RuleTesting.newDto(RULE_KEY) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR.name()) - .setDefaultRemediationGapMultiplier("1d") - .setDefaultRemediationBaseEffort(null) + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR.name()) + .setDefRemediationGapMultiplier("1d") + .setDefRemediationBaseEffort(null) .getDefinition()); dbSession.commit(); @@ -280,17 +280,17 @@ public class RuleUpdaterMediumTest { assertThat(rule.getRemediationGapMultiplier()).isEqualTo("2d"); assertThat(rule.getRemediationBaseEffort()).isNull(); - assertThat(rule.getDefaultRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR.name()); - assertThat(rule.getDefaultRemediationGapMultiplier()).isEqualTo("1d"); - assertThat(rule.getDefaultRemediationBaseEffort()).isNull(); + assertThat(rule.getDefRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR.name()); + assertThat(rule.getDefRemediationGapMultiplier()).isEqualTo("1d"); + assertThat(rule.getDefRemediationBaseEffort()).isNull(); } @Test public void override_debt_from_linear_with_offset_to_constant() { ruleDao.insert(dbSession, RuleTesting.newDto(RULE_KEY) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1d") - .setDefaultRemediationBaseEffort("5min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1d") + .setDefRemediationBaseEffort("5min") .getDefinition()); dbSession.commit(); @@ -305,17 +305,17 @@ public class RuleUpdaterMediumTest { assertThat(rule.getRemediationGapMultiplier()).isNull(); assertThat(rule.getRemediationBaseEffort()).isEqualTo("10min"); - assertThat(rule.getDefaultRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); - assertThat(rule.getDefaultRemediationGapMultiplier()).isEqualTo("1d"); - assertThat(rule.getDefaultRemediationBaseEffort()).isEqualTo("5min"); + assertThat(rule.getDefRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); + assertThat(rule.getDefRemediationGapMultiplier()).isEqualTo("1d"); + assertThat(rule.getDefRemediationBaseEffort()).isEqualTo("5min"); } @Test public void reset_remediation_function() { RuleDto ruleDto = RuleTesting.newDto(RULE_KEY, defaultOrganization) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR.name()) - .setDefaultRemediationGapMultiplier("1d") - .setDefaultRemediationBaseEffort("5min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR.name()) + .setDefRemediationGapMultiplier("1d") + .setDefRemediationBaseEffort("5min") .setRemediationFunction(DebtRemediationFunction.Type.CONSTANT_ISSUE.name()) .setRemediationGapMultiplier(null) .setRemediationBaseEffort("1min"); @@ -329,9 +329,9 @@ public class RuleUpdaterMediumTest { // verify debt is coming from default values RuleDto rule = ruleDao.selectOrFailByKey(dbSession, defaultOrganization.getUuid(), RULE_KEY); - assertThat(rule.getDefaultRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR.name()); - assertThat(rule.getDefaultRemediationGapMultiplier()).isEqualTo("1d"); - assertThat(rule.getDefaultRemediationBaseEffort()).isEqualTo("5min"); + assertThat(rule.getDefRemediationFunction()).isEqualTo(DebtRemediationFunction.Type.LINEAR.name()); + assertThat(rule.getDefRemediationGapMultiplier()).isEqualTo("1d"); + assertThat(rule.getDefRemediationBaseEffort()).isEqualTo("5min"); assertThat(rule.getRemediationFunction()).isNull(); assertThat(rule.getRemediationGapMultiplier()).isNull(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java index 6c63c850e5a..af6aa6f3b21 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionMediumTest.java @@ -228,9 +228,9 @@ public class SearchActionMediumTest { @Test public void search_debt_rules_with_default_and_overridden_debt_values() throws Exception { RuleDto ruleDto = RuleTesting.newXooX1(defaultOrganization) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1h") - .setDefaultRemediationBaseEffort("15min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1h") + .setDefRemediationBaseEffort("15min") .setRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) .setRemediationGapMultiplier("2h") .setRemediationBaseEffort("25min"); @@ -248,9 +248,9 @@ public class SearchActionMediumTest { @Test public void search_debt_rules_with_default_linear_offset_and_overridden_constant_debt() throws Exception { RuleDto ruleDto = RuleTesting.newXooX1(defaultOrganization) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1h") - .setDefaultRemediationBaseEffort("15min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1h") + .setDefRemediationBaseEffort("15min") .setRemediationFunction(DebtRemediationFunction.Type.CONSTANT_ISSUE.name()) .setRemediationGapMultiplier(null) .setRemediationBaseEffort("5min"); @@ -268,9 +268,9 @@ public class SearchActionMediumTest { @Test public void search_debt_rules_with_default_linear_offset_and_overridden_linear_debt() throws Exception { RuleDto ruleDto = RuleTesting.newXooX1(defaultOrganization) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1h") - .setDefaultRemediationBaseEffort("15min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1h") + .setDefRemediationBaseEffort("15min") .setRemediationFunction(DebtRemediationFunction.Type.LINEAR.name()) .setRemediationGapMultiplier("1h") .setRemediationBaseEffort(null); @@ -627,9 +627,9 @@ public class SearchActionMediumTest { @Test public void search_rules_with_deprecated_fields() throws Exception { RuleDto ruleDto = RuleTesting.newXooX1(defaultOrganization) - .setDefaultRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) - .setDefaultRemediationGapMultiplier("1h") - .setDefaultRemediationBaseEffort("15min") + .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) + .setDefRemediationGapMultiplier("1h") + .setDefRemediationBaseEffort("15min") .setRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) .setRemediationGapMultiplier("2h") .setRemediationBaseEffort("25min"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java index 831fef98d40..66056eeadc1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java @@ -123,9 +123,9 @@ public class ShowActionMediumTest { .setStatus(RuleStatus.BETA) .setConfigKey("InternalKeyS001") .setLanguage("xoo") - .setDefaultRemediationFunction("LINEAR_OFFSET") - .setDefaultRemediationGapMultiplier("5d") - .setDefaultRemediationBaseEffort("10h") + .setDefRemediationFunction("LINEAR_OFFSET") + .setDefRemediationGapMultiplier("5d") + .setDefRemediationBaseEffort("10h") .setRemediationFunction(null) .setRemediationGapMultiplier(null) .setRemediationBaseEffort(null); @@ -150,9 +150,9 @@ public class ShowActionMediumTest { .setStatus(RuleStatus.BETA) .setConfigKey("InternalKeyS001") .setLanguage("xoo") - .setDefaultRemediationFunction(null) - .setDefaultRemediationGapMultiplier(null) - .setDefaultRemediationBaseEffort(null) + .setDefRemediationFunction(null) + .setDefRemediationGapMultiplier(null) + .setDefRemediationBaseEffort(null) .setRemediationFunction("LINEAR_OFFSET") .setRemediationGapMultiplier("5d") .setRemediationBaseEffort("10h"); @@ -175,9 +175,9 @@ public class ShowActionMediumTest { .setStatus(RuleStatus.BETA) .setConfigKey("InternalKeyS001") .setLanguage("xoo") - .setDefaultRemediationFunction("LINEAR") - .setDefaultRemediationGapMultiplier("5min") - .setDefaultRemediationBaseEffort(null) + .setDefRemediationFunction("LINEAR") + .setDefRemediationGapMultiplier("5min") + .setDefRemediationBaseEffort(null) .setRemediationFunction("LINEAR_OFFSET") .setRemediationGapMultiplier("5d") .setRemediationBaseEffort("10h"); @@ -201,9 +201,9 @@ public class ShowActionMediumTest { .setStatus(RuleStatus.BETA) .setConfigKey("InternalKeyS001") .setLanguage("xoo") - .setDefaultRemediationFunction(null) - .setDefaultRemediationGapMultiplier(null) - .setDefaultRemediationBaseEffort(null); + .setDefRemediationFunction(null) + .setDefRemediationGapMultiplier(null) + .setDefRemediationBaseEffort(null); ruleDao.insert(session, ruleDto.getDefinition()); session.commit(); session.clearCache(); @@ -243,9 +243,9 @@ public class ShowActionMediumTest { .setStatus(RuleStatus.BETA) .setConfigKey("InternalKeyS001") .setLanguage("xoo") - .setDefaultRemediationFunction("LINEAR_OFFSET") - .setDefaultRemediationGapMultiplier("6d") - .setDefaultRemediationBaseEffort("11h") + .setDefRemediationFunction("LINEAR_OFFSET") + .setDefRemediationGapMultiplier("6d") + .setDefRemediationBaseEffort("11h") .setRemediationFunction("LINEAR_OFFSET") .setRemediationGapMultiplier("5d") .setRemediationBaseEffort("10h"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java index dff837287de..73c344a0fb3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionMediumTest.java @@ -86,9 +86,9 @@ public class UpdateActionMediumTest { @Test public void update_rule_remediation_function() throws Exception { RuleDto rule = RuleTesting.newXooX1() - .setDefaultRemediationFunction(LINEAR.toString()) - .setDefaultRemediationGapMultiplier("10d") - .setDefaultRemediationBaseEffort(null); + .setDefRemediationFunction(LINEAR.toString()) + .setDefRemediationGapMultiplier("10d") + .setDefRemediationBaseEffort(null); ruleDao.insert(session, rule.getDefinition()); session.commit(); @@ -104,9 +104,9 @@ public class UpdateActionMediumTest { public void update_custom_rule_with_deprecated_remediation_function_parameters() throws Exception { RuleDto rule = RuleTesting.newXooX1() .setOrganizationUuid(defaultOrganization.getUuid()) - .setDefaultRemediationFunction(LINEAR_OFFSET.toString()) - .setDefaultRemediationGapMultiplier("10d") - .setDefaultRemediationBaseEffort("5min") + .setDefRemediationFunction(LINEAR_OFFSET.toString()) + .setDefRemediationGapMultiplier("10d") + .setDefRemediationBaseEffort("5min") .setRemediationFunction(LINEAR_OFFSET.toString()) .setRemediationGapMultiplier("15min") .setRemediationBaseEffort("3h"); -- 2.39.5