SONAR-6046 When calling a web service with some wrong data, the generated exception does not contains the called URL

3 files changed, 103 insertions, 1 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java
index 6a863ee5d40..87efc33f5ed 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java
@@ -67,4 +67,14 @@ public class ServletRequest extends ValidatingRequest {
     }
     return null;
   }
+
+  @Override
+  public String toString() {
+    StringBuffer url = source.getRequestURL();
+    String query = source.getQueryString();
+    if (query != null) {
+      url.append("?").append(query);
+    }
+    return url.toString();
+  }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
index 54cf3e39911..fe12f49acd7 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java
@@ -91,7 +91,6 @@ public class WebServiceEngine implements ServerComponent, Startable {
     } catch (ServerException e) {
       sendErrors(response, e.httpCode(), new Errors().add(Message.of(e.getMessage())));
     } catch (Exception e) {
-      // TODO implement Request.toString()
       LoggerFactory.getLogger(getClass()).error("Fail to process request " + request, e);
       sendErrors(response, 500, new Errors().add(Message.of(e.getMessage())));
     }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java
new file mode 100644
index 00000000000..c638180c576
--- /dev/null
+++ b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java
@@ -0,0 +1,93 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package org.sonar.server.ws;
+
+import com.google.common.collect.ImmutableMap;
+import org.jruby.RubyFile;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+public class ServletRequestTest {
+
+  HttpServletRequest source = mock(HttpServletRequest.class);
+
+  @Test
+  public void call_method() throws Exception {
+    ServletRequest request = new ServletRequest(source, Collections.<String, Object>emptyMap());
+    request.method();
+    verify(source).getMethod();
+  }
+
+  @Test
+  public void has_param_from_source() throws Exception {
+    when(source.getParameterMap()).thenReturn(ImmutableMap.of("param", new String[]{"value"}));
+    ServletRequest request = new ServletRequest(source, Collections.<String, Object>emptyMap());
+    assertThat(request.hasParam("param")).isTrue();
+  }
+
+  @Test
+  public void has_param_from_params() throws Exception {
+    ServletRequest request = new ServletRequest(source, ImmutableMap.<String, Object>of("param", "value"));
+    assertThat(request.hasParam("param")).isTrue();
+  }
+
+  @Test
+  public void read_param_from_source() throws Exception {
+    when(source.getParameter("param")).thenReturn("value");
+    ServletRequest request = new ServletRequest(source, Collections.<String, Object>emptyMap());
+    assertThat(request.readParam("param")).isEqualTo("value");
+  }
+
+  @Test
+  public void read_param_from_param() throws Exception {
+    ServletRequest request = new ServletRequest(source, ImmutableMap.<String, Object>of("param1", "value", "param2", 1));
+    assertThat(request.readParam("param1")).isEqualTo("value");
+    assertThat(request.readParam("param2")).isNull();
+    assertThat(request.readParam("param3")).isNull();
+  }
+
+  @Test
+  public void read_input_stream() throws Exception {
+    RubyFile file = mock(RubyFile.class);
+    ServletRequest request = new ServletRequest(source, ImmutableMap.<String, Object>of("param1", file, "param2", "value"));
+    request.readInputStreamParam("param1");
+    verify(file).getInStream();
+
+    assertThat(request.readInputStreamParam("param2")).isNull();
+  }
+
+  @Test
+  public void to_string() throws Exception {
+    when(source.getRequestURL()).thenReturn(new StringBuffer("http:localhost:9000/api/issues"));
+    ServletRequest request = new ServletRequest(source, Collections.<String, Object>emptyMap());
+    assertThat(request.toString()).isEqualTo("http:localhost:9000/api/issues");
+
+    when(source.getQueryString()).thenReturn("components=sonar");
+    request = new ServletRequest(source, Collections.<String, Object>emptyMap());
+    assertThat(request.toString()).isEqualTo("http:localhost:9000/api/issues?components=sonar");
+  }
+}