aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-ce
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2018-05-02 17:53:32 +0200
committerSonarTech <sonartech@sonarsource.com>2018-05-15 20:20:51 +0200
commit14d60bd9573170f4bb232a936f2d297bec21d78d (patch)
tree8a24781638405ec21705c2464dc11f0126262acd /server/sonar-ce
parent3bab57a379b1173cfdf9dc24913adf5d9f4fdcae (diff)
downloadsonarqube-14d60bd9573170f4bb232a936f2d297bec21d78d.tar.gz
sonarqube-14d60bd9573170f4bb232a936f2d297bec21d78d.zip
SONAR-10614 add Clock to ComputeEngineContainerImpl Level1
Diffstat (limited to 'server/sonar-ce')
-rw-r--r--server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java2
-rw-r--r--server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java2
2 files changed, 3 insertions, 1 deletions
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