Rename addExtensions by addComponents

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 ff19bc981f3415ba84637264911d977b5680c731..49bb4bdc734633e2b568d8d901a935f80d99d3aa 100644 (file)
--- 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 5d3c7fdcdc818a513614dc690f5134271cb3e012..b053b7349dfd4d7e2fe88c47b1a72b54d7618bdf 100644 (file)
--- 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 93e79da17014e4a4489044f7b474b5534f294d5d..b3752bf62d88a44e7185f8e7ee63f133e5534187 100644 (file)
--- 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);
   }
+
 }