Fix response examples

diff --git a/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java
index cb41f8a88dfeaf5622d32a3c59da178d6d3c44ad..01e0976b338f61c0dca687c41331ffc94738795f 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.source.ws;
 
+import com.google.common.io.Resources;
 import org.apache.commons.lang.ObjectUtils;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.RequestHandler;
@@ -41,6 +42,7 @@ public class ScmAction implements RequestHandler {
     WebService.NewAction action = controller.createAction("scm")
       .setDescription("Get SCM information of source files")
       .setSince("4.4")
+      .setResponseExample(Resources.getResource(getClass(), "example-scm.json"))
       .setHandler(this);
 
     action

diff --git a/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
index cd2f7d4425546797d9396bbe4947b22521cd60a1..05b00a713346782851a7249821e2c9477ef52910 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
@@ -43,7 +43,7 @@ public class ShowAction implements RequestHandler {
     WebService.NewAction action = controller.createAction("show")
       .setDescription("Get source code")
       .setSince("4.4")
-      .setResponseExample(Resources.getResource(getClass(), "show-example-show.json"))
+      .setResponseExample(Resources.getResource(getClass(), "example-show.json"))
       .setHandler(this);
 
     action

diff --git a/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json
new file mode 100644 (file)
index 0000000..513f3e4
--- /dev/null
+++ b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json
@@ -0,0 +1,7 @@
+{
+  "scm": [
+    [1, "julien", "2013-03-13"],
+    [2, "julien", "2013-03-14"],
+    [3, "simon", "2014-01-01"]
+  ]
+}

diff --git a/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json
new file mode 100644 (file)
index 0000000..74ef52f
--- /dev/null
+++ b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json
@@ -0,0 +1,10 @@
+{
+  "sources": [
+    [20, "<span class=\"k\">package </span>org.sonar.check;"],
+    [21, ""],
+    [22, "<span class=\"k\">public </span><span class=\"k\">enum </span><span class=\"sym-922 sym\">Priority</span> {"],
+    [23, "  <span class=\"cppd\">/**</span>"],
+    [24, "<span class=\"cppd\">   * WARNING : DO NOT CHANGE THE ENUMERATION ORDER</span>"],
+    [25, "<span class=\"cppd\">   * the enum ordinal is used for db persistence</span>"]
+  ]
+}

diff --git a/sonar-server/src/main/resources/org/sonar/server/source/ws/scm-example-show.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/scm-example-show.json
deleted file mode 100644 (file)
index 513f3e4..0000000
--- a/sonar-server/src/main/resources/org/sonar/server/source/ws/scm-example-show.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "scm": [
-    [1, "julien", "2013-03-13"],
-    [2, "julien", "2013-03-14"],
-    [3, "simon", "2014-01-01"]
-  ]
-}

diff --git a/sonar-server/src/main/resources/org/sonar/server/source/ws/show-example-show.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/show-example-show.json
deleted file mode 100644 (file)
index 74ef52f..0000000
--- a/sonar-server/src/main/resources/org/sonar/server/source/ws/show-example-show.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "sources": [
-    [20, "<span class=\"k\">package </span>org.sonar.check;"],
-    [21, ""],
-    [22, "<span class=\"k\">public </span><span class=\"k\">enum </span><span class=\"sym-922 sym\">Priority</span> {"],
-    [23, "  <span class=\"cppd\">/**</span>"],
-    [24, "<span class=\"cppd\">   * WARNING : DO NOT CHANGE THE ENUMERATION ORDER</span>"],
-    [25, "<span class=\"cppd\">   * the enum ordinal is used for db persistence</span>"]
-  ]
-}

diff --git a/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java b/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
index 0af6b0cc185a9c85e5e190e9ac6073e5db3869e5..3d47f925a57d711058449bf1dfcff45f9d022e76 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/source/ws/SourcesWsTest.java
@@ -52,9 +52,9 @@ public class SourcesWsTest {
     WebService.Action scm = controller.action("scm");
     assertThat(scm).isNotNull();
     assertThat(scm.handler()).isSameAs(scmAction);
-    assertThat(show.since()).isEqualTo("4.4");
-    assertThat(show.isInternal()).isFalse();
-    assertThat(show.responseExampleAsString()).isNotEmpty();
+    assertThat(scm.since()).isEqualTo("4.4");
+    assertThat(scm.isInternal()).isFalse();
+    assertThat(scm.responseExampleAsString()).isNotEmpty();
     assertThat(scm.params()).hasSize(4);
   }
 }