aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java3
-rw-r--r--sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java12
2 files changed, 8 insertions, 7 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
index 318a5ac5769..bf14cd42349 100644
--- a/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java
@@ -21,6 +21,7 @@ package org.sonar.server.plugins;
import org.picocontainer.Characteristics;
import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.PicoContainer;
import org.sonar.api.Plugin;
import org.sonar.api.ServerExtension;
import org.sonar.api.utils.SonarException;
@@ -64,7 +65,7 @@ public class ServerPluginRepository extends AbstractPluginRepository {
}
@Override
- protected boolean shouldRegisterExtension(String pluginKey, Object extension) {
+ protected boolean shouldRegisterExtension(PicoContainer container, String pluginKey, Object extension) {
return isType(extension, ServerExtension.class);
}
}
diff --git a/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java b/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
index d6d3115e806..99190fe2beb 100644
--- a/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java
@@ -32,14 +32,14 @@ public class ServerPluginRepositoryTest {
ServerPluginRepository repository = new ServerPluginRepository();
// check classes
- assertThat(repository.shouldRegisterExtension("foo", FakeBatchExtension.class), is(false));
- assertThat(repository.shouldRegisterExtension("foo", FakeServerExtension.class), is(true));
- assertThat(repository.shouldRegisterExtension("foo", String.class), is(false));
+ assertThat(repository.shouldRegisterExtension(null, "foo", FakeBatchExtension.class), is(false));
+ assertThat(repository.shouldRegisterExtension(null, "foo", FakeServerExtension.class), is(true));
+ assertThat(repository.shouldRegisterExtension(null, "foo", String.class), is(false));
// check objects
- assertThat(repository.shouldRegisterExtension("foo", new FakeBatchExtension()), is(false));
- assertThat(repository.shouldRegisterExtension("foo", new FakeServerExtension()), is(true));
- assertThat(repository.shouldRegisterExtension("foo", "foo"), is(false));
+ assertThat(repository.shouldRegisterExtension(null, "foo", new FakeBatchExtension()), is(false));
+ assertThat(repository.shouldRegisterExtension(null, "foo", new FakeServerExtension()), is(true));
+ assertThat(repository.shouldRegisterExtension(null, "foo", "foo"), is(false));
}
public static class FakeBatchExtension implements BatchExtension {