From a62adeea05495e24836f7857d598e46d2befd9f7 Mon Sep 17 00:00:00 2001 From: Matteo Mara Date: Thu, 17 Mar 2022 17:42:47 +0100 Subject: SONAR-16123 Update security_reports endpoint --- .../main/java/org/sonar/api/server/rule/RulesDefinition.java | 10 ++++++++-- .../org/sonar/api/server/rule/internal/DefaultNewRule.java | 9 +++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'sonar-plugin-api') diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java index 0e9267ce7b8..6d33f2dc0ee 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java @@ -250,17 +250,23 @@ public interface RulesDefinition { } enum OwaspTop10Version { - Y2017("2017"), Y2021("2021"); + Y2017("2017", "owaspTop10"), Y2021("2021", "owaspTop10-2021"); private final String label; + private final String prefix; - OwaspTop10Version(String label) { + OwaspTop10Version(String label, String prefix) { this.label = label; + this.prefix = prefix; } public String label() { return label; } + + public String prefix() { + return prefix; + } } enum OwaspTop10 { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/internal/DefaultNewRule.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/internal/DefaultNewRule.java index 7bc280e6bf6..9077055fe4c 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/internal/DefaultNewRule.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/internal/DefaultNewRule.java @@ -233,14 +233,11 @@ class DefaultNewRule extends RulesDefinition.NewRule { } @Override - public DefaultNewRule addOwaspTop10(OwaspTop10Version version, OwaspTop10... standards) { - Objects.requireNonNull(version, "Owasp version must not be null"); - - //backward compatibility - String versionPrefix = OwaspTop10Version.Y2017.equals(version) ? "owaspTop10:" : "owaspTop10-" + version.label() + ":"; + public DefaultNewRule addOwaspTop10(OwaspTop10Version owaspTop10Version, OwaspTop10... standards) { + Objects.requireNonNull(owaspTop10Version, "Owasp version must not be null"); for (OwaspTop10 owaspTop10 : standards) { - String standard = versionPrefix + owaspTop10.name().toLowerCase(Locale.ENGLISH); + String standard = owaspTop10Version.prefix() + ":" + owaspTop10.name().toLowerCase(Locale.ENGLISH); securityStandards.add(standard); } return this; -- cgit v1.2.3