SONAR-6517 rename field "homepage" by "homepageUrl" in api/plugins

diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
index c2f8a8b6b63366d658c56121f76504e399a4ba48..82b70cdf8dfe1b2fcc835f221fc3705af1db796c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
@@ -48,7 +48,7 @@ public class PluginWSCommons {
   static final String PROPERTY_ORGANIZATION_URL = "organizationUrl";
   static final String PROPERTY_DATE = "date";
   static final String PROPERTY_STATUS = "status";
-  static final String PROPERTY_HOMEPAGE = "homepage";
+  static final String PROPERTY_HOMEPAGE_URL = "homepageUrl";
   static final String PROPERTY_ISSUE_TRACKER_URL = "issueTrackerUrl";
   static final String OBJECT_ARTIFACT = "artifact";
   static final String PROPERTY_URL = "url";
@@ -90,7 +90,7 @@ public class PluginWSCommons {
     jsonWriter.prop(PROPERTY_LICENSE, pluginMetadata.getLicense());
     jsonWriter.prop(PROPERTY_ORGANIZATION_NAME, pluginMetadata.getOrganizationName());
     jsonWriter.prop(PROPERTY_ORGANIZATION_URL, pluginMetadata.getOrganizationUrl());
-    jsonWriter.prop(PROPERTY_HOMEPAGE, pluginMetadata.getHomepageUrl());
+    jsonWriter.prop(PROPERTY_HOMEPAGE_URL, pluginMetadata.getHomepageUrl());
     jsonWriter.prop(PROPERTY_ISSUE_TRACKER_URL, pluginMetadata.getIssueTrackerUrl());
     jsonWriter.prop(PROPERTY_IMPLEMENTATION_BUILD, pluginMetadata.getImplementationBuild());
   }

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
index c0035e3c45a8204443aa7541f9abb6b2e0cc4fd5..bf4326a63904e12825eb63cfdd92cbb790024498 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
@@ -8,7 +8,7 @@
       "license": "GNU LGPL 3",
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
-      "homepage": "http://redirect.sonarsource.com/plugins/scmgit.html",
+      "homepageUrl": "http://redirect.sonarsource.com/plugins/scmgit.html",
       "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
       "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
     },
@@ -20,7 +20,7 @@
       "license": "GNU LGPL 3",
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
-      "homepage": "http://redirect.sonarsource.com/plugins/java.html",
+      "homepageUrl": "http://redirect.sonarsource.com/plugins/java.html",
       "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
       "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
     },
@@ -32,9 +32,9 @@
       "license": "GNU LGPL 3",
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
-      "homepage": "http://redirect.sonarsource.com/plugins/scmsvn.html",
+      "homepageUrl": "http://redirect.sonarsource.com/plugins/scmsvn.html",
       "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
       "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
index 078d33d862b8a2daf91e5f1f52a92cfffc72329c..85515adbd91147c1223f9e316e02d56f97a2c0a7 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
@@ -8,7 +8,7 @@
       "license": "GNU LGPL 3",
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
-      "homepage": "http://redirect.sonarsource.com/plugins/scmgit.html",
+      "homepageUrl": "http://redirect.sonarsource.com/plugins/scmgit.html",
       "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
       "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
     },
@@ -20,7 +20,7 @@
       "license": "GNU LGPL 3",
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
-      "homepage": "http://redirect.sonarsource.com/plugins/java.html",
+      "homepageUrl": "http://redirect.sonarsource.com/plugins/java.html",
       "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
       "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
     }
@@ -34,7 +34,7 @@
       "license": "GNU LGPL 3",
       "organizationName": "SonarSource",
       "organizationUrl": "http://www.sonarsource.com",
-      "homepage": "http://redirect.sonarsource.com/plugins/scmsvn.html",
+      "homepageUrl": "http://redirect.sonarsource.com/plugins/scmsvn.html",
       "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
       "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
     }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java
index 1279f978501fb702c7308538cbb1c687ae0c1030..ab79848ff97488050583210bec5698d325ddbd86 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java
@@ -132,7 +132,7 @@ public class InstalledPluginsWsActionTest {
         "      \"license\": \"license_hey\"," +
         "      \"organizationName\": \"org_name\"," +
         "      \"organizationUrl\": \"org_url\"," +
-        "      \"homepage\": \"homepage_url\"," +
+        "      \"homepageUrl\": \"homepage_url\"," +
         "      \"issueTrackerUrl\": \"issueTracker_url\"," +
         "      \"implementationBuild\": \"sou_rev_sha1\"" +
         "    }" +

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java
index 17586f0ec1873d5ab586c9a013ffdcc1758cc4ac..bc3bea14a3ac14d89102f8e0ce07fc939a7ce5f6 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java
@@ -93,7 +93,7 @@ public class PendingPluginsWsActionTest {
         "      \"license\": \"GNU LGPL 3\"," +
         "      \"organizationName\": \"SonarSource\"," +
         "      \"organizationUrl\": \"http://www.sonarsource.com\"," +
-        "      \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+        "      \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
         "      \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
         "      \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
         "    }" +
@@ -122,7 +122,7 @@ public class PendingPluginsWsActionTest {
         "      \"license\": \"GNU LGPL 3\"," +
         "      \"organizationName\": \"SonarSource\"," +
         "      \"organizationUrl\": \"http://www.sonarsource.com\"," +
-        "      \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+        "      \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
         "      \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
         "      \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
         "    }" +

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
index c7e5151d57ef2fc112d599e8a18dd368f392f076..761cf9ee45c197daadcaea3534f235fbaf4e1ec3 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
@@ -56,7 +56,7 @@ public class PluginWSCommonsTest {
       "  \"license\": \"GNU LGPL 3\"," +
       "  \"organizationName\": \"SonarSource\"," +
       "  \"organizationUrl\": \"http://www.sonarsource.com\"," +
-      "  \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+      "  \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
       "  \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"" +
       "}");
   }
@@ -76,7 +76,7 @@ public class PluginWSCommonsTest {
       "  \"license\": \"GNU LGPL 3\"," +
       "  \"organizationName\": \"SonarSource\"," +
       "  \"organizationUrl\": \"http://www.sonarsource.com\"," +
-      "  \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
+      "  \"homepageUrl\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," +
       "  \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
       "}");
   }