SONAR-6377 rename archive JSON object to artifact

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailablePluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailablePluginsWsAction.java
index ab9ffa620d44242bc97a49341123709651efca5b..0d9a949efcde864857fe7cb3ea08481d3b33cac9 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailablePluginsWsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailablePluginsWsAction.java
@@ -47,7 +47,7 @@ public class AvailablePluginsWsAction implements PluginsWsAction {
   private static final String PROPERTY_URL = "url";
   private static final String PROPERTY_TERMS_AND_CONDITIONS_URL = "termsAndConditionsUrl";
   private static final String OBJECT_UPDATE = "update";
-  private static final String OBJECT_ARCHIVE = "archive";
+  private static final String OBJECT_ARTIFACT = "artifact";
   private static final String OBJECT_RELEASE = "release";
   private static final String PROPERTY_VERSION = "version";
   private static final String PROPERTY_DATE = "date";
@@ -128,7 +128,7 @@ public class AvailablePluginsWsAction implements PluginsWsAction {
   }
 
   private void writeArchive(JsonWriter jsonWriter, Release release) {
-    jsonWriter.name(OBJECT_ARCHIVE);
+    jsonWriter.name(OBJECT_ARTIFACT);
     jsonWriter.beginObject();
     jsonWriter.prop(PROPERTY_NAME, release.getFilename());
     jsonWriter.prop(PROPERTY_URL, release.getDownloadUrl());

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json
index 42ed42924da47d345c547d8254af6337e1b8d97b..2cfc80ca7ae1f9078f2bf61fc756df137f02857e 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-available_plugins.json
@@ -12,7 +12,7 @@
       "release": {
         "version": "3.2",
         "date": "2015-03-10",
-        "archive": {
+        "artifact": {
           "name": "sonar-abap-plugin-3.2.jar",
           "url": "http://dist.sonarsource.com/abap/download/sonar-abap-plugin-3.2.jar"
         }
@@ -33,7 +33,7 @@
       "release": {
         "version": "1.0",
         "date": "2014-03-31",
-        "archive": {
+        "artifact": {
           "name": "sonar-android-plugin-1.0.jar",
           "url": "http://repository.codehaus.org/org/codehaus/sonar-plugins/android/sonar-android-plugin/1.0/sonar-android-plugin-1.0.jar"
         }

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest/properties_per_plugin.json b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest/properties_per_plugin.json
index 4535f49ac88d94f6baada5f278ab0a87979d35af..055feb3713b7734f200dc70f42012a5d88614edf 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest/properties_per_plugin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest/properties_per_plugin.json
@@ -12,7 +12,7 @@
       "release": {
         "version": "1.12.1",
         "date": "2015-04-16",
-        "archive": {
+        "artifact": {
           "name": "p_file.jar",
           "url": "http://p_file.jar"
         }