From 1135b8b3af4968b92a85d8d32e48a95db1c1abfd Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 29 Apr 2015 16:15:42 +0200 Subject: [PATCH] SONAR-6376 SONAR-6383 remove artifact from JSON response --- .../server/plugins/ws/PluginWSCommons.java | 14 --------- .../plugins/ws/example-installed_plugins.json | 15 ++-------- .../plugins/ws/example-pending_plugins.json | 21 ++++---------- .../ws/InstalledPluginsWsActionTest.java | 6 +--- .../ws/PendingPluginsWsActionTest.java | 10 ++----- .../plugins/ws/PluginWSCommonsTest.java | 29 +------------------ 6 files changed, 12 insertions(+), 83 deletions(-) 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 553e592e3f2..08cc27555b4 100644 --- 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 @@ -75,8 +75,6 @@ public class PluginWSCommons { writeMetadata(jsonWriter, pluginMetadata); - writeArtifact(jsonWriter, pluginMetadata); - jsonWriter.endObject(); } @@ -93,18 +91,6 @@ public class PluginWSCommons { jsonWriter.prop(PROPERTY_IMPLEMENTATION_BUILD, pluginMetadata.getImplementationBuild()); } - public void writeArtifact(JsonWriter jsonWriter, PluginMetadata pluginMetadata) { - if (pluginMetadata.getFile() == null) { - return; - } - - jsonWriter.name(OBJECT_ARTIFACT).beginObject(); - - jsonWriter.prop(PROPERTY_NAME, pluginMetadata.getFile().getName()); - - jsonWriter.endObject(); - } - public void writePluginUpdate(JsonWriter jsonWriter, PluginUpdate pluginUpdate) { jsonWriter.beginObject(); Plugin plugin = pluginUpdate.getPlugin(); 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 5c87a337d37..c0035e3c45a 100644 --- 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 @@ -10,10 +10,7 @@ "organizationUrl": "http://www.sonarsource.com", "homepage": "http://redirect.sonarsource.com/plugins/scmgit.html", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT", - "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07", - "artifact": { - "name": "sonar-scm-git-plugin-1.0.jar" - } + "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07" }, { "key": "java", @@ -25,10 +22,7 @@ "organizationUrl": "http://www.sonarsource.com", "homepage": "http://redirect.sonarsource.com/plugins/java.html", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA", - "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1", - "artifact": { - "name": "sonar-java-plugin-3.0.jar" - } + "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1" }, { "key": "scmsvn", @@ -40,10 +34,7 @@ "organizationUrl": "http://www.sonarsource.com", "homepage": "http://redirect.sonarsource.com/plugins/scmsvn.html", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN", - "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234", - "artifact": { - "name": "sonar-scm-svn-plugin-1.0.jar" - } + "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 508127f2ff5..078d33d862b 100644 --- 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 @@ -1,6 +1,5 @@ { - "installing": - [ + "installing": [ { "key": "scmgit", "name": "Git", @@ -11,10 +10,7 @@ "organizationUrl": "http://www.sonarsource.com", "homepage": "http://redirect.sonarsource.com/plugins/scmgit.html", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCGIT", - "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07", - "artifact": { - "name": "sonar-scm-git-plugin-1.0.jar" - } + "implementationBuild": "9ce9d330c313c296fab051317cc5ad4b26319e07" }, { "key": "java", @@ -26,14 +22,10 @@ "organizationUrl": "http://www.sonarsource.com", "homepage": "http://redirect.sonarsource.com/plugins/java.html", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARJAVA", - "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1", - "artifact": { - "name": "sonar-java-plugin-3.0.jar" - } + "implementationBuild": "65396a609ddface8b311a6a665aca92a7da694f1" } ], - "removing": - [ + "removing": [ { "key": "scmsvn", "name": "SVN", @@ -44,10 +36,7 @@ "organizationUrl": "http://www.sonarsource.com", "homepage": "http://redirect.sonarsource.com/plugins/scmsvn.html", "issueTrackerUrl": "http://jira.codehaus.org/browse/SONARSCSVN", - "implementationBuild": "213fc8a8b582ff530b12dd4a59a6512be1071234", - "artifact": { - "name": "sonar-scm-svn-plugin-1.0.jar" - } + "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 3a79c281858..c6470051181 100644 --- 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 @@ -128,11 +128,7 @@ public class InstalledPluginsWsActionTest { " \"organizationUrl\": \"org_url\"," + " \"homepage\": \"homepage_url\"," + " \"issueTrackerUrl\": \"issueTracker_url\"," + - " \"implementationBuild\": \"sou_rev_sha1\"," + - " \"artifact\":" + - " {" + - " \"name\": \"some.jar\"" + - " }" + + " \"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 b865069d99d..26e8bfb4cd9 100644 --- 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 @@ -109,10 +109,7 @@ public class PendingPluginsWsActionTest { " \"organizationUrl\": \"http://www.sonarsource.com\"," + " \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," + " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," + - " \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"," + - " \"artifact\": {" + - " \"name\": \"sonar-scm-git-plugin-1.0.jar\"" + - " }" + + " \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"" + " }" + " ]," + " \"removing\": []" + @@ -141,10 +138,7 @@ public class PendingPluginsWsActionTest { " \"organizationUrl\": \"http://www.sonarsource.com\"," + " \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," + " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," + - " \"implementationBuild\": \"9ce9d330c313c296fab051317cc5ad4b26319e07\"," + - " \"artifact\": {" + - " \"name\": \"sonar-scm-git-plugin-1.0.jar\"" + - " }" + + " \"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 3c9981aa352..831bdbd7b78 100644 --- 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 @@ -81,10 +81,7 @@ public class PluginWSCommonsTest { " \"organizationName\": \"SonarSource\"," + " \"organizationUrl\": \"http://www.sonarsource.com\"," + " \"homepage\": \"http://redirect.sonarsource.com/plugins/scmgit.html\"," + - " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"," + - " \"artifact\": {" + - " \"name\": \"sonar-scm-git-plugin-1.0.jar\"" + - " }" + + " \"issueTrackerUrl\": \"http://jira.codehaus.org/browse/SONARSCGIT\"" + "}"); } @@ -108,30 +105,6 @@ public class PluginWSCommonsTest { "}"); } - @Test - public void writeArtifact_from_pluginMetadata_supports_null_file() { - jsonWriter.beginObject(); - underTest.writeArtifact(jsonWriter, DefaultPluginMetadata.create("key")); - jsonWriter.endObject(); - - jsonWriter.close(); - assertJson(response.outputAsString()).setStrictArrayOrder(true).isSimilarTo("{}"); - } - - @Test - public void writeArtifact_from_pluginMetadata_writes_artifact_object_and_file_name() { - jsonWriter.beginObject(); - underTest.writeArtifact(jsonWriter, GIT_PLUGIN_METADATA); - jsonWriter.endObject(); - - jsonWriter.close(); - assertJson(response.outputAsString()).setStrictArrayOrder(true).isSimilarTo("{" + - " \"artifact\": {" + - " \"name\": \"sonar-scm-git-plugin-1.0.jar\"" + - " }" + - "}"); - } - @Test public void verify_properties_written_by_writePluginUpdate() { underTest.writePluginUpdate(jsonWriter, PluginUpdate.createForPluginRelease(RELEASE, version("1.0"))); -- 2.39.5