From 8b274574a31eecba4cc8014fd173b6007b986d03 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Mon, 8 Sep 2014 10:42:28 +0200 Subject: [PATCH] SONAR-5601 - Updated ServerComponent CTor with types for Properties and Platform --- .../src/main/java/org/sonar/server/platform/Platform.java | 2 +- .../java/org/sonar/server/platform/ServerComponents.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index fb5aafdde48..dc1ce4f53b9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -67,7 +67,7 @@ public class Platform { } public void init(Properties properties) { - serverComponents = new ServerComponents(properties, this); + serverComponents = new ServerComponents(this, properties); if (!dbConnected) { startLevel1Container(); startLevel2Container(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 3a3049e03f0..63ebb72d92f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -302,13 +302,15 @@ import java.util.Properties; class ServerComponents { private final Object[] rootComponents; + private final Platform platform; private final Properties properties; private List level4AddedComponents = Lists.newArrayList(); - ServerComponents(Properties properties, Object... rootComponents) { + ServerComponents(Platform platform, Properties properties, Object... rootComponents) { this.properties = properties; - this.rootComponents = Lists.newArrayList(properties, rootComponents) - .toArray(new Object[rootComponents.length + 1]); + this.platform = platform; + this.rootComponents = Lists.newArrayList(properties, platform, rootComponents) + .toArray(new Object[rootComponents.length + 2]); } /** -- 2.39.5