Skip to content

Commit

Permalink
SONAR-6517 rename field "homepage" by "homepageUrl" in api/plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Brandhof committed May 11, 2015
1 parent 1b0e00b commit 7e3ed6a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java
View file
Expand Up @@ -48,7 +48,7 @@ public class PluginWSCommons {
static final String PROPERTY_ORGANIZATION_URL = "organizationUrl"; static final String PROPERTY_ORGANIZATION_URL = "organizationUrl";
static final String PROPERTY_DATE = "date"; static final String PROPERTY_DATE = "date";
static final String PROPERTY_STATUS = "status"; 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 PROPERTY_ISSUE_TRACKER_URL = "issueTrackerUrl";
static final String OBJECT_ARTIFACT = "artifact"; static final String OBJECT_ARTIFACT = "artifact";
static final String PROPERTY_URL = "url"; static final String PROPERTY_URL = "url";
Expand Down Expand Up @@ -90,7 +90,7 @@ public void writeMetadata(JsonWriter jsonWriter, PluginInfo pluginMetadata) {
jsonWriter.prop(PROPERTY_LICENSE, pluginMetadata.getLicense()); jsonWriter.prop(PROPERTY_LICENSE, pluginMetadata.getLicense());
jsonWriter.prop(PROPERTY_ORGANIZATION_NAME, pluginMetadata.getOrganizationName()); jsonWriter.prop(PROPERTY_ORGANIZATION_NAME, pluginMetadata.getOrganizationName());
jsonWriter.prop(PROPERTY_ORGANIZATION_URL, pluginMetadata.getOrganizationUrl()); 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_ISSUE_TRACKER_URL, pluginMetadata.getIssueTrackerUrl());
jsonWriter.prop(PROPERTY_IMPLEMENTATION_BUILD, pluginMetadata.getImplementationBuild()); jsonWriter.prop(PROPERTY_IMPLEMENTATION_BUILD, pluginMetadata.getImplementationBuild());
} }
Expand Down
8 changes: 4 additions & 4 deletions ...onar-server/src/main/resources/org/sonar/server/plugins/ws/example-installed_plugins.json
View file
Expand Up @@ -8,7 +8,7 @@
"license": "GNU LGPL 3", "license": "GNU LGPL 3",
"organizationName": "SonarSource", "organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com", "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", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
"implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07" "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
}, },
Expand All @@ -20,7 +20,7 @@
"license": "GNU LGPL 3", "license": "GNU LGPL 3",
"organizationName": "SonarSource", "organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com", "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", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
"implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1" "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
}, },
Expand All @@ -32,9 +32,9 @@
"license": "GNU LGPL 3", "license": "GNU LGPL 3",
"organizationName": "SonarSource", "organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com", "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", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
"implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234" "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
} }
] ]
} }
6 changes: 3 additions & 3 deletions .../sonar-server/src/main/resources/org/sonar/server/plugins/ws/example-pending_plugins.json
View file
Expand Up @@ -8,7 +8,7 @@
"license": "GNU LGPL 3", "license": "GNU LGPL 3",
"organizationName": "SonarSource", "organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com", "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", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT",
"implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07" "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07"
}, },
Expand All @@ -20,7 +20,7 @@
"license": "GNU LGPL 3", "license": "GNU LGPL 3",
"organizationName": "SonarSource", "organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com", "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", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA",
"implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1" "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1"
} }
Expand All @@ -34,7 +34,7 @@
"license": "GNU LGPL 3", "license": "GNU LGPL 3",
"organizationName": "SonarSource", "organizationName": "SonarSource",
"organizationUrl": "http://www.sonarsource.com", "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", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN",
"implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234" "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234"
} }
Expand Down
2 changes: 1 addition & 1 deletion .../sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java
View file
Expand Up @@ -132,7 +132,7 @@ public void verify_properties_displayed_in_json_per_plugin() throws Exception {
" \"license\": \"license_hey\"," + " \"license\": \"license_hey\"," +
" \"organizationName\": \"org_name\"," + " \"organizationName\": \"org_name\"," +
" \"organizationUrl\": \"org_url\"," + " \"organizationUrl\": \"org_url\"," +
" \"homepage\": \"homepage_url\"," + " \"homepageUrl\": \"homepage_url\"," +
" \"issueTrackerUrl\": \"issueTracker_url\"," + " \"issueTrackerUrl\": \"issueTracker_url\"," +
" \"implementationBuild\": \"sou_rev_sha1\"" + " \"implementationBuild\": \"sou_rev_sha1\"" +
" }" + " }" +
Expand Down
4 changes: 2 additions & 2 deletions ...er/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java
View file
Expand Up @@ -93,7 +93,7 @@ public void verify_properties_displayed_in_json_per_installing_plugin() throws E
" \"license\": \"GNU LGPL 3\"," + " \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," + " \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," + " \"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\"," + " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
" \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" + " \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
" }" + " }" +
Expand Down Expand Up @@ -122,7 +122,7 @@ public void verify_properties_displayed_in_json_per_removing_plugin() throws Exc
" \"license\": \"GNU LGPL 3\"," + " \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," + " \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," + " \"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\"," + " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
" \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" + " \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" +
" }" + " }" +
Expand Down
4 changes: 2 additions & 2 deletions server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginWSCommonsTest.java
View file
Expand Up @@ -56,7 +56,7 @@ public void verify_properties_written_by_writePluginMetadata() {
" \"license\": \"GNU LGPL 3\"," + " \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," + " \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," + " \"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\"" + " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"" +
"}"); "}");
} }
Expand All @@ -76,7 +76,7 @@ public void verify_properties_written_by_writeMetadata() {
" \"license\": \"GNU LGPL 3\"," + " \"license\": \"GNU LGPL 3\"," +
" \"organizationName\": \"SonarSource\"," + " \"organizationName\": \"SonarSource\"," +
" \"organizationUrl\": \"http://www.sonarsource.com\"," + " \"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\"," + " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," +
"}"); "}");
} }
Expand Down

0 comments on commit 7e3ed6a

Please sign in to comment.