From bdffba32464299ed924693ae5fac5597b0976610 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Wed, 28 May 2014 17:29:14 +0200 Subject: [PATCH] SONAR-5007 SONAR-5334 Remove messages from app WS for coding rules --- .../org/sonar/server/rule/ws/AppAction.java | 101 ------------------ .../server/rule/ws/AppActionTest/app.json | 91 ---------------- 2 files changed, 192 deletions(-) diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java index 09989302eef..0d9a92fa0dc 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java @@ -47,98 +47,6 @@ import java.util.Map; */ public class AppAction implements RequestHandler { - private static final String[] MESSAGES = { - "all", - "any", - "apply", - "are_you_sure", - "bold", - "bulk_change", - "bulleted_point", - "cancel", - "change_verb", - "code", - "delete", - "Done", - "edit", - "markdown.helplink", - "moreCriteria", - "save", - "search_verb", - "severity", - "update_verb", - - "severity.BLOCKER", - "severity.CRITICAL", - "severity.MAJOR", - "severity.MINOR", - "severity.INFO", - - "coding_rules.activate", - "coding_rules.activate_in", - "coding_rules.activate_in_quality_profile", - "coding_rules.activate_in_all_quality_profiles", - "coding_rules.add_note", - "coding_rules.add_tags", - "coding_rules.available_since", - "coding_rules.bulk_change", - "coding_rules.change_severity", - "coding_rules.change_severity_in", - "coding_rules.change_details", - "coding_rules.extend_description", - "coding_rules.deactivate_in", - "coding_rules.deactivate", - "coding_rules.deactivate_in_quality_profile", - "coding_rules.deactivate_in_all_quality_profiles", - "coding_rules.found", - "coding_rules.inherits", - "coding_rules.key", - "coding_rules.new_search", - "coding_rules.no_results", - "coding_rules.no_tags", - "coding_rules.order", - "coding_rules.ordered_by", - "coding_rules.original", - "coding_rules.page", - "coding_rules.parameters", - "coding_rules.parameters.default_value", - "coding_rules.permalink", - "coding_rules.quality_profiles", - "coding_rules.quality_profile", - "coding_rules.repository", - "coding_rules.revert_to_parent_definition", - "coding_rules._rules", - "coding_rules.select_tag", - - "coding_rules.filters.activation", - "coding_rules.filters.activation.active", - "coding_rules.filters.activation.inactive", - "coding_rules.filters.activation.help", - "coding_rules.filters.availableSince", - "coding_rules.filters.characteristic", - "coding_rules.filters.description", - "coding_rules.filters.quality_profile", - "coding_rules.filters.inheritance", - "coding_rules.filters.inheritance.inactive", - "coding_rules.filters.inheritance.not_inherited", - "coding_rules.filters.inheritance.inherited", - "coding_rules.filters.inheritance.overriden", - "coding_rules.filters.key", - "coding_rules.filters.language", - "coding_rules.filters.name", - "coding_rules.filters.repository", - "coding_rules.filters.severity", - "coding_rules.filters.status", - "coding_rules.filters.tag", - - "coding_rules.facets.tags", - "coding_rules.facets.languages", - "coding_rules.facets.repositories", - - "coding_rules.sort.creation_date", - "coding_rules.sort.name" - }; - private final Languages languages; private final RuleRepositories ruleRepositories; private final I18n i18n; @@ -163,7 +71,6 @@ public class AppAction implements RequestHandler { addRuleRepositories(json); addStatuses(json); addCharacteristics(json); - addMessages(json); json.endObject().close(); } @@ -233,14 +140,6 @@ public class AppAction implements RequestHandler { json.endObject(); } - private void addMessages(JsonWriter json) { - json.name("messages").beginObject(); - for (String message : MESSAGES) { - json.prop(message, i18n.message(Locale.getDefault(), message, message)); - } - json.endObject(); - } - void define(WebService.NewController controller) { controller.createAction("app") .setDescription("Data required for rendering the page 'Coding Rules'") diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json index 24e8512f8e0..2bebb02172e 100644 --- a/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json +++ b/sonar-server/src/test/resources/org/sonar/server/rule/ws/AppActionTest/app.json @@ -20,96 +20,5 @@ "characteristics": { "REUSABILITY": "Reusability", "MODULARITY": "Reusability: Modularity" - }, - "messages": { - "all": "all", - "any": "any", - "apply": "apply", - "are_you_sure": "are_you_sure", - "bold": "bold", - "bulk_change": "bulk_change", - "bulleted_point": "bulleted_point", - "cancel": "cancel", - "change_verb": "change_verb", - "code": "code", - "delete": "delete", - "Done": "Done", - "edit": "edit", - "markdown.helplink": "markdown.helplink", - "moreCriteria": "moreCriteria", - "save": "save", - "search_verb": "search_verb", - "severity": "severity", - "update_verb": "update_verb", - - "severity.BLOCKER": "severity.BLOCKER", - "severity.CRITICAL": "severity.CRITICAL", - "severity.MAJOR": "severity.MAJOR", - "severity.MINOR": "severity.MINOR", - "severity.INFO": "severity.INFO", - - "coding_rules.activate": "coding_rules.activate", - "coding_rules.activate_in": "coding_rules.activate_in", - "coding_rules.activate_in_quality_profile": "coding_rules.activate_in_quality_profile", - "coding_rules.activate_in_all_quality_profiles": "coding_rules.activate_in_all_quality_profiles", - "coding_rules.add_note": "coding_rules.add_note", - "coding_rules.add_tags": "coding_rules.add_tags", - "coding_rules.available_since": "coding_rules.available_since", - "coding_rules.bulk_change": "coding_rules.bulk_change", - "coding_rules.change_severity": "coding_rules.change_severity", - "coding_rules.change_severity_in": "coding_rules.change_severity_in", - "coding_rules.change_details": "coding_rules.change_details", - "coding_rules.extend_description": "coding_rules.extend_description", - "coding_rules.deactivate_in": "coding_rules.deactivate_in", - "coding_rules.deactivate": "coding_rules.deactivate", - "coding_rules.deactivate_in_quality_profile": "coding_rules.deactivate_in_quality_profile", - "coding_rules.deactivate_in_all_quality_profiles": "coding_rules.deactivate_in_all_quality_profiles", - "coding_rules.found": "coding_rules.found", - "coding_rules.inherits": "coding_rules.inherits", - "coding_rules.key": "coding_rules.key", - "coding_rules.new_search": "coding_rules.new_search", - "coding_rules.no_results": "coding_rules.no_results", - "coding_rules.no_tags": "coding_rules.no_tags", - "coding_rules.order": "coding_rules.order", - "coding_rules.ordered_by": "coding_rules.ordered_by", - "coding_rules.original": "coding_rules.original", - "coding_rules.page": "coding_rules.page", - "coding_rules.parameters": "coding_rules.parameters", - "coding_rules.parameters.default_value": "coding_rules.parameters.default_value", - "coding_rules.permalink": "coding_rules.permalink", - "coding_rules.quality_profiles": "coding_rules.quality_profiles", - "coding_rules.quality_profile": "coding_rules.quality_profile", - "coding_rules.repository": "coding_rules.repository", - "coding_rules.revert_to_parent_definition": "coding_rules.revert_to_parent_definition", - "coding_rules._rules": "coding_rules._rules", - "coding_rules.select_tag": "coding_rules.select_tag", - - "coding_rules.filters.activation": "coding_rules.filters.activation", - "coding_rules.filters.activation.active": "coding_rules.filters.activation.active", - "coding_rules.filters.activation.inactive": "coding_rules.filters.activation.inactive", - "coding_rules.filters.activation.help": "coding_rules.filters.activation.help", - "coding_rules.filters.availableSince": "coding_rules.filters.availableSince", - "coding_rules.filters.characteristic": "coding_rules.filters.characteristic", - "coding_rules.filters.description": "coding_rules.filters.description", - "coding_rules.filters.quality_profile": "coding_rules.filters.quality_profile", - "coding_rules.filters.inheritance": "coding_rules.filters.inheritance", - "coding_rules.filters.inheritance.inactive": "coding_rules.filters.inheritance.inactive", - "coding_rules.filters.inheritance.not_inherited": "coding_rules.filters.inheritance.not_inherited", - "coding_rules.filters.inheritance.inherited": "coding_rules.filters.inheritance.inherited", - "coding_rules.filters.inheritance.overriden": "coding_rules.filters.inheritance.overriden", - "coding_rules.filters.key": "coding_rules.filters.key", - "coding_rules.filters.language": "coding_rules.filters.language", - "coding_rules.filters.name": "coding_rules.filters.name", - "coding_rules.filters.repository": "coding_rules.filters.repository", - "coding_rules.filters.severity": "coding_rules.filters.severity", - "coding_rules.filters.status": "coding_rules.filters.status", - "coding_rules.filters.tag": "coding_rules.filters.tag", - - "coding_rules.facets.tags": "coding_rules.facets.tags", - "coding_rules.facets.languages": "coding_rules.facets.languages", - "coding_rules.facets.repositories": "coding_rules.facets.repositories", - - "coding_rules.sort.creation_date": "coding_rules.sort.creation_date", - "coding_rules.sort.name": "coding_rules.sort.name" } } -- 2.39.5