Add Request#paramAsDateTime()

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java
index f4c0a40d3f407b85bfad435a82e8afb818828295..87101ff78b1b1677c4242f546a7e0892fb504afc 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java
@@ -25,7 +25,6 @@ import org.apache.commons.lang.StringUtils;
 import org.sonar.api.utils.DateUtils;
 
 import javax.annotation.CheckForNull;
-
 import java.util.Date;
 import java.util.List;
 
@@ -185,14 +184,19 @@ public abstract class Request {
     return result;
   }
 
+  @CheckForNull
+  public Date paramAsDateTime(String key) {
+    String s = param(key);
+    if (s != null) {
+      return DateUtils.parseDateTime(s);
+    }
+    return null;
+  }
+
   @CheckForNull
   public Date paramAsDate(String key) {
     String s = param(key);
     if (s != null) {
-      Date date = DateUtils.parseDateTimeQuietly(s);
-      if (date != null) {
-        return date;
-      }
       return DateUtils.parseDate(s);
     }
     return null;

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
index a4b34acd65319a805e962166e7e8a85edf2c4186..58994058c11a459ff00c8048a77cf1f88292f828 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/RequestTest.java
@@ -74,6 +74,7 @@ public class RequestTest {
       action.createParam("a_number");
       action.createParam("a_enum");
       action.createParam("a_date");
+      action.createParam("a_datetime");
 
       action.createParam("a_required_string").setRequired(true);
       action.createParam("a_required_boolean").setRequired(true);
@@ -183,7 +184,11 @@ public class RequestTest {
   @Test
   public void param_as_date() throws Exception {
     assertThat(request.setParam("a_date", "2014-05-27").paramAsDate("a_date")).isEqualTo(DateUtils.parseDate("2014-05-27"));
-    assertThat(request.setParam("a_date", "2014-05-27T15:50:45+0100").paramAsDate("a_date")).isEqualTo(DateUtils.parseDateTime("2014-05-27T15:50:45+0100"));
+  }
+
+  @Test
+  public void param_as_datetime() throws Exception {
+    assertThat(request.setParam("a_datetime", "2014-05-27T15:50:45+0100").paramAsDateTime("a_datetime")).isEqualTo(DateUtils.parseDateTime("2014-05-27T15:50:45+0100"));
   }
 
   @Test

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
index 2aafbe27e7d49890b04543229e3df69ba3bc6d48..fa4d10a024ba5978b5e7960239bf474087adb348 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueSearchAction.java
@@ -435,9 +435,9 @@ public class IssueSearchAction implements RequestHandler {
       .assigned(request.paramAsBoolean(IssueFilterParameters.ASSIGNED))
       .planned(request.paramAsBoolean(IssueFilterParameters.PLANNED))
       .hideRules(request.paramAsBoolean(IssueFilterParameters.HIDE_RULES))
-      .createdAt(request.paramAsDate(IssueFilterParameters.CREATED_AT))
-      .createdAfter(request.paramAsDate(IssueFilterParameters.CREATED_AFTER))
-      .createdBefore(request.paramAsDate(IssueFilterParameters.CREATED_BEFORE))
+      .createdAt(request.paramAsDateTime(IssueFilterParameters.CREATED_AT))
+      .createdAfter(request.paramAsDateTime(IssueFilterParameters.CREATED_AFTER))
+      .createdBefore(request.paramAsDateTime(IssueFilterParameters.CREATED_BEFORE))
       .pageSize(request.paramAsInt(IssueFilterParameters.PAGE_SIZE))
       .pageIndex(request.paramAsInt(IssueFilterParameters.PAGE_INDEX));
     String sort = request.param(IssueFilterParameters.SORT);