From c26e5ebef93099f1d845404d85e0bee7061e23a5 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Fri, 25 Apr 2014 14:13:43 +0200
Subject: [PATCH] Rename addExtensions by addComponents

---
 .../java/org/sonar/server/platform/Platform.java     |  4 ++--
 .../org/sonar/server/platform/ServerComponents.java  | 12 ++++++------
 .../java/org/sonar/server/tester/ServerTester.java   |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
index ff19bc981f3..49bb4bdc734 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java
@@ -148,8 +148,8 @@ public class Platform {
     }
   }
 
-  public void addExtensions(Object... extensions){
-    serverComponents.addExtensions(extensions);
+  public void addComponents(Object... components){
+    serverComponents.addComponents(components);
   }
 
   public ComponentContainer getContainer() {
diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
index 5d3c7fdcdc8..b053b7349df 100644
--- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
+++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
@@ -131,7 +131,7 @@ import java.util.List;
 class ServerComponents {
 
   private final Object[] rootComponents;
-  private Object[] extensions;
+  private Object[] level4AddedComponents;
 
   ServerComponents(Object... rootComponents) {
     this.rootComponents = rootComponents;
@@ -393,9 +393,9 @@ class ServerComponents {
     pico.addSingleton(StringTypeValidation.class);
     pico.addSingleton(StringListTypeValidation.class);
 
-    if (extensions != null) {
-      for (Object extension : extensions) {
-        pico.addSingleton(extension);
+    if (level4AddedComponents != null) {
+      for (Object components : level4AddedComponents) {
+        pico.addSingleton(components);
       }
     }
 
@@ -406,8 +406,8 @@ class ServerComponents {
     executeStartupTaks(pico);
   }
 
-  void addExtensions(Object... extensions){
-    this.extensions = extensions;
+  void addComponents(Object... components){
+    this.level4AddedComponents = components;
   }
 
   private void executeStartupTaks(ComponentContainer pico) {
diff --git a/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java b/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java
index 93e79da1701..b3752bf62d8 100644
--- a/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java
+++ b/sonar-server/src/test/java/org/sonar/server/tester/ServerTester.java
@@ -57,7 +57,7 @@ public class ServerTester extends ExternalResource {
     properties.setProperty(DatabaseProperties.PROP_URL, "jdbc:h2:" + tempDir.getAbsolutePath() + "/h2");
     platform = new Platform();
     platform.init(properties);
-    platform.addExtensions(components);
+    platform.addComponents(components);
     platform.doStart();
   }
 
@@ -90,6 +90,9 @@ public class ServerTester extends ExternalResource {
   }
 
   public ServerTester addComponents(Object... components) {
+    if (platform != null) {
+      throw new IllegalStateException("Already started");
+    }
     this.components = components;
     return this;
   }
@@ -103,4 +106,5 @@ public class ServerTester extends ExternalResource {
     }
     return platform.getContainer().getComponentByType(component);
   }
+
 }
-- 
2.39.5