SONAR-5329 - Convert ES time to current timeZones

2 files changed, 14 insertions, 0 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java b/sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java
index 02d69bb96ce..bba38b2afe1 100644
--- a/sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/IndexUtils.java
@@ -25,6 +25,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.TimeZone;
 
 public class IndexUtils {
 
@@ -38,8 +39,12 @@ public class IndexUtils {
       return null;
     }
     try {
+
+      // ES times are in UTC
       DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+      sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
       return sdf.parse(s);
+
     } catch (ParseException e) {
       throw new IllegalArgumentException("Cannot parse ES date: " + s, e);
     }
diff --git a/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java b/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java
index 9c3dc5e7deb..c20b68b8ddd 100644
--- a/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/activity/ActivityBackendMediumTest.java
@@ -131,4 +131,13 @@ public class ActivityBackendMediumTest {
     }
     assertThat(count).isEqualTo(max);
   }
+
+  @Test
+  public void current_time_zone() {
+    service.write(dbSession, Activity.Type.QPROFILE, "now");
+    dbSession.commit();
+
+    Activity activity = service.search(new ActivityQuery(), new QueryOptions()).getHits().get(0);
+    assertThat(System.currentTimeMillis() - activity.time().getTime()).isLessThan(1000L);
+  }
 }