From 05242f4403fab7cbaa276d601b86d09634a14672 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Mon, 12 May 2014 17:55:13 +0200
Subject: [PATCH] Fix response examples

---
 .../src/main/java/org/sonar/server/source/ws/ScmAction.java | 2 ++
 .../main/java/org/sonar/server/source/ws/ShowAction.java    | 2 +-
 .../source/ws/{scm-example-show.json => example-scm.json}   | 0
 .../source/ws/{show-example-show.json => example-show.json} | 0
 .../test/java/org/sonar/server/source/ws/SourcesWsTest.java | 6 +++---
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename sonar-server/src/main/resources/org/sonar/server/source/ws/{scm-example-show.json => example-scm.json} (100%)
 rename sonar-server/src/main/resources/org/sonar/server/source/ws/{show-example-show.json => example-show.json} (100%)

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 cb41f8a88df..01e0976b338 100644
--- 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 cd2f7d44255..05b00a71334 100644
--- 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/scm-example-show.json b/sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json
similarity index 100%
rename from sonar-server/src/main/resources/org/sonar/server/source/ws/scm-example-show.json
rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-scm.json
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/example-show.json
similarity index 100%
rename from sonar-server/src/main/resources/org/sonar/server/source/ws/show-example-show.json
rename to sonar-server/src/main/resources/org/sonar/server/source/ws/example-show.json
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 0af6b0cc185..3d47f925a57 100644
--- 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);
   }
 }
-- 
2.39.5