From: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Date: Wed, 2 May 2018 15:53:32 +0000 (+0200)
Subject: SONAR-10614 add Clock to ComputeEngineContainerImpl Level1
X-Git-Tag: 7.5~1178
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14d60bd9573170f4bb232a936f2d297bec21d78d;p=sonarqube.git

SONAR-10614 add Clock to ComputeEngineContainerImpl Level1
---

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
index f062fee4298..e8ef7188e6a 100644
--- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java
@@ -20,6 +20,7 @@
 package org.sonar.ce.container;
 
 import com.google.common.annotations.VisibleForTesting;
+import java.time.Clock;
 import java.util.List;
 import javax.annotation.CheckForNull;
 import org.sonar.api.SonarQubeSide;
@@ -258,6 +259,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer {
       ServerFileSystemImpl.class,
       new TempFolderProvider(),
       System2.INSTANCE,
+      Clock.systemDefaultZone(),
 
       // user session
       CeUserSession.class,
diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
index d2ff2acdd1e..819fb4bd472 100644
--- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
+++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java
@@ -118,7 +118,7 @@ public class ComputeEngineContainerImplTest {
       );
       assertThat(picoContainer.getParent().getParent().getParent().getComponentAdapters()).hasSize(
         COMPONENTS_IN_LEVEL_1_AT_CONSTRUCTION
-          + 26 // level 1
+          + 27 // level 1
           + 54 // content of DaoModule
           + 3 // content of EsModule
           + 59 // content of CorePropertyDefinitions